|
|
|
@ -29,7 +29,7 @@ class PlanController extends Controller
|
|
|
|
->whereBetween('date',[$first_day,$last_day])->whereIn('status',[1])
|
|
|
|
->whereBetween('date',[$first_day,$last_day])->whereIn('status',[1])
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [json_encode($checkup_type_id)])
|
|
|
|
->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)
|
|
|
|
->where('is_vip','<>',1)
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
if(isset($person_id)){
|
|
|
|
if(isset($person_id)){
|
|
|
|
@ -102,7 +102,7 @@ class PlanController extends Controller
|
|
|
|
->where('date',$date)->whereIn('status',[1,2])
|
|
|
|
->where('date',$date)->whereIn('status',[1,2])
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")',[$checkup_type_id])
|
|
|
|
->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)
|
|
|
|
->where('is_vip','<>',1)
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
|
|
|
|
|
|
|
|
@ -136,7 +136,7 @@ class PlanController extends Controller
|
|
|
|
->whereBetween('date',[$days7[0],$days7[6]])->whereIn('status',[1])
|
|
|
|
->whereBetween('date',[$days7[0],$days7[6]])->whereIn('status',[1])
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
|
|
|
|
->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)
|
|
|
|
->where('is_vip','<>',1)
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
if(!!$personInfo){
|
|
|
|
if(!!$personInfo){
|
|
|
|
|