diff --git a/app/Http/Controllers/Web/DutyReportController.php b/app/Http/Controllers/Web/DutyReportController.php
index 738c359..f23554b 100644
--- a/app/Http/Controllers/Web/DutyReportController.php
+++ b/app/Http/Controllers/Web/DutyReportController.php
@@ -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,
]
diff --git a/resources/js/Pages/Report/Index.vue b/resources/js/Pages/Report/Index.vue
index 42ecc51..b4a0c3e 100644
--- a/resources/js/Pages/Report/Index.vue
+++ b/resources/js/Pages/Report/Index.vue
@@ -264,7 +264,7 @@ watch(() => props, (newProps) => {
Умерло
-
+
Летальность
%