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

Обновлен стартовый экран

Browse Source 
Переписаны запросы для статистики, отчетов
Добавлена интеграция отчета сестры
This commit is contained in:
brusnitsyn
2026-05-28 22:10:00 +09:00
parent 90e0d04dfd
commit 739168d427
96 changed files with 6663 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ class NurseReportController extends Controller
public function index(Request $request)
{
$user = Auth::user();
$selectedUserId = $request->query('userId') ? (int) $request->query('userId') : null;
$departmentId = $request->query('departmentId', $user->department->department_id);
$department = Department::where('department_id', $departmentId)->firstOrFail();
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
@@ -66,8 +67,22 @@ class NurseReportController extends Controller
$data = $this->unifiedMedicalHistoryService->getGroupedHistories($dateRange, $department->rf_mis_department_id);
$currentReport = ReportNurse::where('rf_department_id', $departmentId)
->where('period_start', '>=', $dateRange->startSql())
->where('period_end', '<=', $dateRange->endSql())
->orderBy('period_end', 'desc')
->first();
$isRangeOneDay = $this->dateRangeService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
return Inertia::render('Nurse/Report/Index', [
'patients' => $data,
'reportNurseId' => $currentReport?->id,
'canSaveReport' => $isRangeOneDay && $user->currentRoleCan('nurse.report.create'),
'canEditPastReport' => $user->currentRoleCan('nurse.report.edit.past'),
'department' => $department,
'selectedUserId' => $selectedUserId,
'selectedDepartmentId' => (int) $departmentId,
'dates' => [
$dateRange->startDate->getTimestampMs(),
$dateRange->endDate->getTimestampMs(),
@@ -81,11 +96,15 @@ class NurseReportController extends Controller
*/
public function store(Request $request)
{
abort_if(!auth()->user()->currentRoleCan('nurse.report.create'), 403);
$user = auth()->user();
$selectedUserId = $request->input('userId') ? (int) $request->input('userId') : null;
$departmentId = $request->input('departmentId') ? (int) $request->input('departmentId') : null;
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$report = $this->nurseReportService->saveReport($dateRange);
$this->nurseReportService->saveSnapshot($dateRange, $report);
$report = $this->nurseReportService->saveReport($dateRange, null, $selectedUserId, $departmentId);
$this->nurseReportService->saveSnapshot($dateRange, $report, null, auth()->id());
return redirect()->back();
}