From 01692c68d58f38940a547c6cef9211b06e658f14 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Wed, 15 Jul 2026 16:54:38 +0900
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=B8=D0=BE=D1=80=D0=B8=D1=82=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Web/DutyReportController.php  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Web/DutyReportController.php b/app/Http/Controllers/Web/DutyReportController.php
index ddd6407..5a1d241 100644
--- a/app/Http/Controllers/Web/DutyReportController.php
+++ b/app/Http/Controllers/Web/DutyReportController.php
@@ -290,12 +290,22 @@ class DutyReportController extends Controller
         $deceased = $patients['meta']['counts']['deceased'] ?? 0; // Умершие
         $discharged = $patients['meta']['counts']['discharged'] ?? 0; // Выписанные
         $outcome = $deceased + $discharged;
+
+        $baseMetrics = $this->metrikaService->calculateBaseStatistics($reportsDuty);
+        $currentValue = empty($baseMetrics['current']) ?
+                        $patients['meta']['counts']['in_department'] ?? 0 :
+                        $baseMetrics['current'] ?? 0;
+        $recipientValue = empty($baseMetrics['recipient']) ?
+                        $patients['meta']['counts']['recipient'] ?? 0 :
+                        $baseMetrics['recipient'] ?? 0;
+        $dischargedValue = empty($baseMetrics['outcome']) ?
+                        $patients['meta']['counts']['discharged'] ?? 0 + $deceased :
+                        $baseMetrics['outcome'] ?? 0;
+
         $lethality = !empty($discharged)
             ? round(($deceased / $discharged) * 100, 2)
             : 0;
 
-        $baseMetrics = $this->metrikaService->calculateBaseStatistics($reportsDuty);
-
         return [
             'nurse' => [
                 'current' => !empty($nursePatients)
@@ -311,9 +321,9 @@ class DutyReportController extends Controller
             'duty' => [
                 'beds' => $bedsInDepartment ?? 0,
                 'loaded' => $loaded,
-                'current' => $baseMetrics['current'],// $patients['meta']['counts']['in_department'] ?? 0,
-                'recipient' => $baseMetrics['recipient'] ?? 0,
-                'discharged' => $baseMetrics['outcome'] + ($patients['meta']['counts']['deceased'] ?? 0), //($patients['meta']['counts']['discharged'] ?? 0) + ($patients['meta']['counts']['deceased'] ?? 0),
+                'current' => $currentValue,
+                'recipient' => $recipientValue,
+                'discharged' => $dischargedValue,
                 'deceased' => $patients['meta']['counts']['deceased'] ?? 0,
                 'lethality' => $lethality,
                 'surgical_planned' => $patients['meta']['counts']['surgical_planned'] ?? 0,