From f964939863a2386ed816a78fe804284286c43d16 Mon Sep 17 00:00:00 2001
From: Dwi Swandhana <swandhana17@gmail.com>
Date: Mon, 20 Apr 2026 09:46:42 +0700
Subject: [PATCH] update

---
 htdocs/app/Http/Controllers/ReportController.php   | 14 ++++++--------
 htdocs/resources/views/admin/glassreport.blade.php |  6 +++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php
index f115979e..5121652a 100644
--- a/htdocs/app/Http/Controllers/ReportController.php
+++ b/htdocs/app/Http/Controllers/ReportController.php
@@ -861,15 +861,13 @@ class ReportController extends Controller
             $query->whereMonth('daftar', $bulan);
         }
 
-        // 1. Ambil Data Pasien (Limit 50 per halaman agar RAM aman)
-        $orderbydate = $query->paginate(50);
-        $orderbydate->appends(['bulan' => $bulan, 'tahun' => $tahun]);
+	        // Glass report perlu menampilkan seluruh hasil filter agar jumlah baris konsisten.
+	        $orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->get();
 
-        // 2. Ambil Data Antibiotik HANYA untuk 50 pasien tersebut
-        $pageIds = $orderbydate->pluck('id')->toArray();
-        $antibiotikLookup = $this->mapAntibiotikData($pageIds);
-		$glassLookups = $this->getGlassReportLookups($orderbydate->getCollection());
-		$glassTables = $this->splitGlassReportRows($orderbydate->getCollection(), $glassLookups);
+	        $pageIds = $orderbydate->pluck('id')->toArray();
+	        $antibiotikLookup = $this->mapAntibiotikData($pageIds);
+			$glassLookups = $this->getGlassReportLookups($orderbydate);
+			$glassTables = $this->splitGlassReportRows($orderbydate, $glassLookups);
 		$glassHeaders = $this->getGlassReportHeaders();
 
         return view('admin.glassreport', [
diff --git a/htdocs/resources/views/admin/glassreport.blade.php b/htdocs/resources/views/admin/glassreport.blade.php
index b729d3f2..b46e084f 100644
--- a/htdocs/resources/views/admin/glassreport.blade.php
+++ b/htdocs/resources/views/admin/glassreport.blade.php
@@ -20,8 +20,8 @@
                             <table class="table table-bordered table-sm" id="tabel{{ $tableKey }}">
                                 <thead>
                                     <tr>
-                                        @foreach (($glassHeaders[$tableKey] ?? []) as $header)
-                                            <th>{{ $header }}</th>`
+	                                        @foreach (($glassHeaders[$tableKey] ?? []) as $header)
+	                                            <th>{{ $header }}</th>
                                         @endforeach
                                     </tr>
                                 </thead>
@@ -82,4 +82,4 @@
         });
     });
 </script>
-@endpush
\ No newline at end of file
+@endpush