From 11e73608f1a558c094811aae97a5bccd60317bc2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 10:24:34 +0800
Subject: [PATCH] Fix Bug: 工位 准备中数量 不对

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index d1b9401..d850e27 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -227,18 +227,11 @@
 
         // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
         if (checkTypeDO.getAffinityCheckTypes().length > 0) {
-            List<QueueDO> affinityReadyItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.READY.getStatus());
-            if (!affinityReadyItems.isEmpty()) {
-                QueueDO tmpQueueDO = affinityReadyItems.get(0);
+            List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
+            if (!affinityAffinityWaitingItems.isEmpty()) {
+                QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
                 tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
                 queueMapper.updateById(tmpQueueDO);
-            } else {
-                List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
-                if (!affinityAffinityWaitingItems.isEmpty()) {
-                    QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
-                    tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
-                    queueMapper.updateById(tmpQueueDO);
-                }
             }
         }
 

--
Gitblit v1.9.3