diff --git a/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php b/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php index dc975f5..062db81 100644 --- a/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php +++ b/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php @@ -183,8 +183,9 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage } // 药师/医院签章 + Log::getInstance("queue-AutoPharmacistCaVerify")->info("药师/医院签章"); $OrderPrescriptionService = new OrderPrescriptionService(); - $prescription_open_result = $OrderPrescriptionService->openPrescription($data['order_prescription_id'],$user_pharmacist['user_id'],); + $prescription_open_result = $OrderPrescriptionService->openPrescription($data['order_prescription_id'],$user_pharmacist['user_id']); if (empty($prescription_open_result['file_id'])){ Db::rollBack(); Log::getInstance("queue-AutoPharmacistCaVerify")->error("错误:处方开具失败"); @@ -192,7 +193,8 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage } // 下载医院的签章pdf并上传至oss - $prescription_pdf_oss_path = $this->downCaPdfToOss($order_prescription, $user_doctor['user_id'],3,$prescription_open_result['file_id']); + Log::getInstance("queue-AutoPharmacistCaVerify")->info("下载医院的签章pdf并上传至oss"); + $prescription_pdf_oss_path = $this->downCaPdfToOss($order_prescription, $user_pharmacist['user_id'],3,$prescription_open_result['file_id']); if (!$prescription_pdf_oss_path) { Db::rollBack(); Log::getInstance("queue-AutoPharmacistCaVerify")->error("错误:" . $prescription_pdf_oss_path); @@ -203,7 +205,7 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage $this->modifyOrderPrescriptionFile($data['prescription_file_id'],$prescription_pdf_oss_path,$prescription_open_result['file_id']); // 修改处方表为通过 - $this->modifyOrderPrescription($data['prescription_file_id'],1); + $this->modifyOrderPrescription($data['order_prescription_id'],1); Db::commit(); Log::getInstance("queue-AutoPharmacistCaVerify")->info("成功"); diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index cc546e4..d214410 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -1260,7 +1260,7 @@ class MessagePush extends BaseService // 短信 $sms_data = array(); $sms_data['template_code'] = "SMS_272120097"; - $sms_data['scene_desc'] = "您为${$this->order_inquiry['patient_name']}患者开具的电子处方药师已审核通过,尽快和患者完成交流并提醒患者购药。请前往微信小程序“问诊消息”进行操作。"; + $sms_data['scene_desc'] = "您为{$this->order_inquiry['patient_name']}患者开具的电子处方药师已审核通过,尽快和患者完成交流并提醒患者购药。请前往微信小程序“问诊消息”进行操作。"; $sms_data['phone'] = $this->user['mobile']; $sms_data['user_id'] = $this->user['user_id']; @@ -1319,7 +1319,7 @@ class MessagePush extends BaseService // 短信 $sms_data = array(); $sms_data['template_code'] = "SMS_271905264"; - $sms_data['scene_desc'] = "您为${$this->order_inquiry['patient_name']}患者开具的电子处方药师审核不通过,请尽快前往微信小程序“处方管理”中查看原因,并重开处方。模版code:SMS_271905264"; + $sms_data['scene_desc'] = "您为{$this->order_inquiry['patient_name']}患者开具的电子处方药师审核不通过,请尽快前往微信小程序“处方管理”中查看原因,并重开处方。模版code:SMS_271905264"; $sms_data['phone'] = $this->user['mobile']; $sms_data['user_id'] = $this->user['user_id']; diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index a0b0bbb..82d593f 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -1423,7 +1423,7 @@ class UserDoctorService extends BaseService $message = new AutoPharmacistCaVerifyDelayDirectProducer($data); - $message->setDelayMs(1000 * 60 * 1); + $message->setDelayMs(1000 * 10); $producer = $this->container->get(Producer::class); $result = $producer->produce($message); if (!$result) {