From 544d62ec7d67a581949f250397f5de901980d991 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 23 Aug 2023 09:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=B5=8B=E4=B8=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/DetectionService.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/Services/DetectionService.php b/app/Services/DetectionService.php
index 142d6ac..d2357b3 100644
--- a/app/Services/DetectionService.php
+++ b/app/Services/DetectionService.php
@@ -489,13 +489,8 @@ class DetectionService extends BaseService
         $params['patient_id'] = $user_info['client_user_id'];
         $params['family_id'] = $family_id;
         $params['detection_project_id'] = $detection_project_id;
-        $order_detection = OrderDetection::getLastOne($params);
-        if (empty($order_detection)){
-            return success();
-        }
-
-        if ($order_detection['detection_status'] != 4 || $order_detection['detection_status'] != 5){
-            // 检测完成-已取消
+        $order_detection = OrderDetection::getNotFinishedOrderDetectionOne($params);
+        if (!empty($order_detection)){
             return success($order_detection['detection_no']);
         }