|
@@ -499,14 +499,15 @@ class ApiController extends Controller
|
|
$org_id = intval(request('org_id'));
|
|
$org_id = intval(request('org_id'));
|
|
$docter_id = intval(request('docter_id'));
|
|
$docter_id = intval(request('docter_id'));
|
|
$type = intval(request('type')); //1门诊 2 计免 儿保
|
|
$type = intval(request('type')); //1门诊 2 计免 儿保
|
|
- $role = intval(request('role'));
|
|
|
|
$start_time = strtotime($date);
|
|
$start_time = strtotime($date);
|
|
$month_day = date("t",$start_time);
|
|
$month_day = date("t",$start_time);
|
|
$end_time = ($start_time + $month_day * 86400);
|
|
$end_time = ($start_time + $month_day * 86400);
|
|
$start_date = date('Y-m-d',$start_time);
|
|
$start_date = date('Y-m-d',$start_time);
|
|
$end_date = date('Y-m-d',$end_time);
|
|
$end_date = date('Y-m-d',$end_time);
|
|
- $types = [1=>1,2=>2,3=>3];
|
|
|
|
$settingConfig = self::getSetting($type,$docter_id,$org_id);
|
|
$settingConfig = self::getSetting($type,$docter_id,$org_id);
|
|
|
|
+ if(empty($date) || empty($org_id) || empty($type)){
|
|
|
|
+ return apiReturn(603,'参数错误');
|
|
|
|
+ }
|
|
|
|
|
|
if($type == 1){
|
|
if($type == 1){
|
|
$schedule_data = Schedule::where(['docter_id'=>$docter_id,'organization_id'=>$org_id])
|
|
$schedule_data = Schedule::where(['docter_id'=>$docter_id,'organization_id'=>$org_id])
|
|
@@ -688,7 +689,7 @@ class ApiController extends Controller
|
|
$sType = intval(request('type'));//医生类型 1 门诊医生 2 计免 儿保医生
|
|
$sType = intval(request('type'));//医生类型 1 门诊医生 2 计免 儿保医生
|
|
$org_id = intval(request('org_id'));
|
|
$org_id = intval(request('org_id'));
|
|
$configData = object_array(json_decode($configData));
|
|
$configData = object_array(json_decode($configData));
|
|
- if(empty($docter_id) || empty($configData)){
|
|
|
|
|
|
+ if(empty($configData)){
|
|
return apiReturn(604,'参数错误');
|
|
return apiReturn(604,'参数错误');
|
|
}
|
|
}
|
|
|
|
|
|
@@ -858,6 +859,9 @@ class ApiController extends Controller
|
|
{
|
|
{
|
|
//排班类型 1门诊 2儿保 3计免
|
|
//排班类型 1门诊 2儿保 3计免
|
|
$sType = intval(request('id'));
|
|
$sType = intval(request('id'));
|
|
|
|
+ if(empty($sType)){
|
|
|
|
+ return apiReturn(603,'參數错误');
|
|
|
|
+ }
|
|
$user = Admin::user();
|
|
$user = Admin::user();
|
|
$role = 1;
|
|
$role = 1;
|
|
$docter_id=0;
|
|
$docter_id=0;
|