From 1c8fa557c5473a663b484c726a9cce6c9ea69323 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 3 Dec 2024 10:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=B7=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/PlanController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/PlanController.php b/Laravel/app/Http/Controllers/API/H5/PlanController.php index 0a4f9fd..bb870ac 100644 --- a/Laravel/app/Http/Controllers/API/H5/PlanController.php +++ b/Laravel/app/Http/Controllers/API/H5/PlanController.php @@ -29,7 +29,7 @@ class PlanController extends Controller ->whereBetween('date',[$first_day,$last_day])->whereIn('status',[1]) ->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime]) ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [json_encode($checkup_type_id)]) - ->where(['hospital_id'=>$hospital_id,'type'=>1]) + ->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0]) ->where('is_vip','<>',1) ->whereIn('use_type',[0,$use_type]); if(isset($person_id)){ @@ -102,7 +102,7 @@ class PlanController extends Controller ->where('date',$date)->whereIn('status',[1,2]) ->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime]) ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")',[$checkup_type_id]) - ->where(['hospital_id'=>$hospital_id,'type'=>1]) + ->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0]) ->where('is_vip','<>',1) ->whereIn('use_type',[0,$use_type]); @@ -136,7 +136,7 @@ class PlanController extends Controller ->whereBetween('date',[$days7[0],$days7[6]])->whereIn('status',[1]) ->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime]) ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id]) - ->where(['hospital_id'=>$hospital_id,'type'=>1]) + ->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0]) ->where('is_vip','<>',1) ->whereIn('use_type',[0,$use_type]); if(!!$personInfo){