diff --git a/htdocs/app/Http/Controllers/ListController.php b/htdocs/app/Http/Controllers/ListController.php index abe883b3..71763c01 100644 --- a/htdocs/app/Http/Controllers/ListController.php +++ b/htdocs/app/Http/Controllers/ListController.php @@ -68,8 +68,16 @@ class ListController extends Controller DB::raw("CONCAT('', ruangan, '') as tlsruangan"), DB::raw("CONCAT('', daftar, '') as tlsdaftar"), DB::raw("CONCAT('', status, '') as tlsstatus"), + DB::raw("CONCAT('', jkpasien, '') as tlsjk"), DB::raw("CONCAT('', asalpasien, '') as asalpasien"), - 'tlppasien as telpon', 'ruangan_id as idruangan', 'dokter_id as iddokter', 'id', 'daftar', 'nofoto', 'noloket', 'nmdokter as dokter')->whereNotNull('verifikasi')->where('status', '!=', 'Arsip'); + DB::raw("CONCAT('', kd_spesimen, '') as kd_spesimen"), + DB::raw("CONCAT('', nm_spesimen, '') as nm_spesimen"), + DB::raw("CONCAT('', nmanalis, '') as nmanalis"), + DB::raw("CONCAT('', nmppdssenior, '') as nmppdssenior"), + DB::raw("CONCAT('', nmdokter, '') as nmdokter"), + DB::raw("DATE(verifikasi) as daftartgl"), + DB::raw("TO_CHAR(verifikasi, 'HH24:MI:SS') as daftarjam"), + 'nofoto')->whereNotNull('verifikasi')->where('status', '!=', 'Arsip'); if ($valcari != ''){ if ($jenis == 'norm'){ $arraylist = $arraylist->where('noregister', $valcari); diff --git a/htdocs/resources/views/pengambilan.blade.php b/htdocs/resources/views/pengambilan.blade.php index 5f28b93c..1d8ace03 100644 --- a/htdocs/resources/views/pengambilan.blade.php +++ b/htdocs/resources/views/pengambilan.blade.php @@ -232,7 +232,6 @@ { text: 'Gender', datafield: 'tlsjk', width: 50, cellsalign: 'left', align: 'center' }, { text: 'Date', datafield: 'daftartgl', width: 80, cellsalign: 'center', align: 'center' }, { text: 'Time', datafield: 'daftarjam', width: 80, cellsalign: 'center', align: 'center' }, - { text: 'Urgensi', filtertype: 'checkedlist', datafield: 'urgensi', width: 110, cellsalign: 'left', align: 'center' }, { text: 'Comming From', filtertype: 'checkedlist', datafield: 'asalpasien', width: 120, cellsalign: 'left', align: 'center' }, { text: 'Code', datafield: 'kd_spesimen', width: 80, cellsalign: 'left', align: 'center' }, { text: 'Spesimen', datafield: 'nm_spesimen', width: 120, cellsalign: 'left', align: 'center' },