From 94b54a005092321815c052afead764f9188e28c3 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 27 Apr 2023 08:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/InquiryService.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 12f1620..0eecbb1 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -56,6 +56,14 @@ class InquiryService extends BaseService
      */
     public function addInquiryOrder(): array
     {
+        $result = array();
+        $result['status'] = 1;
+        $result['message'] = "成功";
+        $result['data'] = [
+            "inquiry_no" => "",
+            "order_inquiry_id" => "",
+        ];
+
         $user_info = $this->request->getAttribute("userInfo") ?? [];
         $request_params = $this->request->all();
 
@@ -73,7 +81,10 @@ class InquiryService extends BaseService
         $PatientOrderService = new PatientOrderService();
         $order_inquiry_id = $PatientOrderService->getNotFinishedOrderInquiry($request_params['inquiry_type'],$user_info['client_user_id']);
         if (!empty($order_inquiry_id)) {
-            return fail(HttpEnumCode::HTTP_ERROR, "当前患者存在进行中的问诊订单",[$order_inquiry_id]);
+            $result['status'] = 2;
+            $result['message'] = "当前患者存在进行中的问诊订单";
+            $result['data']['order_inquiry_id'] = $order_inquiry_id;
+            return success([$result]);
         }
 
         // 是否为孕妇
@@ -121,7 +132,10 @@ class InquiryService extends BaseService
             $InquiryService = new InquiryService();
             $order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($user_info['client_user_id'],$request_params['doctor_id']);
             if (!empty($order_inquiry)){
-                return fail(HttpEnumCode::HTTP_ERROR, "您和当前医生存在问诊中订单，无法再次发起问诊");
+                $result['status'] = 2;
+                $result['message'] = "您和当前医生存在问诊中订单，无法再次发起问诊";
+                $result['data']['order_inquiry_id'] = $order_inquiry_id;
+                return success([$result]);
             }
         }
 
@@ -315,11 +329,10 @@ class InquiryService extends BaseService
             return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage());
         }
 
-        $result = array();
-        $result['inquiry_no'] = (string)$order_inquiry['inquiry_no']; // 订单编号
-        $result['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id']; // 订单主键id
-
-        return success($result);
+        $result['status'] = 1;
+        $result['data']['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id']; // 订单主键id
+        $result['data']['inquiry_no'] = (string)$order_inquiry['inquiry_no']; // 订单编号
+        return success([$result]);
     }
 
     /**