diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php index cc5b9b3d..718fbf96 100644 --- a/htdocs/app/Http/Controllers/ReportController.php +++ b/htdocs/app/Http/Controllers/ReportController.php @@ -275,13 +275,31 @@ class ReportController extends Controller if ($jenisreport == 'biorepository'){ if ($bulan == 'ALL'){ $lists = DB::table('db_komponenjawaban') - ->select('db_komponenjawaban.*', 'periksa.nofoto', 'periksa.noregister', 'db_komponenjawaban.nmpasien', 'db_komponenjawaban.usia', 'db_komponenjawaban.dlp', 'db_komponenjawaban.nm_spesimen', 'db_komponenjawaban.kd_spesimen') + ->select('db_komponenjawaban.*', + 'periksa.nofoto', + 'periksa.noregister', + 'periksa.nmpasien', + 'periksa.usia', + 'periksa.reques', + 'periksa.dlp', + 'periksa.nm_spesimen', + 'periksa.kd_spesimen', + DB::raw("CONCAT('http://10.10.123.218/hasil/', nofoto) as urlhasil")) ->leftJoin('periksa', 'db_komponenjawaban.accnumber', 'periksa.nofoto') ->whereIn('db_komponenjawaban.komponen', ['id_bakteri01', 'id_bakteri02', 'bakteri']) ->where('periksa.daftar', 'LIKE', $tahun.'-%')->orderBy('periksa.id', 'DESC')->get(); } else { $lists = DB::table('db_komponenjawaban') - ->select('db_komponenjawaban.*', 'periksa.nofoto', 'periksa.noregister', 'db_komponenjawaban.nmpasien', 'db_komponenjawaban.usia', 'db_komponenjawaban.dlp', 'db_komponenjawaban.nm_spesimen', 'db_komponenjawaban.kd_spesimen') + ->select('db_komponenjawaban.*', + 'periksa.nofoto', + 'periksa.noregister', + 'periksa.nmpasien', + 'periksa.usia', + 'periksa.reques', + 'periksa.dlp', + 'periksa.nm_spesimen', + 'periksa.kd_spesimen', + DB::raw("CONCAT('http://10.10.123.218/hasil/', nofoto) as urlhasil")) ->leftJoin('periksa', 'db_komponenjawaban.accnumber', 'periksa.nofoto') ->whereIn('db_komponenjawaban.komponen', ['id_bakteri01', 'id_bakteri02', 'bakteri']) ->where('periksa.daftar', 'LIKE', $tahun.'-'.$bulan.'-%')->orderBy('periksa.id', 'DESC')->get(); diff --git a/htdocs/resources/views/admin/report.blade.php b/htdocs/resources/views/admin/report.blade.php index abdc2cde..4203f473 100644 --- a/htdocs/resources/views/admin/report.blade.php +++ b/htdocs/resources/views/admin/report.blade.php @@ -244,6 +244,7 @@ $(document).ready(function () { datatype: "json", datafields: [ { name: 'id',type: 'text'}, + { name: 'urlhasil',type: 'text'}, { name: 'nofoto',type: 'text'}, { name: 'noregister',type: 'text'}, { name: 'nmpasien',type: 'text'}, @@ -253,6 +254,7 @@ $(document).ready(function () { { name: 'kd_spesimen',type: 'text'}, { name: 'reques', type: 'text'}, { name: 'nobiorepository', type: 'text'}, + { name: 'isidata', type: 'text'}, { name: 'strain', type: 'text'}, { name: 'atcc', type: 'text'}, { name: 'sample', type: 'text'}, @@ -280,49 +282,21 @@ $(document).ready(function () { columnsresize : true, selectionmode : 'multiplecellsextended', columns : [ - { text: 'File Report', editable: false, sortable: false, filterable: false, datafield: 'filefoto', width: 80, cellsalign: 'left', align: 'center' }, - { text: 'No.Loket', datafield: 'noloket', width: 80, cellsalign: 'left', align: 'center' }, + { text: 'Nomor BioRepository', datafield: 'nobiorepository', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'Nama Bakteri', datafield: 'isidata', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'STRAIN', datafield: 'strain', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'ATCC', datafield: 'atcc', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'Tanggal Penyimpanan', datafield: 'tglpenyimpanan', width: 80, cellsalign: 'left', align: 'center'}, + { text: 'Nama Pelaksana/ Pemilik', datafield: 'created_by', width: 180, cellsalign: 'left', align: 'center' }, + { text: 'No.Loket', datafield: 'nofoto', width: 80, cellsalign: 'left', align: 'center' }, { text: 'No.RM', datafield: 'noregister', width: 70, align: 'center', cellsalign: 'left'}, { text: 'Nama', datafield: 'nmpasien', width: 160, cellsalign: 'left', align: 'center' }, - { text: 'No.HP', datafield: 'tlppasien', width: 100, cellsalign: 'left', align: 'center' }, { text: 'Umur', datafield: 'usia', width: 70, cellsalign: 'left', align: 'center' }, - { text: 'M', editable: false, sortable: false, filterable: false, datafield: 'l', width: 20, cellsalign: 'left', align: 'center' }, - { text: 'F', editable: false, sortable: false, filterable: false, datafield: 'p', width: 20, cellsalign: 'left', align: 'center' }, - { text: 'Order', editable: false, sortable: false, filterable: false, datafield: 'jenis', width: 80, cellsalign: 'left', align: 'center' }, - { text: 'JKN', editable: false, sortable: false, filterable: false, columngroup: 'asuransi', datafield: 'jkn', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'UMM', editable: false, sortable: false, filterable: false, columngroup: 'asuransi', datafield: 'umm', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'TAG', editable: false, sortable: false, filterable: false, columngroup: 'asuransi', datafield: 'tag', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'GCU', editable: false, sortable: false, filterable: false, columngroup: 'asuransi', datafield: 'gcu', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'Billing', editable: false, sortable: false, filterable: false, columngroup: 'asuransi', datafield: 'billing', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'SWASTA', editable: false, sortable: false, filterable: false, columngroup: 'asuransi', datafield: 'swasta', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'Elective', editable: false, sortable: false, filterable: false, columngroup: 'urgensi', datafield: 'ele', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'CITO', editable: false, sortable: false, filterable: false, columngroup: 'urgensi', datafield: 'cito', width: 40, cellsalign: 'left', align: 'center' }, - { text: 'Sample Masuk', columngroup: 'waktu', datafield: 'daftar', width: 160, cellsalign: 'left', align: 'center' }, - { text: 'Draft By', columngroup: 'waktu', datafield: 'nmdrafter', width: 150, cellsalign: 'left', align: 'center' }, - { text: 'Tgl. Draft', columngroup: 'waktu', datafield: 'tgldraft', width: 80, cellsalign: 'left', align: 'center' }, - { text: 'Expertise By', columngroup: 'waktu', datafield: 'nmpembaca', width: 150, cellsalign: 'left', align: 'center' }, - { text: 'Supervisor', columngroup: 'waktu', datafield: 'nmdokter', width: 150, cellsalign: 'left', align: 'center' }, - { text: 'Verifikasi', columngroup: 'waktu', datafield: 'verifikasi', width: 80, cellsalign: 'left', align: 'center' }, - { text: 'Cetak', columngroup: 'waktu', datafield: 'export', width: 80, cellsalign: 'left', align: 'center' }, - { text: 'Asal Pasien', datafield: 'asalpasien', width: 100, cellsalign: 'left', align: 'center'}, - { text: 'Asal RS', datafield: 'nmrs', width: 100, 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: 'Device', datafield: 'modality', 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'}, - { text: 'Jenis', datafield: 'diagnosa2', width: 150, cellsalign: 'left', align: 'center'}, - { text: 'Duration', editable: false, sortable: false, filterable: false, datafield: 'durasi', width: 100, cellsalign: 'left', align: 'center'}, + { text: 'Order', datafield: 'reques', width: 150, cellsalign: 'left', align: 'center'}, + { text: 'File Report', editable: false, sortable: false, filterable: false, datafield: 'urlhasil', width: 80, cellsalign: 'left', align: 'center' }, ], - columngroups: - [ - { text: 'Riwayat Tindakan', align: 'center', name: 'waktu' }, - { text: 'Urgensi', align: 'center', name: 'urgensi' }, - { text: 'Insurance', align: 'center', name: 'asuransi' } - ] }); } });