AOKB/onboard
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Исправил приоритет при сохранении метрик

Browse Source
This commit is contained in:
brusnitsyn
2026-07-15 16:54:38 +09:00
parent d9cb1aca28
commit 01692c68d5
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Web/DutyReportController.php
View File

@@ -290,12 +290,22 @@ class DutyReportController extends Controller
$deceased = $patients['meta']['counts']['deceased'] ?? 0; // Умершие $deceased = $patients['meta']['counts']['deceased'] ?? 0; // Умершие
$discharged = $patients['meta']['counts']['discharged'] ?? 0; // Выписанные $discharged = $patients['meta']['counts']['discharged'] ?? 0; // Выписанные
$outcome = $deceased + $discharged; $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) $lethality = !empty($discharged)
? round(($deceased / $discharged) * 100, 2) ? round(($deceased / $discharged) * 100, 2)
: 0; : 0;
$baseMetrics = $this->metrikaService->calculateBaseStatistics($reportsDuty);
return [ return [
'nurse' => [ 'nurse' => [
'current' => !empty($nursePatients) 'current' => !empty($nursePatients)
@@ -311,9 +321,9 @@ class DutyReportController extends Controller
'duty' => [ 'duty' => [
'beds' => $bedsInDepartment ?? 0, 'beds' => $bedsInDepartment ?? 0,
'loaded' => $loaded, 'loaded' => $loaded,
'current' => $baseMetrics['current'],// $patients['meta']['counts']['in_department'] ?? 0, 'current' => $currentValue,
'recipient' => $baseMetrics['recipient'] ?? 0, 'recipient' => $recipientValue,
'discharged' => $baseMetrics['outcome'] + ($patients['meta']['counts']['deceased'] ?? 0), //($patients['meta']['counts']['discharged'] ?? 0) + ($patients['meta']['counts']['deceased'] ?? 0), 'discharged' => $dischargedValue,
'deceased' => $patients['meta']['counts']['deceased'] ?? 0, 'deceased' => $patients['meta']['counts']['deceased'] ?? 0,
'lethality' => $lethality, 'lethality' => $lethality,
'surgical_planned' => $patients['meta']['counts']['surgical_planned'] ?? 0, 'surgical_planned' => $patients['meta']['counts']['surgical_planned'] ?? 0,