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);