Работа над журналом для ст. мед сестер

2026-05-04 17:11:16 +09:00
parent f107ebd167
commit 7a58812072
61 changed files with 3532 additions and 1163 deletions
--- a/app/Infrastructure/Reports/Sources/MisClinicalDataSource.php
+++ b/app/Infrastructure/Reports/Sources/MisClinicalDataSource.php
@@ -138,6 +138,10 @@ class MisClinicalDataSource
        $reanimationByMedicalHistory = MisReanimation::query()
            ->join('stt_migrationpatient as mp', 'mp.MigrationPatientID', '=', 'stt_reanimation.rf_MigrationPatientID')
            ->where('mp.rf_StationarBranchID', $branchId)
+            ->where(function ($q) use ($dateRange) {
+                $q->where('stt_reanimation.DateIn', '<=', $dateRange->endSql())
+                    ->where('stt_reanimation.DateOut', '>=', $dateRange->startSql());
+            })
            ->where('mp.rf_MedicalHistoryID', '<>', 0)
            ->whereIn('mp.rf_MedicalHistoryID', $reportCohortIds)
            ->selectRaw('