修改问诊订单详情

app/Services/LoginService.php

@@ -299,8 +299,8 @@ class LoginService extends BaseService
                 $data['user_id'] = $user->user_id;
                 $data['user_name'] = $user['user_name'];
                 $data['status'] = 1;
-                $data['open_id'] = $open_id;
-                $data['wx_session_key'] = $session_key;
+                $data['open_id'] = $open_id ?? '';
+                $data['wx_session_key'] = $session_key ?? "";
 
                 if ($user['user_type'] == 1) {
                     // 患者
@@ -391,7 +391,7 @@ class LoginService extends BaseService
             $token_user_data = array();
             $token_user_data['user_id'] = $user['user_id']; // 用户id
             $token_user_data['user_type'] = $user['user_type'];// 用户类型
-            $token_user_data['open_id'] = $open_id;// open_id
+            $token_user_data['open_id'] = $open_id ?? "";// open_id
             $token_user_data['client_user_id'] = $client_user_id;// 对应客户端id
 
             // 发放token

app/Services/MessageNoticeService.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Services;
+
+use App\Model\MessageNotice;
+
+/**
+ * 通知消息
+ * 不区分各端
+ */
+class MessageNoticeService extends BaseService
+{
+    /**
+     * 获取医生服务消息列表-分页
+     * @return array
+     */
+    public function getDoctorMessageService(): array
+    {
+        $user_info = $this->request->getAttribute("userInfo") ?? [];
+
+        $page = $this->request->input('page', 1);
+        $per_page = $this->request->input('per_page', 10);
+
+        $params = array();
+        $params['user_id'] = $user_info['user_id'];
+        $params['user_type'] = 2;
+        $params['notice_type'] = 1; // 消息类型（1:医生服务通知 2:医生系统公告 3:患者系统消息
+        $params['send_status'] = 1;
+
+        $message_notice_system_params = array();
+        $message_notice_system_params["notice_type"] = 1;
+        $message_notice_system_params["send_status"] = 1;
+
+        $fields = [
+            'notice_id',
+            'notice_system_type',
+            'from_name',
+            'notice_title',
+            'notice_content',
+            'send_status',
+            'notice_send_time',
+            'link_type',
+            'notice_params',
+        ];
+
+        $result = MessageNotice::getMessageNoticePage($params,$message_notice_system_params,$fields,$page,$per_page);
+
+        return success($result);
+    }
+}

app/Services/PatientOrderService.php

@@ -196,6 +196,7 @@ class PatientOrderService extends BaseService
         $order_inquiry['user_doctor'] = [];
         if (!empty($order_inquiry['doctor_id'])) {
             $fields = [
+                'user_id',
                 'doctor_id',
                 'user_name',
                 'doctor_title',