From 67b34d4bf2f24674b01545897f427219b7359300 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Tue, 13 Jan 2026 16:08:55 +0900
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ReportController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/Api/ReportController.php b/app/Http/Controllers/Api/ReportController.php
index bd7e554..bb4b121 100644
--- a/app/Http/Controllers/Api/ReportController.php
+++ b/app/Http/Controllers/Api/ReportController.php
@@ -10,6 +10,7 @@ use App\Models\MisMedicalHistory;
 use App\Models\ObservationPatient;
 use App\Models\Report;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -109,6 +110,7 @@ class ReportController extends Controller
                     DB::raw('ROW_NUMBER() OVER (ORDER BY "DateRecipient" DESC) as num')
                 ])
                 ->where('rf_EmerSignID', 1)
+                ->whereDate('DateRecipient', '>=', Carbon::now()->format('Y-m-d'))
                 ->orderBy('DateRecipient', 'DESC')
                 ->get();
         } else if ($status === 'emergency') {
@@ -118,7 +120,9 @@ class ReportController extends Controller
                     DB::raw('ROW_NUMBER() OVER (ORDER BY "DateRecipient" DESC) as num')
                 ])
                 ->where('rf_EmerSignID', 2)
+                ->whereDate('DateRecipient', '>=', Carbon::now()->format('Y-m-d'))
                 ->orderBy('DateRecipient', 'DESC')
+                ->limit(20)
                 ->get();
         }
 
@@ -137,11 +141,13 @@ class ReportController extends Controller
         if ($status === 'plan') {
             $count = MisMedicalHistory::select($model->getFillable())
                 ->where('rf_EmerSignID', 1)
+                ->whereDate('DateRecipient', '>=', Carbon::now()->format('Y-m-d'))
                 ->orderBy('DateRecipient', 'DESC')
                 ->count();
         } else if ($status === 'emergency') {
             $count = MisMedicalHistory::select($model->getFillable())
                 ->where('rf_EmerSignID', 2)
+                ->whereDate('DateRecipient', '>=', Carbon::now()->format('Y-m-d'))
                 ->orderBy('DateRecipient', 'DESC')
                 ->count();
         }