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