diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php index 082a94f..3272e8d 100755 --- a/app/Http/Controllers/HealthCareSheetController.php +++ b/app/Http/Controllers/HealthCareSheetController.php @@ -1018,13 +1018,15 @@ class HealthCareSheetController extends Controller if (!empty($user_id)) { $query = NhInfosHealthCareSheets::where('user_id', $user_id); - } - - if (!empty($network_agent_id)) { + if (!empty($network_agent_id)) { + $query = $query->where('network_agent_id', $network_agent_id); + } + } else { $query = NhInfosHealthCareSheets::where('network_agent_id', $network_agent_id); } + $query = $query->with(['performances.act:id,code,name', 'exams.act:id,code,name', 'prescriptions.drug_or_device:id,name']); if (!empty($state) && $state == 'TO_BILL') {