diff --git a/app/Amqp/Consumer/SendSmsMessageConsumer.php b/app/Amqp/Consumer/SendSmsMessageConsumer.php index b579859..49d1345 100644 --- a/app/Amqp/Consumer/SendSmsMessageConsumer.php +++ b/app/Amqp/Consumer/SendSmsMessageConsumer.php @@ -59,7 +59,7 @@ class SendSmsMessageConsumer extends ConsumerMessage } } - if ($data['phone'] == "17600901561"){ + if ($data['phone'] == "17600901561" || $data['phone'] == "15670592813"){ // 发送短信 Dysms::sendSms($data['phone'],$data['template_param'],$data['template_code'],$data['scene_desc']); } diff --git a/app/Amqp/Consumer/SendStationMessageConsumer.php b/app/Amqp/Consumer/SendStationMessageConsumer.php index fcf4a73..0bd7c5c 100644 --- a/app/Amqp/Consumer/SendStationMessageConsumer.php +++ b/app/Amqp/Consumer/SendStationMessageConsumer.php @@ -50,10 +50,10 @@ class SendStationMessageConsumer extends ConsumerMessage if ($data['notice_type'] == 1){ // 医生服务通知 - $message_type = 3; + $message_type = 4; }elseif ($data['notice_type'] == 2){ // 医生系统公告 - $message_type = 4; + $message_type = 3; }elseif ($data['notice_type'] == 3){ // 患者系统消息 $message_type = 5; diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index e883117..80cdfcf 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -11,6 +11,7 @@ use App\Model\HospitalDepartmentCustom; use App\Model\OrderPrescriptionProduct; use App\Model\OrderProduct; use App\Model\OrderProductItem; +use App\Model\PatientFamily; use App\Model\User; use App\Model\UserCaCert; use App\Model\OrderInquiry; @@ -672,7 +673,10 @@ class TestController extends AbstractController // 获取问诊患者数据 $params = array(); $params['family_id'] = $order_inquiry['family_id']; - $patient_family = + $patient_family = PatientFamily::getOne($params); + if (empty($patient_family)){ + throw new BusinessException("医生自定义数据错误"); + } $arg = array(); $arg['thirdUniqueid'] = $order_inquiry['order_inquiry_id']; // 唯一标识 @@ -687,7 +691,12 @@ class TestController extends AbstractController $arg['patientAge'] = $order_inquiry['patient_age']; // 患者年龄 $arg['patientSex'] = $order_inquiry['patient_sex'] == 0 ?: 1; // 患者性别 $arg['patientIdcardType'] = 1; // 证件类型 - $arg['patientIdcardNum'] = 1; // 患者证件号码 + $arg['patientIdcardNum'] = $patient_family['id_number']; // 患者证件号码 + $arg['serviceType'] = 1; // 服务类型 1网络咨询 2网络门诊 + $arg['consultNo'] = $order_inquiry['inquiry_no']; // 网络咨询或网络门诊编号 订单编号 + $arg['consultType'] = 1; // 咨询类别 1、图文咨询 2语音咨询3、视频咨询 + $arg['consultApplyTime'] = 1; // 咨询类别 1、图文咨询 2语音咨询3、视频咨询 + $result = $regulatoryPlatform->uploadConsult($arg); dump($result);