diff --git a/app/Amqp/Consumer/SendSmsMessageConsumer.php b/app/Amqp/Consumer/SendSmsMessageConsumer.php index 66ed41a..c74b355 100644 --- a/app/Amqp/Consumer/SendSmsMessageConsumer.php +++ b/app/Amqp/Consumer/SendSmsMessageConsumer.php @@ -184,6 +184,12 @@ class SendSmsMessageConsumer extends ConsumerMessage case 'SMS_272165092': // 医生修改简介审核拒绝 break; + case 'SMS_462035956': + // 患者-新报告生成通知 + if (!isset($template_param['report'])) { + return false; + } + break; default: // 非法模版 return false; diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index 92c56f5..32138a4 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -1321,7 +1321,7 @@ class CallBackController extends AbstractController // 获取检测订单数据 $params = array(); - $params['detection_no'] = "D547790897904513024"; + $params['detection_no'] = "D547814062550614016"; $order_detection = OrderDetection::getOne($params); if (empty($order_detection)){ return $this->detectionResultFailReturn("非法订单"); @@ -1398,6 +1398,9 @@ class CallBackController extends AbstractController return $this->detectionResultFailReturn("问诊订单创建失败"); } + // 回填问诊订单id + $order_detection['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + // 增加患者问诊病例 $data = array(); $data['user_id'] = $order_detection['user_id']; diff --git a/app/Services/ImService.php b/app/Services/ImService.php index 0544ad7..3022ca9 100644 --- a/app/Services/ImService.php +++ b/app/Services/ImService.php @@ -677,7 +677,7 @@ class ImService extends BaseService try { // 发送消息 $cloud_custom_data = array(); - $cloud_custom_data['order_inquiry_id'] = $order_detection['order_inquiry_id']; + $cloud_custom_data['order_inquiry_id'] = (string)$order_detection['order_inquiry_id']; $cloud_custom_data['is_system'] = 1; $cloud_custom_data['inquiry_type'] = 5; // 订单类型(1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 5:检测) $cloud_custom_data['message_rounds'] = 0; @@ -719,7 +719,7 @@ class ImService extends BaseService try { // 消息内容 $cloud_custom_data = array(); - $cloud_custom_data['order_inquiry_id'] = $order_detection['order_inquiry_id']; + $cloud_custom_data['order_inquiry_id'] = (string)$order_detection['order_inquiry_id']; $cloud_custom_data['is_system'] = 1; $cloud_custom_data['inquiry_type'] = 5; // 订单类型(1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 5:检测) $cloud_custom_data['message_rounds'] = 0; diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index 00fe5f7..26bd6bd 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -2133,15 +2133,10 @@ class MessagePush extends BaseService $sub_data['params']['page'] = "Pages/yishi/wenzhen_v2/wenzhen"; $sub_data['params']['data'] = [ "thing1" => "问诊咨询已取消",// 提醒内容 - "name2" => (string)$this->order_inquiry['patient_name'],// 患者姓名 - "thing4" => (string)$disease_desc,// 病情描述 - "thing6" => "您可以选择其他患者的问诊咨询进行接诊",// 提示说明 - "thing5" => "",// 咨询内容 - ]; $data = array(); @@ -2336,19 +2331,19 @@ class MessagePush extends BaseService "thing1" => "【" . $detection_project['detection_project_name'] . "】报告已出",// 报告名称 "time3" => date('Y年m月d日 H:i'),// 生成时间 "thing9" => $order_detection['patient_name'],// 就诊人 - "thing4" => $basic_detection_organ['gts_ccis_name'],// 单位名称-检测所名称 + "thing4" => $basic_detection_organ['detection_organ_name'],// 单位名称-检测所名称 "thing8" => "请联系医生做报告解读,您有5个沟通回合。",// 测评结果 ]; // 短信 $sms_data = array(); $sms_data['template_code'] = "SMS_462035956"; - $sms_data['scene_desc'] = "您的${$detection_project['detection_project_name']}报告单已出,请联系医生做报告解读。平台已赠送您和医生5个沟通回合,请珍惜沟通机会,请前往肝胆相照互联网医院微信小程序“个人中心”-“检测订单”-“订单详情”查看报告。"; + $sms_data['scene_desc'] = "您的{$detection_project['detection_project_name']}报告单已出,请联系医生做报告解读。平台已赠送您和医生5个沟通回合,请珍惜沟通机会,请前往肝胆相照互联网医院微信小程序“个人中心”-“检测订单”-“订单详情”查看报告。"; $sms_data['phone'] = $this->user['mobile']; $sms_data['user_id'] = $this->user['user_id']; $template_param = array(); - $template_param['name'] = $order_detection['patient_name']; + $template_param['report'] = $detection_project['detection_project_name']; $sms_data['template_param'] = $template_param; $data = array();