From d80068bcd6297fd1be1b08962a3a0e11a14314aa Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Mon, 20 Jul 2026 16:59:44 +0900
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D1=83=D0=BB=D1=83=20=D1=80=D0=B0=D1=81?=
 =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=B0=20=D0=BA=D0=BE=D0=B9=D0=BA=D0=BE-?=
 =?UTF-8?q?=D0=B4=D0=BD=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B8=D0=B7=20=D1=81=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Web/StatisticController.php | 2 +-
 app/Services/StatisticsService.php               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Web/StatisticController.php b/app/Http/Controllers/Web/StatisticController.php
index 3ca67c8..83212fd 100644
--- a/app/Http/Controllers/Web/StatisticController.php
+++ b/app/Http/Controllers/Web/StatisticController.php
@@ -27,7 +27,7 @@ class StatisticController extends Controller
         $isRangeOneDayQuery = $this->dateService->isRangeOneDay($queryDateRange->startDate, $queryDateRange->endDate);
         $dateRange = $this->dateService->getDateRangeFromRequest($request, $user);
         $isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
-        
+
         $queryStartOfDateRange = $dateRange->start()->copy()->startOfYear();
 
         // Генерируем ключ кэша на основе параметров запроса
diff --git a/app/Services/StatisticsService.php b/app/Services/StatisticsService.php
index 95bec9c..3aba7e6 100644
--- a/app/Services/StatisticsService.php
+++ b/app/Services/StatisticsService.php
@@ -217,6 +217,7 @@ class StatisticsService
                             21 => $preoperativeAverageSum += $value,
                             26 => $preoperativeSum += $value,
                             27 => $preoperativePatientCount += (int) $value,
+                            18 => $avgBedDays += $value,
                             //                            24 => $completePlanProgress = (int)$value,
                             default => null
                         };
@@ -240,7 +241,7 @@ class StatisticsService
                 $percentLoaded = $bedsCount > 0 ? round($currentCount * 100 / $bedsCount) : 0;
 
                 // Средний койко-день
-                $avgBedDays = $outcome > 0 ? round($bedDaysSum / $outcome, 1) : 0;
+                $avgBedDays = $outcome > 0 ? round($bedDaysSum / ($outcome + $currentCount), 1) : 0;
 
                 // Предоперационный койко-день
                 $canUsePreoperativeTotals = $preoperativePatientCount > 0