Добавил разделение вывода умерших по отделением
This commit is contained in:
@@ -95,7 +95,7 @@ class StatisticController extends Controller
|
||||
{
|
||||
$user = Auth::user();
|
||||
$departmentType = $request->query('departmentType');
|
||||
$availableDepartments = $user->availableDepartments()->pluck('department_id')->all();
|
||||
$availableDepartments = $user->misDepartments->pluck('rf_mis_department_id')->toArray();
|
||||
|
||||
$validated = $request->validate([
|
||||
'startAt' => 'required',
|
||||
@@ -105,6 +105,9 @@ class StatisticController extends Controller
|
||||
$dateRange = $this->dateRangeService->getNormalizedDateRange($user, $validated['startAt'], $validated['endAt']);
|
||||
|
||||
$deadPatients = ReportDutyPatient::query()
|
||||
->whereHas('latestMigration', function ($q) use ($availableDepartments) {
|
||||
$q->whereIn('department_id', $availableDepartments);
|
||||
})
|
||||
->with('latestMigration')
|
||||
->where('death_date', '>', $dateRange->startSql())
|
||||
->where('death_date', '<=', $dateRange->endSql())
|
||||
|
||||
Reference in New Issue
Block a user