From 7cf7537009b3add8ce851b56163f43ed15000041 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 十月 2024 14:12:40 +0800
Subject: [PATCH] 装机 过号&召回 逻辑 update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
index a7dc7b6..635e873 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
@@ -259,8 +259,9 @@
     // 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
     public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
         // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ 鐨勪汉 璁剧疆涓� [瀹夎涓璢
-        Integer updateNum = queueMapper.preemptReceivedPatient(roomId, bedNo,
-                QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.INSTALLING.getStatus());
+        Integer updateNum = queueMapper.preemptToBeInstalledPatient(roomId, bedNo,
+                List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()),
+                QueueStatusEnum.INSTALLING.getStatus());
         // 璇ュ伐浣� 娌℃湁 [宸查鐢╙ 浜哄憳
         if (null == updateNum || 0 == updateNum) {
             return QUEUE_NOT_READY_PATIENT;
@@ -360,7 +361,7 @@
                     bedQueueBO.getRoomName(),
                     bedQueueBO.getBedNo(),
                     curSeqNum.get() + 1,
-                    QueueStatusEnum.RECALLED.getStatus(),
+                    QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 娌℃湁浼樺厛闃熷垪
                     QueueStatusEnum.READY.getStatus());
             if (null == updateNum || 0 == updateNum)
                 break;

--
Gitblit v1.9.3