diff --git a/app/Http/Controllers/DokterController.php b/app/Http/Controllers/DokterController.php index 9624cb28..a2fcd4e0 100644 --- a/app/Http/Controllers/DokterController.php +++ b/app/Http/Controllers/DokterController.php @@ -2718,7 +2718,7 @@ class DokterController extends Controller $kolomttd = ' '.$nomor.''; $kanan = ''; } - $cetak = $cetak.''.$nomor.''.$periksa->nofoto.''.$periksa->noregister.''.$periksa->nmpasien.''.$periksa->jkpasien.''.$periksa->mulai.''.$periksa->asalpasien.''.$periksa->kd_spesimen.''.$periksa->nm_spesimen.''.$kolomttd.''; + $cetak = $cetak.''.$nomor.''.$periksa->nofoto.''.$periksa->noregister.''.$periksa->nmpasien.''.$periksa->jkpasien.''.$periksa->mulai.''.$periksa->asalpasien.''.$periksa->kd_spesimen.''.$periksa->nm_spesimen.''.$kolomttd.''; $nomor++; } } diff --git a/app/Http/Controllers/FrontpageController.php b/app/Http/Controllers/FrontpageController.php index ba394bb5..c7dd7c07 100644 --- a/app/Http/Controllers/FrontpageController.php +++ b/app/Http/Controllers/FrontpageController.php @@ -997,8 +997,15 @@ class FrontpageController extends Controller $jenisgambar = $request->input('jenisgambar'); $file = $request->input('file'); $poli_id = $request->input('poli_id') ?? 1; - $kd_spesimen = $request->input('kd_spesimen') ?? ''; - $nm_spesimen = $request->input('nm_spesimen') ?? ''; + $cekkodespes = Organisms::where('id', $ruangan)->first(); + if (isset($cekkodespes->name)){ + $nm_spesimen = $cekkodespes->name; + $kd_spesimen = $cekkodespes->category; + } else { + $kd_spesimen = $request->input('kd_spesimen') ?? ''; + $nm_spesimen = $request->input('nm_spesimen') ?? ''; + } + $reques = 'Specimen'; $kelompok = Session('previlage'); $daftar = date('Y-m-d H:i:s'); @@ -1245,7 +1252,7 @@ class FrontpageController extends Controller $modality = $check->modaliti ?? 'OT'; $modaliti2 = $check->modaliti2 ?? ''; if (isset($check->subsubpoli)){ - $rekues = $subpoli.' - '.$subsubpoli; + $rekues = $subpoli.' - '.$check->subsubpoli; } else { $rekues = $subpoli; } @@ -1291,7 +1298,7 @@ class FrontpageController extends Controller 'rjenis' => $jk, 'kodedok' => Session('id'), 'namadok' => Session('nama'), - 'ruangan' => $kamar, + 'ruangan' => 'Mikrobiologi', 'tes' => $rekues, 'alat' => 'All', 'kd_spesimen' => $kd_spesimen, diff --git a/resources/views/pendaftaran.blade.php b/resources/views/pendaftaran.blade.php index d619ae85..b3cf9c5a 100644 --- a/resources/views/pendaftaran.blade.php +++ b/resources/views/pendaftaran.blade.php @@ -585,6 +585,10 @@ theme : "energyblue", selectionmode : 'checkbox', altrows : true, + ready: function () + { + // called when the Grid is loaded. Call methods or set properties here. + }, columns: [ /* { text: 'Barcode', filterable: false, columntype: 'button', align: 'center', width: 80, cellsrenderer: function () { @@ -763,6 +767,7 @@ }, { text: 'No', filterable: false, datafield: 'noloket', width: 70, cellsalign: 'center', align: 'center' }, { text: 'Status', filtertype: 'checkedlist', datafield: 'tlsstatus', width: 75, cellsalign: 'left', align: 'center' }, + { text: 'AccNumber', datafield: 'nofoto', width: 100, cellsalign: 'left', align: 'center' }, { text: 'No.RM', datafield: 'tlsnoregister', width: 100, cellsalign: 'left', align: 'center' }, { text: 'Name', datafield: 'tlsnama', width: 150, cellsalign: 'left', align: 'center' }, { text: 'Gender', datafield: 'tlsjk', width: 50, cellsalign: 'left', align: 'center' }, @@ -1248,7 +1253,8 @@ document.write(pageContent); document.close(); newWindow.print(); - return false; + openedpage(); + return false; }); } });