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

Добавлена формула подсчета % летальности

Browse Source
This commit is contained in:
brusnitsyn
2026-05-29 10:09:56 +09:00
parent a2729428bb
commit 74b03353cf
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,11 +281,24 @@ class DutyReportController extends Controller
*/
private function prepareStats(array $patients, array $nursePatients, int $loaded, ?int $bedsInDepartment): array
{
$deceased = $patients['meta']['counts']['deceased'] ?? 0; // Умершие
$discharged = $patients['meta']['counts']['discharged'] ?? 0; // Выписанные
$outcome = $deceased + $discharged;
$lethality = !empty($discharged)
? round(($deceased / $discharged) * 100, 2)
: 0;
return [
'nurse' => [
'current' => empty($nursePatients) ? 0 : ($nursePatients['meta']['counts']['in_department'] ?? 0),
'recipient' => empty($nursePatients) ? 0 : ($nursePatients['meta']['counts']['recipient'] ?? 0),
'discharged' => empty($nursePatients) ? 0 : ($nursePatients['meta']['counts']['discharged'] ?? 0),
'current' => !empty($nursePatients)
? ($nursePatients['meta']['counts']['in_department'] ?? 0)
: 0,
'recipient' => !empty($nursePatients)
? ($nursePatients['meta']['counts']['recipient'] ?? 0)
: 0,
'discharged' => empty($nursePatients)
? ($nursePatients['meta']['counts']['discharged'] ?? 0)
: 0,
],
'duty' => [
'beds' => $bedsInDepartment ?? 0,
@@ -294,6 +307,7 @@ class DutyReportController extends Controller
'recipient' => $patients['meta']['counts']['recipient'] ?? 0,
'discharged' => ($patients['meta']['counts']['discharged'] ?? 0) + ($patients['meta']['counts']['deceased'] ?? 0),
'deceased' => $patients['meta']['counts']['deceased'] ?? 0,
'lethality' => $lethality,
'surgical_planned' => $patients['meta']['counts']['surgical_planned'] ?? 0,
'surgical_urgent' => $patients['meta']['counts']['surgical_urgent'] ?? 0,
]

2
resources/js/Pages/Report/Index.vue
View File

@@ -264,7 +264,7 @@ watch(() => props, (newProps) => {
<ReportWidget :counter="stats.duty.deceased">
Умерло
</ReportWidget>
<ReportWidget :counter="stats.duty.deceased">
<ReportWidget :counter="stats.duty.lethality">
<NSpace vertical :size="1">
<div>Летальность</div>
<div>%</div>