diff --git a/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php b/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php index d997003..891696a 100644 --- a/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php +++ b/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php @@ -276,9 +276,6 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage // 发送im消息 $imService = new ImService(); - // 患者病例 - $imService->patientCase($order_inquiry,$user_doctor['user_id'],$order_inquiry_case['disease_desc']); - // 等待医生接诊 $imService->waitDoctorInquiry($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']); diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index 242e8cf..30c9a93 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -188,8 +188,7 @@ class CallBackController extends AbstractController // 发送im消息 $imService = new ImService(); - // 患者病例 - $imService->patientCase($order_inquiry,$user_doctor['user_id'],$order_inquiry_case['disease_desc']); + // 等待医生接诊 $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']); @@ -1528,6 +1527,7 @@ class CallBackController extends AbstractController // 发送im消息 $imService = new ImService(); + // 患者病例 $imService->patientCase( $order_inquiry, diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index 34601f0..1384ddb 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -235,8 +235,6 @@ class MessagePush extends BaseService * 患者-通知患者医生已接诊 * 站内、订阅、短信 * @return void - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function patientAcceptedInquiry(): void { diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index f771194..4b953df 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -976,8 +976,6 @@ class PatientOrderService extends BaseService // 发送im消息 $imService = new ImService(); - // 患者病例 - $imService->patientCase($order_inquiry,$user_doctor['user_id'],$order_inquiry_case['disease_desc']); // 等待医生接诊 $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']); diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index c28718c..15911f5 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -1810,10 +1810,29 @@ class UserDoctorService extends BaseService } try { + // 获取订单医生数据 + $params = array(); + $params['doctor_id'] = $order_inquiry['doctor_id']; + $user_doctor = UserDoctor::getOne($params); + if (empty($user_doctor)) { + return success([],HttpEnumCode::HTTP_SUCCESS,"医生数据错误"); + } + + // 获取病例数据 + $params = array(); + $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + $order_inquiry_case = OrderInquiryCase::getOne($params); + if (empty($order_inquiry_case)){ + return success([],HttpEnumCode::HTTP_SUCCESS,"患者病例错误"); + } + // 发送IM消息-医生接诊 $imService = new ImService(); $imService->doctorInquiry($order_inquiry,$user_info['user_id'],$order_inquiry['user_id']); + // 发送IM消息-患者病例 + $imService->patientCase($order_inquiry,$user_doctor['user_id'],$order_inquiry_case['disease_desc']); + // 发送站内、订阅、短信消息-医生已接诊 $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']); $MessagePush->patientAcceptedInquiry();