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

Изменил привязку id при добавлении пациента

Browse Source 
Изменил приоритет вывода карты после репликации
This commit is contained in:
brusnitsyn
2026-06-03 12:42:17 +09:00
parent c857bd9f72
commit e758769035
8 changed files with 154 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ class NurseReportController extends Controller
{
$user = Auth::user();
$selectedUserId = $request->query('userId') ? (int) $request->query('userId') : null;
$departmentId = $request->query('departmentId', $user->department->department_id);
$departmentId = $request->query('departmentId') ? (int) $request->query('departmentId') : null;
$department = Department::where('department_id', $departmentId)->firstOrFail();
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
@@ -45,26 +45,6 @@ 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);
// }
$data = $this->unifiedMedicalHistoryService->getGroupedHistories($dateRange, $department->rf_mis_department_id);
$currentReport = ReportNurse::where('rf_department_id', $departmentId)
@@ -82,7 +62,7 @@ class NurseReportController extends Controller
'canEditPastReport' => $user->currentRoleCan('nurse.report.edit.past'),
'department' => $department,
'selectedUserId' => $selectedUserId,
'selectedDepartmentId' => (int) $departmentId,
'selectedDepartmentId' => $departmentId,
'dates' => [
$dateRange->startDate->getTimestampMs(),
$dateRange->endDate->getTimestampMs(),