From 93ee78982f585df810079e09f39bf6e52ff76f03 Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Tue, 21 Apr 2026 09:37:50 +0700 Subject: [PATCH] update --- .../app/Http/Controllers/ReportController.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php index 0ae4a9bf..f081bcc0 100644 --- a/htdocs/app/Http/Controllers/ReportController.php +++ b/htdocs/app/Http/Controllers/ReportController.php @@ -870,25 +870,25 @@ class ReportController extends Controller } // Query Periksa - $query = Periksa::query()->whereYear('daftar', $tahun); + $query = Periksa::query()->where('dlp', 'Kultur')->whereNotNull('dokter_id')->whereYear('daftar', $tahun); if ($bulan != 'ALL' && $bulan != 'Pick Month') { $query->whereMonth('daftar', $bulan); } - // Preview dibuat paginated agar aman saat filter setahun. - $orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->paginate(50); - $orderbydate->appends(['bulan' => $bulan, 'tahun' => $tahun]); + // Preview dibuat paginated agar aman saat filter setahun. + $orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->paginate(50); + $orderbydate->appends(['bulan' => $bulan, 'tahun' => $tahun]); - $pageIds = $orderbydate->pluck('id')->toArray(); - $antibiotikLookup = $this->mapAntibiotikData($pageIds); - $glassRows = $orderbydate->getCollection(); - $glassLookups = $this->getGlassReportLookups($glassRows); - $glassTables = $this->splitGlassReportRows($glassRows, $glassLookups); + $pageIds = $orderbydate->pluck('id')->toArray(); + $antibiotikLookup = $this->mapAntibiotikData($pageIds); + $glassRows = $orderbydate->getCollection(); + $glassLookups = $this->getGlassReportLookups($glassRows); + $glassTables = $this->splitGlassReportRows($glassRows, $glassLookups); $glassHeaders = $this->getGlassReportHeaders(); return view('admin.glassreport', [ 'orderbydate' => $orderbydate, - 'antibiotikLookup' => $antibiotikLookup, // Kirim array hasil mapping + 'antibiotikLookup' => $antibiotikLookup, 'jsonantibiotik' => $this->listAntibiotik, 'glassTables' => $glassTables, 'glassHeaders' => $glassHeaders, @@ -920,7 +920,7 @@ class ReportController extends Controller ]; // Query Tanpa Get() tapi Chunk() - $query = Periksa::query()->whereYear('daftar', $tahun); + $query = Periksa::query()->where('dlp', 'Kultur')->whereNotNull('dokter_id')->whereYear('daftar', $tahun); if ($bulan != 'ALL' && $bulan != 'Pick Month') { $query->whereMonth('daftar', $bulan); }