This commit is contained in:
Dwi Swandhana
2026-04-10 22:23:17 +07:00
parent 4d025dc57d
commit ed406bad08
3 changed files with 32 additions and 9 deletions
+28 -5
View File
@@ -971,9 +971,9 @@ class AstmMessageService
$accessionNumber = trim((string) $accessionNumber, "\"@ \t\n\r\0\x0B");
}
$patientName = $pid[3] ?? $pid[5] ?? null;
$patientName = $patientName ? trim((string) $patientName, "\" \t\n\r\0\x0B") : null;
$patientName = $pid[3] ?? $pid[5] ?? null;
$patientName = $patientName ? trim((string) $patientName, "\" \t\n\r\0\x0B") : null;
$organism = $obx[5] ?? null;
$resultSample = new ResultSample();
$resultSample->sender_name = $alat;
$resultSample->version_number = $msh[11] ?? null;
@@ -983,7 +983,7 @@ class AstmMessageService
$resultSample->accession_number = $accessionNumber;
$resultSample->test_id = $obr[4] ?? ($qpd[1] ?? null);
$resultSample->result_type_code = $obx[3] ?? ($msh[8] ?? null);
$resultSample->organism = $obx[5] ?? null;
$resultSample->organism = $organism;
$resultSample->test_status = $obx[11] ?? null;
$resultSample->result_status_datetime = $this->astmToDateTime($obx[14] ?? null);
$resultSample->instrument_type = $alat;
@@ -1001,7 +1001,30 @@ class AstmMessageService
if ($accessionNumber) {
$teksHasil = $this->formatLocalInstrumentText($parsed, $alat, $accessionNumber, $messageDateTime);
if ($organism !== '') {
$getnama = explode('^', $organism);
$organism = $getnama[1] ?? $organism;
$sudah = Organisms::where('name', $organism)->count();
if ($sudah == 0) {
Organisms::create([
'kelompok' => 'biakankultur',
'name' => $organism,
'category' => $alat,
]);
}
KomponenJawaban::updateOrCreate(
[
'accnumber' => $accessionNumber,
'komponen' => 'id_bakteri01',
'isidata' => $organism,
],
[
'template' => 'all',
'created_by' => $alat
]
);
}
Riwayat::create([
'nofoto' => $accessionNumber,
'jawaban' => $teksHasil,
+2 -2
View File
@@ -2121,12 +2121,12 @@
</li>
<li class="nav-item">
<a href="#tabel_manual1" data-toggle="tab" aria-expanded="true" class="nav-link">
<i class="fi-monitor mr-2"></i> Bakteri Manual I
<i class="fi-monitor mr-2"></i> MALDITOF
</a>
</li>
<li class="nav-item">
<a href="#tabel_manual2" data-toggle="tab" aria-expanded="true" class="nav-link">
<i class="fi-monitor mr-2"></i> Bakteri Manual II
<i class="fi-monitor mr-2"></i> Bakteri Manual I
</a>
</li>
</ul>
@@ -2121,12 +2121,12 @@
</li>
<li class="nav-item">
<a href="#tabel_manual1" data-toggle="tab" aria-expanded="true" class="nav-link">
<i class="fi-monitor mr-2"></i> Bakteri Manual I
<i class="fi-monitor mr-2"></i> MALDITOF
</a>
</li>
<li class="nav-item">
<a href="#tabel_manual2" data-toggle="tab" aria-expanded="true" class="nav-link">
<i class="fi-monitor mr-2"></i> Bakteri Manual II
<i class="fi-monitor mr-2"></i> Bakteri Manual I
</a>
</li>
</ul>