dwi_vendor/lis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dwi Swandhana
2026-04-21 09:37:50 +07:00
parent 7ca1e3a96e
commit 93ee78982f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/app/Http/Controllers/ReportController.php
+11 -11
View File
@@ -870,25 +870,25 @@ class ReportController extends Controller
} }
// Query Periksa // 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') { if ($bulan != 'ALL' && $bulan != 'Pick Month') {
$query->whereMonth('daftar', $bulan); $query->whereMonth('daftar', $bulan);
} }
// Preview dibuat paginated agar aman saat filter setahun. // Preview dibuat paginated agar aman saat filter setahun.
$orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->paginate(50); $orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->paginate(50);
$orderbydate->appends(['bulan' => $bulan, 'tahun' => $tahun]); $orderbydate->appends(['bulan' => $bulan, 'tahun' => $tahun]);
$pageIds = $orderbydate->pluck('id')->toArray(); $pageIds = $orderbydate->pluck('id')->toArray();
$antibiotikLookup = $this->mapAntibiotikData($pageIds); $antibiotikLookup = $this->mapAntibiotikData($pageIds);
$glassRows = $orderbydate->getCollection(); $glassRows = $orderbydate->getCollection();
$glassLookups = $this->getGlassReportLookups($glassRows); $glassLookups = $this->getGlassReportLookups($glassRows);
$glassTables = $this->splitGlassReportRows($glassRows, $glassLookups); $glassTables = $this->splitGlassReportRows($glassRows, $glassLookups);
$glassHeaders = $this->getGlassReportHeaders(); $glassHeaders = $this->getGlassReportHeaders();
return view('admin.glassreport', [ return view('admin.glassreport', [
'orderbydate' => $orderbydate, 'orderbydate' => $orderbydate,
'antibiotikLookup' => $antibiotikLookup, // Kirim array hasil mapping 'antibiotikLookup' => $antibiotikLookup,
'jsonantibiotik' => $this->listAntibiotik, 'jsonantibiotik' => $this->listAntibiotik,
'glassTables' => $glassTables, 'glassTables' => $glassTables,
'glassHeaders' => $glassHeaders, 'glassHeaders' => $glassHeaders,
@@ -920,7 +920,7 @@ class ReportController extends Controller
]; ];
// Query Tanpa Get() tapi Chunk() // 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') { if ($bulan != 'ALL' && $bulan != 'Pick Month') {
$query->whereMonth('daftar', $bulan); $query->whereMonth('daftar', $bulan);
} }