1

app/Services/ImService.php

@@ -278,7 +278,7 @@ class ImService extends BaseService
     }
 
     // 发送自定义消息
-    public function sendCustomMessage(string $from_user_id,string $to_user_id,string $content,string $order_inquiry_id,int $inquiry_type): void
+    public function sendCustomMessage(string $from_user_id,string $to_user_id,string $content,string $order_inquiry_id,int $inquiry_type, array $cloud_custom_data): void
     {
         if (!empty($from_user_id)){
             // 检测并创建发送者资料
@@ -295,7 +295,7 @@ class ImService extends BaseService
             $arg['From_Account'] = $from_user_id; // 发送方user_id 如系统发送，无需填写
         }
         $arg['To_Account'] = $to_user_id; // 接收方user_id
-        $arg['ForbidCallbackControl'] = ['ForbidBeforeSendMsgCallback'];
+        $arg['ForbidCallbackControl'] = ['ForbidBeforeSendMsgCallback','ForbidAfterSendMsgCallback'];
         $arg['SendMsgControl'] = ['NoUnread'];
 
         $arg['MsgBody'] = [
@@ -308,12 +308,10 @@ class ImService extends BaseService
         ];
 
         // 自定义消息
-        $cloud_custom_data = array();
-        $cloud_custom_data['order_inquiry_id'] = $order_inquiry_id;
-        $cloud_custom_data['is_system'] = 1;
-        $cloud_custom_data['inquiry_type'] = $inquiry_type;
-
-        $arg['CloudCustomData'] = json_encode($cloud_custom_data,JSON_UNESCAPED_UNICODE);
+        $arg['CloudCustomData'] = "";
+        if (!empty($cloud_custom_data)){
+            $arg['CloudCustomData'] = json_encode($cloud_custom_data,JSON_UNESCAPED_UNICODE);
+        }
 
         $message->sendMessage($arg);
     }

app/Services/UserDoctorService.php

@@ -468,6 +468,8 @@ class UserDoctorService extends BaseService
 
         foreach ($order_prescriptions['data'] as $order_prescription) {
             $data = array();
+            $data['order_prescription_id'] = $order_prescription['order_prescription_id'];
+            $data['order_inquiry_id'] = $order_prescription['order_inquiry_id'];
             $data['patient_name'] = $order_prescription['patient_name'];
             $data['patient_sex'] = $order_prescription['patient_sex'];
             $data['patient_age'] = $order_prescription['patient_age'];
@@ -979,13 +981,7 @@ class UserDoctorService extends BaseService
         $params = array();
         $params['doctor_id'] = $user_info['client_user_id'];
 
-        $fields = [
-            'doctor_id',
-            'iden_auth_status',
-            'idcard_status',
-            'multi_point_status',
-        ];
-        $user_doctor = UserDoctor::getOne($params, $fields);
+        $user_doctor = UserDoctor::getOne($params);
         if (empty($user_doctor)) {
             return fail(HttpEnumCode::HTTP_ERROR, "非法医生");
         }
@@ -1181,7 +1177,7 @@ class UserDoctorService extends BaseService
 
         // 检测处方是否重复开具
         $params = array();
-        $params['order_prescription_id'] = $order_inquiry['order_inquiry_id'];
+        $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
         $params['doctor_id'] = $user_info['client_user_id'];
         $order_prescription = OrderPrescription::getOne($params);
         if (!empty($order_prescription)) {