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']); }