From 7cf3bed599627226d2e6ad6c4f2e1d71f3c32c4e Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 23 Aug 2023 09:25:29 +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/Request/DetectionRequest.php  | 1 +
 app/Services/DetectionService.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/Request/DetectionRequest.php b/app/Request/DetectionRequest.php
index 1bb503a..34694bd 100644
--- a/app/Request/DetectionRequest.php
+++ b/app/Request/DetectionRequest.php
@@ -23,6 +23,7 @@ class DetectionRequest extends FormRequest
         ],
         'getDetectionOrderFirst' => [ // 获取患者进行中的检测订单
             'family_id',
+            'detection_project_id',
         ],
         'bindDetectionTube' => [ // 绑定检测管
             'detection_bar_code',
diff --git a/app/Services/DetectionService.php b/app/Services/DetectionService.php
index 4cfe04e..142d6ac 100644
--- a/app/Services/DetectionService.php
+++ b/app/Services/DetectionService.php
@@ -482,11 +482,13 @@ class DetectionService extends BaseService
         $user_info = $this->request->getAttribute("userInfo") ?? [];
 
         $family_id = $this->request->input("family_id");
+        $detection_project_id = $this->request->input("detection_project_id");
 
         // 检测是否存在同类型未完成的检测订单
         $params = array();
         $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();