From 6301ae507936041663cf5433bf54998dccc8b464 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Mon, 28 Aug 2023 10:42:45 +0800
Subject: [PATCH] 1

---
 .../DetectionCompleteDelayDirectConsumer.php  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php b/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php
index 8505043..3d250f9 100644
--- a/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php
@@ -56,6 +56,22 @@ class DetectionCompleteDelayDirectConsumer extends ConsumerMessage
             return Result::ACK;
         }
 
+        // 检测订单状态
+        if ($order_detection['detection_status'] != 4){
+            Log::getInstance("queue-DetectionComplete")->error("订单状态错误，无法处理");
+            return Result::DROP;
+        }
+
+        if (!empty($order_detection['detection_result_pdf'])){
+            Log::getInstance("queue-DetectionComplete")->error("无检测报告数据");
+            return Result::DROP;
+        }
+
+        if (!empty($order_detection['order_inquiry_id'])){
+            Log::getInstance("queue-DetectionComplete")->info("已创建检测问诊订单，无需继续处理");
+            return Result::ACK;
+        }
+
         try {
             // 检测当前医生是否和患者存在未完成问诊订单
             $InquiryService = new InquiryService();
@@ -82,17 +98,6 @@ class DetectionCompleteDelayDirectConsumer extends ConsumerMessage
                 }
             }
 
-            // 检测订单状态
-            if ($order_detection['detection_status'] != 3){
-                Log::getInstance("queue-DetectionComplete")->error("订单状态错误，无法处理");
-                return Result::DROP;
-            }
-
-            if (!empty($order_detection['detection_result_pdf'])){
-                Log::getInstance("queue-DetectionComplete")->error("无检测报告数据");
-                return Result::DROP;
-            }
-
             // 获取医生数据
             $params = array();
             $params['doctor_id'] = $order_detection['doctor_id'];