修正获取患者问诊病例\修正发送消息回调缓存

app/Controller/CallBackController.php

@@ -343,6 +343,7 @@ class CallBackController extends AbstractController
             if (!empty($order_inquiry) && !empty($request_params['CloudCustomData'])){
                 if (!empty($order_inquiry['doctor_id'])){
                     $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+                    $data['to_user_id'] = $request_params['To_Account'];
                     $data['patient_name'] = $order_inquiry['patient_name'];
                     $data['patient_sex'] = $order_inquiry['patient_sex'];
                     $data['patient_age'] = $order_inquiry['patient_age'];

app/Controller/InquiryController.php

@@ -44,9 +44,14 @@ class InquiryController extends AbstractController
     /**
      * 获取患者问诊病例
      * @return ResponseInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function getPatientInquiryCase(): ResponseInterface
     {
+        $request = $this->container->get(InquiryRequest::class);
+        $request->scene('getPatientInquiryCase')->validateResolved();
+
         $InquiryService = new InquiryService();
         $data = $InquiryService->getPatientInquiryCase();
         return $this->response->json($data);

app/Request/InquiryRequest.php

@@ -42,6 +42,9 @@ class InquiryRequest extends FormRequest
             'inquiry_status',// 问诊订单状态（0:全部 1:待支付 2:待接诊 3:问诊中 4:完成/取消
             'family_id',// 家庭成员id（就诊用户）
         ],
+        'getPatientInquiryCase' => [ // 获取患者问诊病例
+            'order_inquiry_id',
+        ],
     ];
 
     /**

app/Services/InquiryService.php

@@ -298,11 +298,21 @@ class InquiryService extends BaseService
     public function getPatientInquiryCase(): array
     {
         $user_info = $this->request->getAttribute("userInfo") ?? [];
-        $inquiry_case_id = $this->request->route('inquiry_case_id');
+        $order_inquiry_id = $this->request->input('order_inquiry_id');
+
+        // 获取订单数据
+        $params = array();
+        $params['order_inquiry_id'] = $order_inquiry_id;
+        $params['doctor_id'] = $user_info['client_user_id'];
+        $order_inquiry = OrderInquiry::getOne($params);
+        if (empty($order_inquiry)) {
+            return fail();
+        }
 
         // 获取病例信息
         $params = array();
-        $params['inquiry_case_id'] = $inquiry_case_id;
+        $params['order_inquiry_id'] = $order_inquiry_id;
+        $params['status'] = 1;
         $order_inquiry_case = OrderInquiryCase::getOne($params);
         if (empty($order_inquiry_case)) {
             return fail();

config/routes.php

@@ -73,7 +73,7 @@ Router::addGroup('/doctor', function () {
         Router::put('/config', [UserDoctorController::class, 'putInquiryConfig']);
 
         // 获取患者问诊病例
-        Router::get('/case/{inquiry_case_id:\d+}', [InquiryController::class, 'getPatientInquiryCase']);
+        Router::get('/case', [InquiryController::class, 'getPatientInquiryCase']);
 
         // 获取医生问诊消息列表
         Router::get('/message', [UserDoctorController::class, 'getDoctorMessageList']);