diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php index 8f4f1ccc..58280fc8 100644 --- a/htdocs/app/Http/Controllers/ReportController.php +++ b/htdocs/app/Http/Controllers/ReportController.php @@ -347,7 +347,7 @@ class ReportController extends Controller ->select('accnumber','komponen','isidata') ->whereIn('accnumber', array_unique($acc)) ->whereIn('komponen', [ - 'id_bakteri01','id_bakteri02','id_mikroorganisme' + 'id_bakteri01','id_bakteri02','bakteri' ]) ->get() ->groupBy('accnumber'); @@ -548,7 +548,6 @@ class ReportController extends Controller } return view('admin.glassreport', compact('orderbydate', 'jsonantibiotik', 'bulan', 'tahun')); } - public function genZNreport(Request $request) { $data = []; $bulan = $request->input('bulan'); @@ -643,7 +642,6 @@ class ReportController extends Controller )); } - public function genTATreport(Request $request) { $data = []; $bulan = $request->input('bulan'); diff --git a/htdocs/resources/views/cetak/ekspertisevl.blade.php b/htdocs/resources/views/cetak/ekspertisevl.blade.php index 640b102e..b699ccf6 100644 --- a/htdocs/resources/views/cetak/ekspertisevl.blade.php +++ b/htdocs/resources/views/cetak/ekspertisevl.blade.php @@ -109,11 +109,7 @@
| No | @@ -130,8 +126,10 @@ @endif- @if (isset($data['vl_hasil01'])) - {!! $data['vl_hasil01'] !!} + @if (isset($data['vl_hasil01']) AND $data['vl_hasil01'] == 'lainnya') + {!! $data['vl_hasil01teks'] ?? '' !!} + @else + {!! $data['vl_hasil01'] ?? '' !!} @endif | @@ -153,8 +151,10 @@ @endif | - @if (isset($data['vl_hasil02'])) - {!! $data['vl_hasil02'] !!} + @if (isset($data['vl_hasil02']) AND $data['vl_hasil02'] == 'lainnya') + {!! $data['vl_hasil02teks'] ?? '' !!} + @else + {!! $data['vl_hasil02'] ?? '' !!} @endif |