From d5deaca0932ab09805a3ebf741361c2c96aee9ff Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Wed, 24 Jun 2026 16:50:08 +0900
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B9=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/DutyReportService.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/Services/DutyReportService.php b/app/Services/DutyReportService.php
index 10765bb..d2eb976 100644
--- a/app/Services/DutyReportService.php
+++ b/app/Services/DutyReportService.php
@@ -159,7 +159,10 @@ class DutyReportService
                     });
                 },
                 'operations' => function ($q) use ($departmentId, $dateRange) {
-                    $q->where('department_id', $departmentId);
+                    // Только операции этого отделения за отчётные сутки
+                    $q->where('department_id', $departmentId)
+                        ->where('start_date', '>=', $dateRange->startSql())
+                        ->where('start_date', '<', $dateRange->endSql());
                 }
             ])
             ->lazy()->map(function (MedicalHistory $h) use ($dateRange) {
@@ -198,7 +201,15 @@ class DutyReportService
     {
         return ReportNursePatient::query()
             ->where('report_nurse_id', $nurseReport->id)
-            ->with(['migrations', 'operations', 'latestMigration'])
+            ->with([
+                'migrations',
+                // Только операции за отчётные сутки
+                'operations' => function ($q) use ($dateRange) {
+                    $q->where('start_date', '>=', $dateRange->startSql())
+                        ->where('start_date', '<', $dateRange->endSql());
+                },
+                'latestMigration',
+            ])
             ->get()
             ->map(function (ReportNursePatient $h) use ($dateRange) {
                 $patientStatus = PatientStatusClassifier::classify($h, $dateRange);