|
|
|
|
@ -28,7 +28,7 @@ class PlanController extends Controller
|
|
|
|
|
$list=DB::table('plans')
|
|
|
|
|
->whereBetween('date',[$first_day,$last_day])->whereIn('status',[1])
|
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
|
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [json_encode($checkup_type_id)])
|
|
|
|
|
->where(['hospital_id'=>$hospital_id,'type'=>1])
|
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
|
// if($use_type==1){
|
|
|
|
|
@ -96,7 +96,7 @@ class PlanController extends Controller
|
|
|
|
|
$list=DB::table('plans')
|
|
|
|
|
->where('date',$date)->whereIn('status',[1,2])
|
|
|
|
|
->whereRaw('CONCAT(date, " ", time) >?', [$currentDateTime])
|
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
|
|
|
|
|
->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")',[json_encode($checkup_type_id)])
|
|
|
|
|
->where(['hospital_id'=>$hospital_id,'type'=>1])
|
|
|
|
|
->whereIn('use_type',[0,$use_type]);
|
|
|
|
|
if ($use_type == 1) {
|
|
|
|
|
|