diff --git a/htdocs/app/Services/AstmMessageService.php b/htdocs/app/Services/AstmMessageService.php index d72c079e..b25faa8d 100644 --- a/htdocs/app/Services/AstmMessageService.php +++ b/htdocs/app/Services/AstmMessageService.php @@ -886,6 +886,7 @@ class AstmMessageService $patientName = trim((string) $patientName, "\" \t\n\r\0\x0B"); $testId = $obr[4] ?? ($qpd[1] ?? '-'); $receivedAt = $messageDateTime ?? '-'; + $escape = static fn ($value) => e($value ?: '-'); if (str_starts_with($alat, 'MYLA')) { $organism = $obx[5] ?? '-'; @@ -897,38 +898,44 @@ class AstmMessageService $comment = $nte[3] ?? '-'; $specimen = $spm[3] ?? '-'; - return trim(implode("\n", [ - 'HASIL ALAT MYLA', - 'No. Foto: '.($accessionNumber ?: '-'), - 'No. Spesimen: '.$specimen, - 'Pasien: '.$patientName, - 'Jenis Pesan: '.$messageType, - 'Test: '.$testId, - 'Hasil: '.$organism, - 'Abnormal Flag: '.$abnormalFlag, - 'Confidence: '.$confidence, - 'Status: '.$status, - 'Operator: '.$operator, - 'Komentar: '.$comment, - 'Tanggal Hasil: '.$resultAt, - 'Tanggal Diterima LIS: '.$receivedAt, - ])); + return + '
'. + '
HASIL ALAT MYLA
'. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
No. Foto: '.$escape($accessionNumber).'
No. Spesimen: '.$escape($specimen).'
Pasien: '.$escape($patientName).'
Jenis Pesan: '.$escape($messageType).'
Test: '.$escape($testId).'
Hasil: '.$escape($organism).'
Abnormal Flag: '.$escape($abnormalFlag).'
Confidence: '.$escape($confidence).'
Status: '.$escape($status).'
Operator: '.$escape($operator).'
Komentar: '.$escape($comment).'
Tanggal Hasil: '.$escape($resultAt).'
Tanggal Diterima LIS: '.$escape($receivedAt).'
'. + '
'; } $orderAt = $this->astmToDateTime($parsed['ORC'][0][8] ?? null) ?? '-'; $queryId = $qid[1] ?? ($msh[9] ?? '-'); - return trim(implode("\n", [ - 'HASIL ALAT GENEXPERT', - 'No. Foto: '.($accessionNumber ?: '-'), - 'Pasien: '.$patientName, - 'Jenis Pesan: '.$messageType, - 'Test/Assay: '.$testId, - 'Order/Run ID: '.$queryId, - 'Tanggal Order: '.$orderAt, - 'Tanggal Diterima LIS: '.$receivedAt, - 'Catatan: Payload alat disimpan sebagai raw untuk ditinjau analis.', - ])); + return + '
'. + '
HASIL ALAT GENEXPERT
'. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
No. Foto: '.$escape($accessionNumber).'
Pasien: '.$escape($patientName).'
Jenis Pesan: '.$escape($messageType).'
Test/Assay: '.$escape($testId).'
Order/Run ID: '.$escape($queryId).'
Tanggal Order: '.$escape($orderAt).'
Tanggal Diterima LIS: '.$escape($receivedAt).'
Catatan: Payload alat disimpan sebagai raw untuk ditinjau analis.
'. + '
'; } protected function saveInstrumentRawResult(string $raw, string $alat): bool {