* изменил таблицы в основном отчете

* изменил метод сохранения пациентов основного отчета
2026-05-07 18:00:43 +09:00
parent 723ccee8d3
commit bb9e67ab3d
25 changed files with 1438 additions and 52 deletions
--- a/app/Services/DutyMedicalHistoryService.php
+++ b/app/Services/DutyMedicalHistoryService.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\ReportDutyPatient;
+use Illuminate\Support\Carbon;
+
+class DutyMedicalHistoryService
+{
+    public function getHistories(DateRange $dateRange, int $departmentId)
+    {
+        $query = ReportDutyPatient::query();
+
+        $query->where('recipient_date', '>=', $dateRange->startSql())
+            ->where('recipient_date', '<', $dateRange->endSql())
+            // 1. Оставляем только тех пациентов, у которых БЫЛО движение в этом отделении
+            ->whereHas('latestMigration', fn($q) => $q->where('department_id', $departmentId))
+
+            // 2. Загружаем ТОЛЬКО последнее движение в этом отделении (не все миграции)
+            ->with(['latestMigration' => fn($q) => $q->where('department_id', $departmentId)]);
+
+        $result = $query->paginate();
+
+        return $result;
+    }
+
+    public function getUrgencyHistory(DateRange $dateRange, int $departmentId, int $urgencyId)
+    {
+        $query = ReportDutyPatient::query();
+
+        $query->where('recipient_date', '>=', $dateRange->startSql())
+            ->where('recipient_date', '<', $dateRange->endSql())
+            ->urgency($urgencyId)
+            ->whereHas('migrations', function ($m) use ($departmentId) {
+                $m->where('department_id', $departmentId);
+            })
+            ->with([
+                'migrations' => fn ($m) => $m->where('department_id', $departmentId),
+                'migrations.operations'
+            ]);
+
+        $result = $query->paginate();
+
+        return $result;
+    }
+
+    public function getDepartmentHistories(DateRange $dateRange, int $departmentId)
+    {
+        return ReportDutyPatient::query()
+            ->whereHas('migrations', function ($q) use ($departmentId, $dateRange) {
+                $q->department($departmentId)->current($dateRange);
+            })
+            ->with(['latestMigration' => function ($q) use ($departmentId, $dateRange) {
+                $q->department($departmentId)->current($dateRange); // подгружаем только отфильтрованные движения
+            }])
+            ->get()
+            // Сортировка по дате поступления в отделение (поле дочерней таблицы)
+            ->sortByDesc(fn ($mh) => $mh->latestMigration->ingoing_date ?? $mh->recipient_date)
+            ->values();
+    }
+
+    /**
+     * Получить карты поступившие сегодня
+     * @param DateRange $dateRange
+     * @param int $departmentId
+     */
+    public function getRecipientHistories(DateRange $dateRange, int $departmentId)
+    {
+        $now = Carbon::now();
+
+        return ReportDutyPatient::query()
+            ->whereHas('migrations', function ($q) use ($departmentId, $dateRange) {
+                $q->department($departmentId)->admitted($dateRange->startSql(), $dateRange->endSql());
+            })
+            ->with(['latestMigration' => function ($q) use ($departmentId) {
+                $q->department($departmentId);
+            }])
+            ->get();
+    }
+
+    public function getDischargedHistories(DateRange $dateRange, int $departmentId)
+    {
+        return ReportDutyPatient::query()
+            ->whereHas('migrations', function ($q) use ($departmentId, $dateRange) {
+                $q->department($departmentId)->discharged($dateRange->startSql(), $dateRange->endSql());
+            })
+            ->with(['latestMigration' => function ($q) use ($departmentId) {
+                $q->department($departmentId);
+            }])
+            ->get();
+    }
+
+    public function getDeceasedHistories(DateRange $dateRange, int $departmentId)
+    {
+        return ReportDutyPatient::query()
+            ->whereHas('migrations', function ($q) use ($departmentId, $dateRange) {
+                $q->department($departmentId)->deceased($dateRange->startSql(), $dateRange->endSql());
+            })
+            ->with(['latestMigration' => function ($q) use ($departmentId) {
+                $q->department($departmentId);
+            }])
+            ->get();
+    }
+
+    public function getTransferredHistories(DateRange $dateRange, int $departmentId)
+    {
+        return ReportDutyPatient::query()
+            ->whereHas('migrations', function ($q) use ($departmentId, $dateRange) {
+                $q->department($departmentId)->transferred($dateRange->startSql(), $dateRange->endSql());
+            })
+            ->with(['latestMigration' => function ($q) use ($departmentId) {
+                $q->department($departmentId);
+            }])
+            ->get();
+    }
+}