AOKB/onboard
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Исправил получение операций при сохранении отчета

Browse Source
This commit is contained in:
brusnitsyn
2026-06-24 16:50:08 +09:00
parent dba26be912
commit d5deaca093
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Services/DutyReportService.php
View File

@@ -159,7 +159,10 @@ class DutyReportService
}); });
}, },
'operations' => function ($q) use ($departmentId, $dateRange) { '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) { ->lazy()->map(function (MedicalHistory $h) use ($dateRange) {
@@ -198,7 +201,15 @@ class DutyReportService
{ {
return ReportNursePatient::query() return ReportNursePatient::query()
->where('report_nurse_id', $nurseReport->id) ->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() ->get()
->map(function (ReportNursePatient $h) use ($dateRange) { ->map(function (ReportNursePatient $h) use ($dateRange) {
$patientStatus = PatientStatusClassifier::classify($h, $dateRange); $patientStatus = PatientStatusClassifier::classify($h, $dateRange);