diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php index 7233c41..4b7d4fb 100755 --- a/app/Http/Controllers/HealthCareSheetController.php +++ b/app/Http/Controllers/HealthCareSheetController.php @@ -1150,7 +1150,7 @@ class HealthCareSheetController extends Controller public function getHealthCareSheets(Request $request) { $this->validate($request, [ - 'user_id' => 'required_without_all::network_agent_id,network_id|integer|exists:users,id', + 'user_id' => 'required_without_all:network_agent_id,network_id|integer|exists:users,id', 'beneficiary_id' => 'nullable|integer|exists:nh_having_rights,id', 'network_id' => 'nullable|integer|exists:networks,id', 'network_agent_id' => 'required_without_all::user_id,network_id|integer|exists:networks_agents,id', @@ -1181,9 +1181,7 @@ class HealthCareSheetController extends Controller } } else if (!empty($network_agent_id)) { $query = NhInfosHealthCareSheets::where('network_agent_id', $network_agent_id); - } - - if (!empty($network_id)) { + } else if (!empty($network_id)) { $query = NhInfosHealthCareSheets::where('network_id', $network_id); }