From bcbd632895f50b68b0cae51be1d94871d140afaa Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Mon, 17 Apr 2023 16:50:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=85=8D=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E5=BF=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/PatientDoctorService.php | 2 +- app/Services/UserDoctorService.php | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Services/PatientDoctorService.php b/app/Services/PatientDoctorService.php index 84681ac..d5c9ac8 100644 --- a/app/Services/PatientDoctorService.php +++ b/app/Services/PatientDoctorService.php @@ -486,7 +486,7 @@ class PatientDoctorService extends BaseService if ($inquiry_type == 2 || $inquiry_type == 4){ $UserDoctorService = new UserDoctorService(); $doctor_id = $UserDoctorService->getInquiryAssignDoctor($inquiry_type,$user_info['client_user_id'],$is_system_time_pass); - dump($doctor_id); + if (empty($doctor_id)){ // 无合适医生 $result['status'] = 3; diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 81f024b..845613f 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -35,6 +35,7 @@ use App\Model\SystemInquiryTime; use App\Model\User; use App\Model\UserDoctor; use App\Model\UserDoctorInfo; +use App\Utils\Log; use App\Utils\Mask; use Extend\Alibaba\Oss; use Extend\VerifyDun\BankCard; @@ -1903,9 +1904,11 @@ class UserDoctorService extends BaseService if ($is_system_time_pass){ // 获取坐班时间包含当前时间的深度合作医生 $doctor_ids = $this->getNowTimePlatDeepCooperationDoctorId($inquiry_type,time(),$not_doctor_ids); + Log::getInstance()->info("获取坐班时间包含当前时间的深度合作医生:" ,$doctor_ids); // 检测医生是否可被分配 $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,0,$inquiry_type); + Log::getInstance()->info("检测医生是否可被分配:" ,$result); if (!empty($result['doctor_id'])){ return $result['doctor_id']; @@ -1925,9 +1928,11 @@ class UserDoctorService extends BaseService $user_doctor = $this->getOnlineDeepDoctor($inquiry_type,$not_doctor_ids); if (!empty($user_doctor)){ $doctor_ids = array_column($user_doctor,'doctor_id'); + Log::getInstance()->info("获取全部深度合作的在线医生:" ,$doctor_ids); // 检测医生是否可被分配 $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,0,$inquiry_type); + Log::getInstance()->info("检测医生是否可被分配:" ,$result); if (!empty($result['doctor_id'])){ return $result['doctor_id']; } @@ -1941,10 +1946,11 @@ class UserDoctorService extends BaseService $user_doctor = $this->getOnlineDoctor($inquiry_type,$not_doctor_ids); if (!empty($user_doctor)){ $doctor_ids = array_column($user_doctor,'doctor_id'); + Log::getInstance()->info("获取在线的自由注册医生:" ,$doctor_ids); // 检测医生是否可被分配 $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,1,$inquiry_type); - + Log::getInstance()->info("检测医生是否可被分配:" ,$result); if (!empty($result['doctor_id'])){ return $result['doctor_id']; } @@ -1957,8 +1963,11 @@ class UserDoctorService extends BaseService // 检测当前时间5分钟后，坐班时间包含某时间的平台深度合作医生 $doctor_ids = $this->getNowTimePlatDeepCooperationDoctorId($inquiry_type,strtotime ("+5 minute"),$not_doctor_ids); if (!empty($doctor_ids)){ + Log::getInstance()->info("检测当前时间5分钟后，坐班时间包含某时间的平台深度合作医生:" ,$doctor_ids); + // 检测医生是否可被分配 $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,1,$inquiry_type); + Log::getInstance()->info("检测医生是否可被分配:" ,$result); if (!empty($result['doctor_id'])){ return $result['doctor_id']; } @@ -1972,9 +1981,11 @@ class UserDoctorService extends BaseService $doctors = $this->getBeforeCurrentTimeDoctor(10,$inquiry_type,$not_doctor_ids); if (!empty($doctors)){ $doctor_ids = array_column($doctors,'doctor_id'); + Log::getInstance()->info("当前时间10分钟内接诊中医生:" ,$doctor_ids); // 检测医生是否可被分配 $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,1,$inquiry_type); + Log::getInstance()->info("检测医生是否可被分配:" ,$result); if (!empty($result['doctor_id'])){ return $result['doctor_id']; } @@ -1988,9 +1999,11 @@ class UserDoctorService extends BaseService $doctors = $this->getBeforeCurrentTimeDoctor(30,$inquiry_type,$not_doctor_ids); if (!empty($doctors)){ $doctor_ids = array_column($doctors,'doctor_id'); + Log::getInstance()->info("当前时间10分钟内接诊中医生:" ,$doctor_ids); // 检测医生是否可被分配 $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,1,$inquiry_type); + Log::getInstance()->info("检测医生是否可被分配:" ,$result); if (!empty($result['doctor_id'])){ return $result['doctor_id']; }