Несколько отделений для врачей

Поправил подсчет операций
Закончил функцию наполнения отчетов

app/Services/PatientService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Models\LifeMisMigrationPatient;
 use App\Models\MisMedicalHistory;
 use App\Models\MisMigrationPatient;
+use App\Models\MisSurgicalOperation;
 use App\Models\ObservationPatient;
 use Carbon\Carbon;
 
@@ -219,16 +220,14 @@ class PatientService
         DateRange $dateRange,
         bool $countOnly = false
     ) {
-        $query = MisMedicalHistory::whereHas('surgicalOperations', function ($q) use ($type, $branchId, $dateRange) {
-            $q->where('rf_StationarBranchID', $branchId)
+        $query = MisSurgicalOperation::where('rf_StationarBranchID', $branchId)
                 ->whereBetween('Date', [$dateRange->startSql(), $dateRange->endSql()]);
 
-            if ($type === 'plan') {
-                $q->where('rf_TypeSurgOperationInTimeID', 6);
-            } else {
-                $q->whereIn('rf_TypeSurgOperationInTimeID', [4, 5]);
-            }
-        });
+        if ($type === 'plan') {
+            $query->where('rf_TypeSurgOperationInTimeID', 6);
+        } else {
+            $query->whereIn('rf_TypeSurgOperationInTimeID', [4, 5]);
+        }
 
         if ($countOnly) {
             return $query->count();