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())