|
@@ -39,7 +39,7 @@ class DoctorController extends Curd
|
|
|
|
|
|
protected function doSelect(array $where, string $field = null, string $order = 'desc')
|
|
|
{
|
|
|
- $model = $this->model->with('dept');
|
|
|
+ $model = $this->model->with(['dept','user']);
|
|
|
foreach ($where as $column => $value) {
|
|
|
if (is_array($value)) {
|
|
|
if ($value[0] === 'like' || $value[0] === 'not like') {
|
|
@@ -90,16 +90,16 @@ class DoctorController extends Curd
|
|
|
// 出诊时间
|
|
|
if ($info->doctor_visit_time) {
|
|
|
$doctorVisitTimeArr = explode('~', $info->doctor_visit_time);
|
|
|
- foreach ($doctorVisitTimeArr as $key => $item){
|
|
|
- $doctorVisitTimeArr[$key] = date("Y-m-d\TH:i:s\Z",strtotime(date('Y-m-d ').$item)-8*3600);
|
|
|
+ foreach ($doctorVisitTimeArr as $key => $item) {
|
|
|
+ $doctorVisitTimeArr[$key] = date("Y-m-d\TH:i:s\Z", strtotime(date('Y-m-d ') . $item) - 8 * 3600);
|
|
|
}
|
|
|
$info->doctor_visit_time = $doctorVisitTimeArr;
|
|
|
}
|
|
|
// 上班时间
|
|
|
if ($info->doctor_work) {
|
|
|
$doctorWorkArr = explode('~', $info->doctor_work);
|
|
|
- foreach ($doctorWorkArr as $key => $item){
|
|
|
- $doctorWorkArr[$key] = date("Y-m-d\TH:i:s\Z",strtotime(date('Y-m-d ').$item)-8*3600);
|
|
|
+ foreach ($doctorWorkArr as $key => $item) {
|
|
|
+ $doctorWorkArr[$key] = date("Y-m-d\TH:i:s\Z", strtotime(date('Y-m-d ') . $item) - 8 * 3600);
|
|
|
}
|
|
|
$info->doctor_work = $doctorWorkArr;
|
|
|
}
|
|
@@ -117,7 +117,7 @@ class DoctorController extends Curd
|
|
|
$doctorVisitTimeEnd = date('H:i', strtotime(explode(',', $data['doctor_visit_time'])[1]));
|
|
|
$data['doctor_visit_time'] = $doctorVisitTimeStart . '~' . $doctorVisitTimeEnd;
|
|
|
}
|
|
|
- if ($data['doctor_work']){
|
|
|
+ if ($data['doctor_work']) {
|
|
|
$doctorWorkStart = date('H:i', strtotime(explode(',', $data['doctor_work'])[0]));
|
|
|
$doctorWorkEnd = date('H:i', strtotime(explode(',', $data['doctor_work'])[1]));
|
|
|
$data['doctor_work'] = $doctorWorkStart . '~' . $doctorWorkEnd;
|
|
@@ -143,7 +143,7 @@ class DoctorController extends Curd
|
|
|
$doctorVisitTimeEnd = date('H:i', strtotime(explode(',', $data['doctor_visit_time'])[1]));
|
|
|
$data['doctor_visit_time'] = $doctorVisitTimeStart . '~' . $doctorVisitTimeEnd;
|
|
|
}
|
|
|
- if ($data['doctor_work']){
|
|
|
+ if ($data['doctor_work']) {
|
|
|
$doctorWorkStart = date('H:i', strtotime(explode(',', $data['doctor_work'])[0]));
|
|
|
$doctorWorkEnd = date('H:i', strtotime(explode(',', $data['doctor_work'])[1]));
|
|
|
$data['doctor_work'] = $doctorWorkStart . '~' . $doctorWorkEnd;
|
|
@@ -168,4 +168,22 @@ class DoctorController extends Curd
|
|
|
|
|
|
return json_success('success');
|
|
|
}
|
|
|
+
|
|
|
+ public function relationUser(Request $request)
|
|
|
+ {
|
|
|
+ $doctorId = $request->post('doctor_id','');
|
|
|
+ $userId = $request->post('join_doctor_user_id','');
|
|
|
+
|
|
|
+ if (!$doctorId || !$userId){
|
|
|
+ return json_fail("参数异常");
|
|
|
+ }
|
|
|
+
|
|
|
+ try {
|
|
|
+ MedicalDoctor::where('doctor_id',$doctorId)->update(['join_doctor_user_id'=>$userId]);
|
|
|
+ }catch (\Exception $e){
|
|
|
+ return json_fail("关联用户失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ return json_success("关联用户成功");
|
|
|
+ }
|
|
|
}
|