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-06-10 10:50:40 +09:00
parent 9954501437
commit 64d2bc0509
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Api/StatisticController.php
View File

@@ -95,7 +95,7 @@ class StatisticController extends Controller
{ {
$user = Auth::user(); $user = Auth::user();
$departmentType = $request->query('departmentType'); $departmentType = $request->query('departmentType');
$availableDepartments = $user->availableDepartments()->pluck('department_id')->all(); $availableDepartments = $user->misDepartments->pluck('rf_mis_department_id')->toArray();
$validated = $request->validate([ $validated = $request->validate([
'startAt' => 'required', 'startAt' => 'required',
@@ -105,6 +105,9 @@ class StatisticController extends Controller
$dateRange = $this->dateRangeService->getNormalizedDateRange($user, $validated['startAt'], $validated['endAt']); $dateRange = $this->dateRangeService->getNormalizedDateRange($user, $validated['startAt'], $validated['endAt']);
$deadPatients = ReportDutyPatient::query() $deadPatients = ReportDutyPatient::query()
->whereHas('latestMigration', function ($q) use ($availableDepartments) {
$q->whereIn('department_id', $availableDepartments);
})
->with('latestMigration') ->with('latestMigration')
->where('death_date', '>', $dateRange->startSql()) ->where('death_date', '>', $dateRange->startSql())
->where('death_date', '<=', $dateRange->endSql()) ->where('death_date', '<=', $dateRange->endSql())