From 64d2bc05091d6c471573759092d8308ed3f0e591 Mon Sep 17 00:00:00 2001 From: brusnitsyn Date: Wed, 10 Jun 2026 10:50:40 +0900 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0=20=D1=83=D0=BC=D0=B5=D1=80?= =?UTF-8?q?=D1=88=D0=B8=D1=85=20=D0=BF=D0=BE=20=D0=BE=D1=82=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/StatisticController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/StatisticController.php b/app/Http/Controllers/Api/StatisticController.php index 0b32e32..58975ad 100644 --- a/app/Http/Controllers/Api/StatisticController.php +++ b/app/Http/Controllers/Api/StatisticController.php @@ -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())