diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index de796d21..7459e64d 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -3228,7 +3228,8 @@ class DokterController extends Controller if (isset($periksa->id)){ Periksa::where('id', $periksa->id)->whereNull('status')->update([ 'status' => 'Penerimaan Sampel', - 'nmppdsjunior2' => Session('nama') + 'nmppdsjunior2' => Session('nama'), + 'updated_at' => date('Y-m-d').' 00:00:00', ]); if ($kanan == ''){ $kolomttd = ''.$nomor.' '; diff --git a/htdocs/app/Http/Controllers/ListController.php b/htdocs/app/Http/Controllers/ListController.php index d7cd457c..0e66de81 100644 --- a/htdocs/app/Http/Controllers/ListController.php +++ b/htdocs/app/Http/Controllers/ListController.php @@ -444,7 +444,12 @@ class ListController extends Controller } else { $arraylist = $arraylist->where('nmpasien', 'LIKE', '%'.$valcari.'%'); } - $arraylist = $arraylist->orderBy('id', 'DESC')->get(); + if ($jenis == 'ThisDayPendaftaran'){ + $arraylist = $arraylist->orderBy('updated_at', 'DESC')->orderBy('id', 'DESC')->get(); + } else { + $arraylist = $arraylist->orderBy('id', 'DESC')->get(); + } + } echo json_encode($arraylist); } diff --git a/htdocs/resources/views/cetak/ekspertisekultur.blade.php b/htdocs/resources/views/cetak/ekspertisekultur.blade.php index a8bac30d..24521b3c 100644 --- a/htdocs/resources/views/cetak/ekspertisekultur.blade.php +++ b/htdocs/resources/views/cetak/ekspertisekultur.blade.php @@ -267,7 +267,13 @@ {{$nomor}}. Pewarnaan KOH : - {!! $data['id_pewarnaankoh'] !!} + + @if (isset($data['id_pewarnaankoh']) AND $data['id_pewarnaankoh'] != 'lainnya') + {!! $data['id_pewarnaankoh'] !!} + @else + {!! $data['id_pewarnaankohoptional'] ?? '' !!} + @endif + @php $nomor++; diff --git a/htdocs/resources/views/cetak/ekspertisepl.blade.php b/htdocs/resources/views/cetak/ekspertisepl.blade.php index 8a7521ae..cbc24c3c 100644 --- a/htdocs/resources/views/cetak/ekspertisepl.blade.php +++ b/htdocs/resources/views/cetak/ekspertisepl.blade.php @@ -177,9 +177,10 @@ Pewarnaan KOH : - {!! $lsg_pewarnaankoh !!} - @if ($lsg_pewarnaankohoptional != '') -
{!! $lsg_pewarnaankohoptional !!} + @if (isset($data['lsg_pewarnaankoh']) AND $data['lsg_pewarnaankoh'] != 'lainnya') + {!! $data['lsg_pewarnaankoh'] !!} + @else + {!! $data['lsg_pewarnaankohoptional'] ?? '' !!} @endif