From 79a8c6d4a70ebe372ced62a0732b964a521ac030 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 29 Apr 2024 14:15:16 +0800
Subject: [PATCH] 2

---
 app/Services/DetectionService.php | 29 ++++++++++++++++++++++++-----
 app/Services/InquiryService.php   |  4 ++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/Services/DetectionService.php b/app/Services/DetectionService.php
index dafa1b6..de677b2 100644
--- a/app/Services/DetectionService.php
+++ b/app/Services/DetectionService.php
@@ -566,7 +566,8 @@ class DetectionService extends BaseService
         $result = array();
         $result['status'] = 1;
         $result['message'] = "成功";
-        $result['data'] = "";
+        $result['data']['order_inquiry_id'] = "";
+        $result['data']['order_no'] = "";
 
         $params = array();
         $params['patient_id'] = $user_info['client_user_id'];
@@ -585,7 +586,8 @@ class DetectionService extends BaseService
         if (!empty($order_detection['order_inquiry_id'])) {
             $result['status'] = 1;
             $result['message'] = "成功";
-            $result['data'] = (string)$order_detection['order_inquiry_id'];
+            $result['data']['order_inquiry_id'] = (string)$order_detection['order_inquiry_id'];
+            $result['data']['order_no'] = (string)$order_detection['detection_no'];
 
             return success($result);
         }
@@ -602,7 +604,8 @@ class DetectionService extends BaseService
 
                     $result['status'] = 2;
                     $result['message'] = "当前医生有您未支付的订单，点击“继续”将为您取消订单直接进入报告解读服务。";
-                    $result['data'] = (string)$order_inquiry['order_inquiry_id'];
+                    $result['data']['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id'];
+                    $result['data']['order_no'] = (string)$order_inquiry['inquiry_no'];
 
                     return success($result);
                 }
@@ -613,7 +616,8 @@ class DetectionService extends BaseService
 
                     $result['status'] = 3;
                     $result['message'] = "当前医生有您待接诊的订单，点击“继续”将为您取消订单直接进入报告解读服务。";
-                    $result['data'] = (string)$order_inquiry['order_inquiry_id'];
+                    $result['data']['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id'];
+                    $result['data']['order_no'] = (string)$order_inquiry['inquiry_no'];
 
                     return success($result);
                 }
@@ -624,12 +628,27 @@ class DetectionService extends BaseService
 
                     $result['status'] = 4;
                     $result['message'] = "当前医生有您问诊中的订单，点击“继续”将进入聊天详情。";
-                    $result['data'] = (string)$order_inquiry['order_inquiry_id'];
+                    $result['data']['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id'];
+                    $result['data']['order_no'] = (string)$order_inquiry['inquiry_no'];
 
                     return success($result);
                 }
             }
 
+            // 获取患者家庭成员是否存在未支付的服务包订单
+            $OrderServicePackageService = new OrderServicePackageService();
+            $order_service_package = $OrderServicePackageService->getPatientFamilyNoPayServicePackage($user_info['user_id'], $order_detection['family_id'], $order_detection['doctor_id']);
+            if (!empty($order_service_package)){
+                // 待支付
+                Db::rollBack();
+
+                $result['status'] = 5;
+                $result['message'] = "您和当前医生存在未支付的服务包订单，点击“继续”将进入订单详情。";
+                $result['data']['order_no'] = (string)$order_service_package['order_service_no'];
+
+                return success($result);
+            }
+
             // 获取医生数据
             $params = array();
             $params['doctor_id'] = $order_detection['doctor_id'];
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 9c43ab8..c6f1ffc 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -179,7 +179,7 @@ class InquiryService extends BaseService
                 return success($result);
             }
 
-            // 获取患者家庭成员是否存在服务包订单
+            // 获取患者家庭成员是否存在未支付的服务包订单
             $OrderServicePackageService = new OrderServicePackageService();
             $order_service_package = $OrderServicePackageService->getPatientFamilyNoPayServicePackage($user_info['user_id'], $request_params['family_id'], $request_params['doctor_id']);
             if (!empty($order_service_package)){
@@ -1334,7 +1334,7 @@ class InquiryService extends BaseService
             return fail(HttpEnumCode::HTTP_ERROR, "当前患者和您存在问诊订单，不可赠送");
         }
 
-        // 获取患者家庭成员是否存在服务包订单
+        // 获取患者家庭成员是否存在未支付的服务包订单
         $OrderServicePackageService = new OrderServicePackageService();
         $order_service_package = $OrderServicePackageService->getPatientFamilyNoPayServicePackage($order_inquiry['user_id'], $order_inquiry['family_id'], $order_inquiry['doctor_id']);
         if (!empty($order_service_package)){