| xqd
@@ -341,18 +341,18 @@ class ApiController extends Controller
|
|
|
$docter_setting = DocterSetting::where(['docter_id'=>$docter_id,'org_id'=>$org_id,'type'=>$sType])->first();
|
|
|
$serviceNum = 0;
|
|
|
$times = [];
|
|
|
-// if(!empty($docter_setting)){
|
|
|
-// $serviceNum = $docter_setting->service_num;
|
|
|
-// $time_period = object_array(json_decode($docter_setting->service_time));
|
|
|
-// $allCount = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->count();
|
|
|
-// if($allCount == 0) return apiReturn(603,'请设置时间段');
|
|
|
-// $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[1]['amStartTime']),intval($time_period[1]['amEndTime'])])->pluck('id')->toArray();
|
|
|
-// $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[2]['pmStartTime']),intval($time_period[2]['pmEndTime'])])->pluck('id')->toArray();
|
|
|
-// $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[3]['nightStartTime']),intval($time_period[3]['nightEndTime'])])->pluck('id')->toArray();
|
|
|
-// }
|
|
|
-// if(count($times) < 3){
|
|
|
-// return apiReturn('603','请配置时间段');
|
|
|
-// }
|
|
|
+ if(!empty($docter_setting)){
|
|
|
+ $serviceNum = $docter_setting->service_num;
|
|
|
+ $time_period = object_array(json_decode($docter_setting->service_time));
|
|
|
+ $allCount = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->count();
|
|
|
+ if($allCount == 0) return apiReturn(603,'请设置时间段');
|
|
|
+ $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[1]['amStartTime']),intval($time_period[1]['amEndTime'])])->pluck('id')->toArray();
|
|
|
+ $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[2]['pmStartTime']),intval($time_period[2]['pmEndTime'])])->pluck('id')->toArray();
|
|
|
+ $times[] = TimePeriod::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->whereBetween('end_time_period',[intval($time_period[3]['nightStartTime']),intval($time_period[3]['nightEndTime'])])->pluck('id')->toArray();
|
|
|
+ }
|
|
|
+ if(count($times) < 3){
|
|
|
+ return apiReturn('603','请配置时间段');
|
|
|
+ }
|
|
|
|
|
|
if($sType != 1){
|
|
|
$docter_id = 0;
|
| xqd
@@ -911,10 +911,8 @@ class ApiController extends Controller
|
|
|
'start_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + ($i-1)*$serviceTime*60),
|
|
|
'end_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + $i*$serviceTime*60),
|
|
|
];
|
|
|
- dump($timePreiod);
|
|
|
$isHave = TimePeriod::where($timePreiod)->count();
|
|
|
- dump($isHave);
|
|
|
- if($isHave ==0) TimePeriod::insert($timePreiod);
|
|
|
+ if($isHave == 0) TimePeriod::insert($timePreiod);
|
|
|
}
|
|
|
return true;
|
|
|
}
|