From 36327e5e9f3a5036c47cc7bda9f304ae6f898848 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Tue, 15 Feb 2022 17:45:47 +0100 Subject: [PATCH] Add network_id filter to GET /health-care-sheets --- .../Controllers/HealthCareSheetController.php | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php index da76f3a..7233c41 100755 --- a/app/Http/Controllers/HealthCareSheetController.php +++ b/app/Http/Controllers/HealthCareSheetController.php @@ -1062,6 +1062,17 @@ class HealthCareSheetController extends Controller * in="query", * required=false * ), + * @OA\Parameter( + * parameter="network_id", + * name="network_id", + * description="ID du reseau", + * @OA\Schema( + * type="integer", + * default = 250 + * ), + * in="query", + * required=false + * ), * @OA\Parameter( * parameter="type", * name="type", @@ -1139,9 +1150,10 @@ class HealthCareSheetController extends Controller public function getHealthCareSheets(Request $request) { $this->validate($request, [ - 'user_id' => 'required_without:network_agent_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_agent_id' => 'required_without:user_id|integer|exists:networks_agents,id', + 'network_id' => 'nullable|integer|exists:networks,id', + 'network_agent_id' => 'required_without_all::user_id,network_id|integer|exists:networks_agents,id', 'type' => 'nullable|in:CONSULTATION,EXECUTION', 'state' => 'nullable|in:UNTREATED,TREATED,ACCEPTED,TO_BILL,ALL,UNTREATED_ALL', 'pagination' => 'nullable|boolean' @@ -1152,6 +1164,7 @@ class HealthCareSheetController extends Controller $user_id = $request->input('user_id'); $beneficiary_id = $request->input('beneficiary_id'); $network_agent_id = $request->input('network_agent_id'); + $network_id = $request->input('network_id'); $pagination = $request->input('pagination'); if (!empty($user_id)) { @@ -1166,10 +1179,14 @@ class HealthCareSheetController extends Controller if (!empty($network_agent_id)) { $query = $query->where('network_agent_id', $network_agent_id); } - } else { + } else if (!empty($network_agent_id)) { $query = NhInfosHealthCareSheets::where('network_agent_id', $network_agent_id); } + if (!empty($network_id)) { + $query = NhInfosHealthCareSheets::where('network_id', $network_id); + } + $query = $query->with(['network:id,name', 'performances.act:id,code,name', 'exams.act:id,code,name', 'prescriptions.drug_or_device:id,name']);