From 3e583e9d3be8982e16204d080df44e403a256791 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 12 Apr 2024 13:42:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php | 50 +++++++++++++++++-----------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index afb72f7..113241a 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -29,6 +29,8 @@ use App\Model\OrderProductCoupon;
 use App\Model\OrderProductItem;
 use App\Model\OrderProductLogistic;
 use App\Model\OrderServicePackage;
+use App\Model\OrderServicePackageCase;
+use App\Model\OrderServicePackageRefund;
 use App\Model\PatientFamily;
 use App\Model\PatientFamilyHealth;
 use App\Model\PatientFamilyPersonal;
@@ -1073,6 +1075,14 @@ class PatientOrderService extends BaseService
 
             $result['order_id'] = $order_service_package['order_service_id'];
             $result['created_at'] = $order_service_package['created_at'];
+            $result['inquiry_type'] = 1;
+
+            if ($order_service_package['order_service_type'] == 1){
+                $inquiry_mode = 8;
+            }else{
+                $inquiry_mode = 9;
+            }
+            $result['inquiry_mode'] = $inquiry_mode;
 
             // 获取订单金额
             $result['amount_total'] = $order_service_package['amount_total']; // 订单金额
@@ -2556,15 +2566,15 @@ class PatientOrderService extends BaseService
     {
         $user_info = $this->request->getAttribute("userInfo") ?? [];
 
-        $order_inquiry_id = $this->request->route('order_inquiry_id');
+        $order_no = $this->request->route('order_no');
 
         // 获取订单数据
         $params = array();
         $params['patient_id'] = $user_info['client_user_id'];
-        $params['order_inquiry_id'] = $order_inquiry_id;
+        $params['order_service_no'] = $order_no;
         $params['is_delete'] = 0;
-        $order_inquiry = OrderInquiry::getOne($params);
-        if (empty($order_inquiry)) {
+        $order_service_package = OrderServicePackage::getOne($params);
+        if (empty($order_service_package)) {
             return fail();
         }
 
@@ -2574,17 +2584,17 @@ class PatientOrderService extends BaseService
             'disease_desc',
         ];
         $params = array();
-        $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-        $order_inquiry_case = OrderInquiryCase::getOne($params, $fields);
-        if (empty($order_inquiry_case)) {
-            $order_inquiry['case'] = [];
+        $params['order_service_id'] = $order_service_package['order_service_id'];
+        $order_service_package_case = OrderServicePackageCase::getOne($params, $fields);
+        if (empty($order_service_package_case)) {
+            $order_service_package['case'] = [];
         } else {
-            $order_inquiry['case'] = $order_inquiry_case->toArray();
+            $order_service_package['case'] = $order_service_package->toArray();
         }
 
         // 获取医生数据
-        $order_inquiry['user_doctor'] = [];
-        if (!empty($order_inquiry['doctor_id'])) {
+        $order_service_package['user_doctor'] = [];
+        if (!empty($order_service_package['doctor_id'])) {
             $fields = [
                 'user_id',
                 'doctor_id',
@@ -2597,7 +2607,7 @@ class PatientOrderService extends BaseService
             ];
 
             $params = array();
-            $params['doctor_id'] = $order_inquiry['doctor_id'];
+            $params['doctor_id'] = $order_service_package['doctor_id'];
             $user_doctor = UserDoctor::getOne($params, $fields);
             if (empty($user_doctor)) {
                 return fail(HttpEnumCode::SERVER_ERROR);
@@ -2633,7 +2643,7 @@ class PatientOrderService extends BaseService
             $params['doctor_id'] = $user_doctor['doctor_id'];
             $user_doctor['follow'] = PatientFollow::getExists($params);
 
-            // 获取医生问诊配置-问诊购药
+            // 处理医生是否可处方
             $user_doctor['multi_point_enable'] = 0;
 
             $params = array();
@@ -2647,23 +2657,23 @@ class PatientOrderService extends BaseService
                 }
             }
 
-            $order_inquiry['user_doctor'] = $user_doctor;
+            $order_service_package['user_doctor'] = $user_doctor;
 
             unset($hospital);
             unset($user_doctor);
         }
 
         // 获取退款数据
-        $order_inquiry['order_inquiry_refund'] = array();
+        $order_service_package['order_service_package_refund'] = array();
 
         $params = array();
-        $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-        $order_inquiry_refund = OrderInquiryRefund::getList($params);
-        if (!empty($order_inquiry_refund)){
-            $order_inquiry['order_inquiry_refund'] = $order_inquiry_refund;
+        $params['order_service_id'] = $order_service_package['order_service_id'];
+        $order_service_package_refund = OrderServicePackageRefund::getList($params);
+        if (!empty($order_service_package_refund)){
+            $order_service_package['order_service_package_refund'] = $order_service_package_refund;
         }
 
-        return success($order_inquiry->toArray());
+        return success($order_service_package->toArray());
     }
 
     /**