From f2c2e3441edd22f1daa75d2b6a17e8e40a100628 Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Mon, 2 Feb 2026 08:43:59 +0700 Subject: [PATCH] update --- htdocs/app/Http/Controllers/ReportController.php | 2 +- htdocs/resources/views/admin/report.blade.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php index 860d9665..da08870b 100644 --- a/htdocs/app/Http/Controllers/ReportController.php +++ b/htdocs/app/Http/Controllers/ReportController.php @@ -357,7 +357,7 @@ class ReportController extends Controller } echo json_encode($lists); } else { - $query = Periksa::select('id', 'nofoto', 'noregister', 'nmpasien', 'tlppasien', 'tgllahirpasien', 'usia', 'alamatpasien', 'ktp', 'bpjs', 'asuransi', 'urgensi', 'asalpasien', 'klinisi', 'klinis', 'nmanalis', 'nmppdssenior', 'kd_spesimen', 'nm_spesimen', 'dlp', 'diagnosa2', 'mulai', 'verifikasi', 'status')->whereYear('mulai', $tahun); + $query = Periksa::select('id', 'nofoto', 'noregister', 'nmpasien', 'tlppasien', 'tgllahirpasien', 'usia', 'alamatpasien', 'ktp', 'bpjs', 'asuransi', 'urgensi', 'asalpasien', 'klinisi', 'klinis', 'nmanalis', 'nmppdssenior', 'kd_spesimen', 'nm_spesimen', 'dlp', 'diagnosa2', 'mulai', 'verifikasi', 'status', 'reques', 'nmdokter', 'daftar')->whereYear('mulai', $tahun); if ($bulan !== 'ALL') { $query->whereMonth('mulai', $bulan); diff --git a/htdocs/resources/views/admin/report.blade.php b/htdocs/resources/views/admin/report.blade.php index ca1326cd..585d3392 100644 --- a/htdocs/resources/views/admin/report.blade.php +++ b/htdocs/resources/views/admin/report.blade.php @@ -261,9 +261,10 @@ $(document).ready(function () { { name: 'id_bakteri02',type: 'text'}, { name: 'bakteri',type: 'text'}, { name: 'selisih_hari',type: 'text'}, - { name: 'subpoli',type: 'text'}, + { name: 'reques',type: 'text'}, { name: 'status_target',type: 'text'}, { name: 'modaliti2',type: 'text'}, + { name: 'nmdokter',type: 'text'}, ], id: 'id', localData: data @@ -291,17 +292,19 @@ $(document).ready(function () { { text: 'No.HP', datafield: 'tlppasien', width: 100, cellsalign: 'left', align: 'center' }, { text: 'Tgl. Lahir', datafield: 'tgllahirpasien', width: 70, cellsalign: 'left', align: 'center' }, { text: 'Umur', datafield: 'usia', width: 70, cellsalign: 'left', align: 'center' }, + { text: 'Kelamin', datafield: 'jkpasien', width: 70, cellsalign: 'left', align: 'center' }, { text: 'Alamat', datafield: 'alamatpasien', width: 70, cellsalign: 'left', align: 'center' }, { text: 'KTP', datafield: 'ktp', width: 70, cellsalign: 'left', align: 'center' }, { text: 'BPJS', datafield: 'bpjs', width: 70, cellsalign: 'left', align: 'center' }, { text: 'Asuransi', datafield: 'asuransi', width: 70, cellsalign: 'left', align: 'center' }, { text: 'Urgensi', datafield: 'urgensi', width: 70, cellsalign: 'left', align: 'center' }, { text: 'Asal Pasien', datafield: 'asalpasien', width: 100, cellsalign: 'left', align: 'center'}, - { text: 'Order', datafield: 'subpoli', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'Order', datafield: 'reques', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Klinisi', datafield: 'klinisi', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Klinis', datafield: 'klinis', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Analis', datafield: 'nmanalis', width: 150, cellsalign: 'left', align: 'center'}, { text: 'PPDS', datafield: 'nmppdssenior', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'DPJP', datafield: 'nmdokter', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Code', datafield: 'kd_spesimen', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Speciment', datafield: 'nm_spesimen', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Template', datafield: 'dlp', width: 150, cellsalign: 'left', align: 'center'}, @@ -309,8 +312,8 @@ $(document).ready(function () { { text: 'Bakteri I', datafield: 'bakteri', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Bakteri II', datafield: 'id_bakteri01', width: 150, cellsalign: 'left', align: 'center'}, { text: 'Bakteri III', datafield: 'id_bakteri02', width: 150, cellsalign: 'left', align: 'center'}, - { text: 'Sample Masuk', datafield: 'mulai', width: 160, cellsalign: 'left', align: 'center' }, - { text: 'Verifikasi', datafield: 'verifikasi', width: 80, cellsalign: 'left', align: 'center' }, + { text: 'Tgl. Sample', datafield: 'mulai', width: 160, cellsalign: 'left', align: 'center' }, + { text: 'Tgl. Hasil', datafield: 'verifikasi', width: 160, cellsalign: 'left', align: 'center' }, { text: 'Target', datafield: 'modaliti2', width: 100, cellsalign: 'left', align: 'center'}, { text: 'Duration', datafield: 'selisih_hari', width: 100, cellsalign: 'left', align: 'center'}, { text: 'Keterangan', datafield: 'status_target', width: 100, cellsalign: 'left', align: 'center'},