From c474cba67b8517386dfb7232c2e99dd2910349bb Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 29 Feb 2024 16:32:08 +0800
Subject: [PATCH] 2

---
 app/Services/InquiryService.php       | 4 ++--
 app/Services/PatientDoctorService.php | 2 +-
 app/Services/PatientOrderService.php  | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index af3f8d7..7cfa15f 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -98,7 +98,7 @@ class InquiryService extends BaseService
 
         // 检测是否存在同类型未完成的问诊订单
         $PatientOrderService = new PatientOrderService();
-        $order_inquiry_id = $PatientOrderService->getNotFinishedOrderInquiry($request_params['inquiry_type'], $user_info['client_user_id']);
+        $order_inquiry_id = $PatientOrderService->getNotFinishedOrderInquiry($request_params['inquiry_type'],$request_params['inquiry_mode'],$user_info['client_user_id']);
         if (!empty($order_inquiry_id)) {
             $result['status'] = 2;
             $result['message'] = "当前患者存在进行中的问诊订单";
@@ -1222,7 +1222,7 @@ class InquiryService extends BaseService
 
         // 检测是否存在同类型未完成的问诊订单
         $PatientOrderService = new PatientOrderService();
-        $result = $PatientOrderService->getNotFinishedOrderInquiry($order_inquiry['inquiry_type'], $order_inquiry['patient_id']);
+        $result = $PatientOrderService->getNotFinishedOrderInquiry($order_inquiry['inquiry_type'],$order_inquiry['inquiry_mode'], $order_inquiry['patient_id']);
         if (!empty($result)) {
             return fail(HttpEnumCode::HTTP_ERROR, "当前患者存在进行中的问诊订单");
         }
diff --git a/app/Services/PatientDoctorService.php b/app/Services/PatientDoctorService.php
index 5970be4..c5270ba 100644
--- a/app/Services/PatientDoctorService.php
+++ b/app/Services/PatientDoctorService.php
@@ -223,7 +223,7 @@ class PatientDoctorService extends BaseService
         try {
             // 检测是否存在同类型未完成的问诊订单
             $PatientOrderService = new PatientOrderService();
-            $order_inquiry_id = $PatientOrderService->getNotFinishedOrderInquiry($inquiry_type,$user_info['client_user_id']);
+            $order_inquiry_id = $PatientOrderService->getNotFinishedOrderInquiry($inquiry_type,$inquiry_mode,$user_info['client_user_id']);
             if (!empty($order_inquiry_id)){
                 $result['status'] = 2;
                 $result['data']['order_inquiry_id'] = $order_inquiry_id;
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 057046b..e827b85 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -2120,10 +2120,11 @@ class PatientOrderService extends BaseService
      * 获取患者未完成订单
      * @param string $patient_id
      * @param string|int $inquiry_type
+     * @param string|int $inquiry_mode
      * @param string $family_id
      * @return string
      */
-    public function getNotFinishedOrderInquiry(string|int $inquiry_type, string $patient_id = '', string $family_id = ''): string
+    public function getNotFinishedOrderInquiry(string|int $inquiry_type,string|int $inquiry_mode, string $patient_id = '', string $family_id = ''): string
     {
         $params = array();
         if (!empty($patient_id)) {
@@ -2135,7 +2136,7 @@ class PatientOrderService extends BaseService
         }
 
         $params[] = ['inquiry_type', '=', $inquiry_type];
-        $params[] = ['inquiry_mode', '=', 1];
+        $params[] = ['inquiry_mode', '=', $inquiry_mode];
         $params[] = ['inquiry_refund_status', '=', 0];
         $order_inquiry = OrderInquiry::getOrderOne($params);
         if (!empty($order_inquiry)) {