From 02bb102a4df102fd0a898f634d2736e42fc6eea3 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 10 Mar 2023 17:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8E=B7=E5=8F=96=E6=82=A3?=
 =?UTF-8?q?=E8=80=85=E9=97=AE=E8=AF=8A=E7=97=85=E4=BE=8B\=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php |  1 +
 app/Controller/InquiryController.php  |  5 +++++
 app/Request/InquiryRequest.php        |  3 +++
 app/Services/InquiryService.php       | 14 ++++++++++++--
 config/routes.php                     |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index 4257098..f31503f 100644
--- a/app/Controller/CallBackController.php
+++ b/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'];
diff --git a/app/Controller/InquiryController.php b/app/Controller/InquiryController.php
index af61552..0c38714 100644
--- a/app/Controller/InquiryController.php
+++ b/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);
diff --git a/app/Request/InquiryRequest.php b/app/Request/InquiryRequest.php
index 2464805..ae65fee 100644
--- a/app/Request/InquiryRequest.php
+++ b/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',
+        ],
     ];
 
     /**
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index bdc8f26..7d3f853 100644
--- a/app/Services/InquiryService.php
+++ b/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();
diff --git a/config/routes.php b/config/routes.php
index f375b8d..b1b554d 100644
--- a/config/routes.php
+++ b/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']);