12
Some checks are pending
Build Docker / build (push) Waiting to run

This commit is contained in:
haomingming 2025-12-31 12:07:10 +08:00
parent bf3c7eb7fe
commit d400bb356e

View File

@ -94,10 +94,6 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
// 获取医生数据 // 获取医生数据
$params = array(); $params = array();
$params['doctor_id'] = $order_prescription['doctor_id']; $params['doctor_id'] = $order_prescription['doctor_id'];
// 获取抄方医生数据 (如果存在抄方操作)
if(!empty($order_inquiry['transfer_doctor_id'])){
$params['doctor_id'] = $order_inquiry['transfer_doctor_id'];
}
$user_doctor = UserDoctor::getOne($params); $user_doctor = UserDoctor::getOne($params);
if (empty($user_doctor)) { if (empty($user_doctor)) {
Log::getInstance("queue-AutoPharmacistCaVerify")->error("错误:医生数据错误"); Log::getInstance("queue-AutoPharmacistCaVerify")->error("错误:医生数据错误");
@ -156,7 +152,11 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
$this->modifyOrderPrescription($data['order_prescription_id'], 2, "请联系平台客服,请勿重开处方"); $this->modifyOrderPrescription($data['order_prescription_id'], 2, "请联系平台客服,请勿重开处方");
// 医生-开具的处方审核未通过 // 医生-开具的处方审核未通过
$MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']); $message_doctor_id = $user_doctor['user_id'];
if(!empty($order_inquiry["transfer_doctor_id"])){
$message_doctor_id = $order_inquiry['doctor_id'];
}
$MessagePush = new MessagePush($message_doctor_id, $order_inquiry['inquiry_no']);
$MessagePush->prescriptionVerifyFail($data['order_prescription_id']); $MessagePush->prescriptionVerifyFail($data['order_prescription_id']);
// 患者-处方审核未通过 // 患者-处方审核未通过
@ -276,15 +276,12 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
// 发送IM消息-处方已开具 // 发送IM消息-处方已开具
$imService = new ImService(); $imService = new ImService();
$doctor_im_id = $user_doctor['user_id']; $message_doctor_id = $user_doctor['user_id'];
//如果为抄方则发送给原医生IM //如果为抄方则发送给原医生IM
if(!empty($order_inquiry["transfer_doctor_id"])){ if(!empty($order_inquiry["transfer_doctor_id"])){
$params = array(); $message_doctor_id = $order_inquiry['doctor_id'];
$params['doctor_id'] = $order_inquiry['doctor_id'];
$user_doctor = UserDoctor::getOne($params);
$doctor_im_id = $user_doctor['user_id'];
} }
$imService->prescriptionIssued($order_inquiry,$doctor_im_id,$order_inquiry['user_id'],$product_name,(string)$data['order_prescription_id'],7); $imService->prescriptionIssued($order_inquiry,$message_doctor_id,$order_inquiry['user_id'],$product_name,(string)$data['order_prescription_id'],7);
// 发送站内、短信消息-患者的处方被药师审核通过 // 发送站内、短信消息-患者的处方被药师审核通过
$MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']); $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
@ -292,7 +289,7 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
// 站内、订阅失败发送短信-医生开具的处方审核通过 // 站内、订阅失败发送短信-医生开具的处方审核通过
// 发送目标不同,重新实例化 // 发送目标不同,重新实例化
$MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']); $MessagePush = new MessagePush($message_doctor_id, $order_inquiry['inquiry_no']);
$MessagePush->prescriptionVerifySuccess(); $MessagePush->prescriptionVerifySuccess();
// 添加处方过期队列 // 添加处方过期队列