From f55dfdc0847054f389a1c5c484e6a88b33944609 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Tue, 2 Jun 2026 16:24:06 +0900
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D0=BE=D1=82?=
 =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BC=D0=B5=D0=B4.=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D1=80=D1=8B=20=D0=B7=D0=B0=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/UnifiedMedicalHistoryService.php | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/app/Services/UnifiedMedicalHistoryService.php b/app/Services/UnifiedMedicalHistoryService.php
index ac41a99..fd9b726 100644
--- a/app/Services/UnifiedMedicalHistoryService.php
+++ b/app/Services/UnifiedMedicalHistoryService.php
@@ -10,29 +10,49 @@ use Illuminate\Support\Carbon;
 
 class UnifiedMedicalHistoryService
 {
-    public function getGroupedHistories(DateRange $dateRange, int $departmentId): array
+    public function getGroupedHistories(DateRange $dateRange, int $departmentId, ?string $search = null): array
     {
         $startYear = $dateRange->startDate->copy()->startOfYear()->format('Y-m-d');
+        $periodMigrationFilter = function ($q) use ($departmentId, $dateRange, $startYear) {
+            $q->where('department_id', $departmentId)
+                ->where('ingoing_date', '<=', $dateRange->endSql())
+                ->where(function ($sub) use ($dateRange, $startYear) {
+                    // Миграции без out_date (еще лежат)
+                    $sub->whereNull('out_date')
+                        ->where('ingoing_date', '>', $startYear);
+
+                    // Миграции с out_date (закрытые)
+                    $sub->orWhere(function ($sub2) use ($dateRange, $startYear) {
+                        $sub2->whereNotNull('out_date')
+                            ->where('out_date', '>', $dateRange->startSql())
+                            ->where('out_date', '>', $startYear);
+                    });
+                });
+        };
+        $departmentMigrationFilter = function ($q) use ($departmentId) {
+            $q->where('department_id', $departmentId)
+                ->orderByDesc('ingoing_date');
+        };
 
         // 1. Один запрос: получаем "сырые" данные (без вычисляемых статусов)
-        $all = UnifiedMedicalHistory::query()->whereHas('latestMigration', function ($q) use ($departmentId, $dateRange, $startYear) {
-            $q->where('department_id', $departmentId)
-                // пребывание пересекается с отчётным периодом: ingoing <= end AND (out IS NULL OR out >= start)
-                ->where('ingoing_date', '<=', $dateRange->endSql())
-                ->where('ingoing_date', '>=', $startYear)
-                ->where(function ($sub) use ($dateRange) {
-                    $sub->whereNull('out_date')
-                        ->orWhere('out_date', '>=', $dateRange->startSql());
+        $all = UnifiedMedicalHistory::query()
+            ->whereHas('migrations', $periodMigrationFilter)
+            ->when($search, function ($query, $search) {
+                // Поиск по ФИО (точное совпадение или LIKE)
+                return $query->where(function ($q) use ($search) {
+                    $q->where('full_name', 'ilike', "%{$search}%");  // PostgreSQL
                 });
-        })->with(['latestMigration' => function ($q) use ($departmentId) {
-            $q->where('department_id', $departmentId);
-        }, 'latestMigration.operations'])->get();
+            })
+            ->with([
+                'latestMigration' => $periodMigrationFilter,
+                'migrations' => $departmentMigrationFilter,
+            ])->get();
+
 
         // 2. Добавляем вычисляемые поля и превращаем в плоский массив
         $prepared = $all->map(function (UnifiedMedicalHistory $h) use ($dateRange) {
             $patientStatus = PatientStatusClassifier::classify($h, $dateRange);
             $patientUrgency = null;
-            $patientReanimation = null;
             if (!in_array($patientStatus, [
                 PatientStatusClassifier::STATUS_DECEASED,
                 PatientStatusClassifier::STATUS_DISCHARGED,
@@ -47,7 +67,6 @@ class UnifiedMedicalHistoryService
                 // + вычисляемые мета-поля для фронтенда
                 'patient_status' => $patientStatus,
                 'patient_urgency' => $patientUrgency,
-                'in_reanimation' => $patientReanimation,
                 'admitted_today' => PatientStatusClassifier::classifyAdmitted($h->latestMigration?->ingoing_date, $dateRange),
             ];
         });
@@ -57,13 +76,12 @@ class UnifiedMedicalHistoryService
         $sortOrder = 'desc';
         $sorted = $prepared->sortBy($sortBy, SORT_REGULAR, $sortOrder === 'desc')->values();
 
-        // 4. Возвращаем плоский массив + метаданные для фронтенда
         $countInDepartment = $sorted->where('patient_status', 'in_department')->count();
         $countRecipient = $sorted->where('patient_status', 'recipient')->count();
         $countDischarged = $sorted->where('patient_status', 'discharged')->count();
+        $countDeceased = $sorted->where('patient_status', 'deceased')->count();
         $countUrgent = $sorted->where('patient_urgency', 'urgent')->count();
         $countPlanned = $sorted->where('patient_urgency', 'planned')->count();
-        $countReanimations = $sorted->where('in_reanimation', true)->count();
 
         // 4. Возвращаем плоский массив + метаданные для фронтенда
         return [
@@ -78,7 +96,7 @@ class UnifiedMedicalHistoryService
                     'discharged' => $countDischarged,
                     'urgent' => $countUrgent,
                     'planned' => $countPlanned,
-                    'reanimations' => $countReanimations,
+                    'deceased' => $countDeceased,
                 ]
             ]
         ];