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

* оптимизировал запросы выдачи пациентов, сохранения снапшотов

Browse Source 
* доработал страницу отчета дежурного
* переделал "действия" над пациентом
* подключил виджеты на странице отчета дежурного
This commit is contained in:
brusnitsyn
2026-05-08 17:04:56 +09:00
parent 6cf1ffbb2b
commit 90e0d04dfd
17 changed files with 818 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,52 +52,31 @@ class DutyReportController extends Controller
if ($hasReport) {
$inDepartmentHistories = $this->dutyMedicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
$plannedHistories = collect([ 'data' => [] ]);
$emergencyHistories = collect([ 'data' => [] ]);
$recipientHistories = $this->dutyMedicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
$dischargedHistories = $this->dutyMedicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
$deceasedHistories = $this->dutyMedicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
$transferredHistories = $this->dutyMedicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
$reanimationHistories = collect([ 'data' => [] ]);
} else if ($this->dateRangeService->isPastPeriod($dateRange)) {
$inDepartmentHistories = collect([]);
$recipientHistories = collect([]);
$dischargedHistories = collect([]);
$deceasedHistories = collect([]);
$transferredHistories = collect([]);
$inDepartmentHistories = collect([ 'data' => [] ]);
$plannedHistories = collect([ 'data' => [] ]);
$emergencyHistories = collect([ 'data' => [] ]);
$recipientHistories = collect([ 'data' => [] ]);
$dischargedHistories = collect([ 'data' => [] ]);
$deceasedHistories = collect([ 'data' => [] ]);
$transferredHistories = collect([ 'data' => [] ]);
$reanimationHistories = collect([ 'data' => [] ]);
} else {
$inDepartmentHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id)
);
$plannedHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getPlannedHistories($dateRange, $department->rf_mis_department_id)
);
$emergencyHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getEmergencyHistories($dateRange, $department->rf_mis_department_id)
);
$recipientHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id)
);
$dischargedHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id)
);
$deceasedHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id)
);
$transferredHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id)
);
$reanimationHistories = MedicalHistoryResource::collection(
$this->medicalHistoryService->getReanimationHistories($dateRange, $department->rf_mis_department_id)
);
$patients = $this->medicalHistoryService->getGroupedHistories($dateRange, $department->rf_mis_department_id);
}
return Inertia::render('Report/Index', [
'inDepartmentHistories' => $inDepartmentHistories,
'plannedHistories' => $plannedHistories,
'emergencyHistories' => $emergencyHistories,
'recipientHistories' => $recipientHistories,
'dischargedHistories' => $dischargedHistories,
'deceasedHistories' => $deceasedHistories,
'transferredHistories' => $transferredHistories,
'reanimationHistories' => $reanimationHistories,
'patients' => $patients,
'departmentInfo' => [
// TODO: Добавить вывод информации из шапки
],
'dates' => [
$dateRange->startDate->getTimestampMs(),
$dateRange->endDate->getTimestampMs(),

46
app/Http/Controllers/Web/NurseReportController.php
View File

@@ -44,32 +44,30 @@ class NurseReportController extends Controller
$hasReport = $existsReport && $isPastPeriod;
if ($hasReport) {
$inDepartmentHistories = $this->nurseMedicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
$recipientHistories = $this->nurseMedicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
$dischargedHistories = $this->nurseMedicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
$deceasedHistories = $this->nurseMedicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
$transferredHistories = $this->nurseMedicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
} else if ($this->dateRangeService->isPastPeriod($dateRange)) {
$inDepartmentHistories = collect([]);
$recipientHistories = collect([]);
$dischargedHistories = collect([]);
$deceasedHistories = collect([]);
$transferredHistories = collect([]);
} else {
$inDepartmentHistories = $this->unifiedMedicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
$recipientHistories = $this->unifiedMedicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
$dischargedHistories = $this->unifiedMedicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
$deceasedHistories = $this->unifiedMedicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
$transferredHistories = $this->unifiedMedicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
}
// if ($hasReport) {
// $inDepartmentHistories = $this->nurseMedicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
// $recipientHistories = $this->nurseMedicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
// $dischargedHistories = $this->nurseMedicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
// $deceasedHistories = $this->nurseMedicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
// $transferredHistories = $this->nurseMedicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
// } else if ($this->dateRangeService->isPastPeriod($dateRange)) {
// $inDepartmentHistories = collect([]);
// $recipientHistories = collect([]);
// $dischargedHistories = collect([]);
// $deceasedHistories = collect([]);
// $transferredHistories = collect([]);
// } else {
// $inDepartmentHistories = $this->unifiedMedicalHistoryService->getDepartmentHistories($dateRange, $department->rf_mis_department_id);
// $recipientHistories = $this->unifiedMedicalHistoryService->getRecipientHistories($dateRange, $department->rf_mis_department_id);
// $dischargedHistories = $this->unifiedMedicalHistoryService->getDischargedHistories($dateRange, $department->rf_mis_department_id);
// $deceasedHistories = $this->unifiedMedicalHistoryService->getDeceasedHistories($dateRange, $department->rf_mis_department_id);
// $transferredHistories = $this->unifiedMedicalHistoryService->getTransferredHistories($dateRange, $department->rf_mis_department_id);
// }
$data = $this->unifiedMedicalHistoryService->getGroupedHistories($dateRange, $department->rf_mis_department_id);
return Inertia::render('Nurse/Report/Index', [
'inDepartmentHistories' => $inDepartmentHistories,
'recipientHistories' => $recipientHistories,
'dischargedHistories' => $dischargedHistories,
'deceasedHistories' => $deceasedHistories,
'transferredHistories' => $transferredHistories,
'patients' => $data,
'dates' => [
$dateRange->startDate->getTimestampMs(),
$dateRange->endDate->getTimestampMs(),