|
|
|
|
@ -200,19 +200,9 @@ public function GetEnablePlan()
|
|
|
|
|
$episodeid = request('episodeid');
|
|
|
|
|
$appointment_type = request('appointment_type'); //预约类型
|
|
|
|
|
$appointment_date = request('date'); //预约日期
|
|
|
|
|
$scope = request('scope', 'all');
|
|
|
|
|
|
|
|
|
|
$userDeptId = 0;
|
|
|
|
|
if ($scope === 'department') {
|
|
|
|
|
$userid = request('do_user');
|
|
|
|
|
if ($userid) {
|
|
|
|
|
$userInfo = DB::table('users')->where(['id' => $userid])->first();
|
|
|
|
|
$userDeptId = $userInfo->department_id ?? 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$service = new PlanListService();
|
|
|
|
|
return $service->GetEnablePlan($regnum, $entrustid, $episodeid, $appointment_type, $appointment_date, $scope, $userDeptId);
|
|
|
|
|
return $service->GetEnablePlan($regnum, $entrustid, $episodeid, $appointment_type, $appointment_date);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//最优时间/单天全检 分配
|
|
|
|
|
@ -224,19 +214,9 @@ public function GetOptimalPlan()
|
|
|
|
|
$episodeid = request('episodeid');
|
|
|
|
|
$appointment_type = request('appointment_type');
|
|
|
|
|
$items = request('items');
|
|
|
|
|
$scope = request('scope', 'all');
|
|
|
|
|
|
|
|
|
|
$userDeptId = 0;
|
|
|
|
|
if ($scope === 'department') {
|
|
|
|
|
$userid = request('do_user');
|
|
|
|
|
if ($userid) {
|
|
|
|
|
$userInfo = DB::table('users')->where(['id' => $userid])->first();
|
|
|
|
|
$userDeptId = $userInfo->department_id ?? 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$service = new PlanListService();
|
|
|
|
|
return $service->GetOptimalPlan($type, $regnum, $entrustid, $episodeid, $appointment_type, $items, $scope, $userDeptId);
|
|
|
|
|
return $service->GetOptimalPlan($type, $regnum, $entrustid, $episodeid, $appointment_type, $items);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//获取最近可用的,计划 日期
|
|
|
|
|
|