From 45dbf5934c48f2aa423688e1fba97738e0cd9ddf Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 14 Jan 2025 10:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B7=E6=BA=90=E5=8C=BA=E5=88=86=E7=8E=B0?= =?UTF-8?q?=E5=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/Admin/YeWu/CheckUpTypeController.php | 2 +- Laravel/app/Http/Controllers/API/Internal/PlanController.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php index cada066..3b0034c 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/CheckUpTypeController.php @@ -11,7 +11,7 @@ class CheckUpTypeController extends Controller //体检类型列表 public function GetEnableList() { - $list=DB::table('checkup_type')->where(['is_del'=>0,'status'=>1])->get(); + $list=DB::table('checkup_type')->where(['is_del'=>0,'status'=>1])->orWhere('id',8)->get(); return \Yz::Return(true,'查询完成',['list'=>$list]); } } diff --git a/Laravel/app/Http/Controllers/API/Internal/PlanController.php b/Laravel/app/Http/Controllers/API/Internal/PlanController.php index 0b231f6..b5df148 100644 --- a/Laravel/app/Http/Controllers/API/Internal/PlanController.php +++ b/Laravel/app/Http/Controllers/API/Internal/PlanController.php @@ -21,7 +21,10 @@ class PlanController extends Controller $list=DB::table('plans') ->where('date',$date)->whereIn('status',[1]) ->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime]) - ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")',[$checkup_type_id]) + ->where(function($query) use ($checkup_type_id) { + $query->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id]) + ->orWhereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', ["8"]); + }) ->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0]) ->where('is_vip','=',$is_vip);