diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 082248a..6061eae 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -1413,6 +1413,14 @@ class UserDoctorService extends BaseService return fail(HttpEnumCode::SERVER_ERROR, "处方开具失败"); } + + Db::commit(); + } catch (\Exception $e) { + Db::rollBack(); + return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage()); + } + + try { // 检测药师自动审核配置开启状态 if ($system_config['is_auto_phar_verify_prescription'] == 1){ // 添加药师自动签章审核队列 @@ -1434,10 +1442,8 @@ class UserDoctorService extends BaseService $ImService = new ImService(); $ImService->pharmacistVerify($order_inquiry,(string)$order_prescription->order_prescription_id,$product_name,$user_doctor['user_id'],$order_inquiry['user_id']); - Db::commit(); - } catch (\Exception $e) { - Db::rollBack(); - return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage()); + }catch (\Exception $e){ + } return success(); @@ -1848,23 +1854,23 @@ 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']; - } - - if (!empty($result['not_doctor_ids'])){ - $not_doctor_ids = array_merge($not_doctor_ids,$result['not_doctor_ids']); - } - } +// // 获取全部深度合作的在线医生 +// $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']; +// } +// +// if (!empty($result['not_doctor_ids'])){ +// $not_doctor_ids = array_merge($not_doctor_ids,$result['not_doctor_ids']); +// } +// } // 获取在线的自由注册医生 $user_doctor = $this->getOnlineDoctor($inquiry_type,$not_doctor_ids);