From 3fa04cb2aff24925cddf7d2009738137bdcc5c31 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 12 十一月 2024 17:56:46 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 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 166034f..8a38c87 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
@@ -296,15 +296,28 @@
 
     // 瑁呮満鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
     public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
-        // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ 鐨勪汉 璁剧疆涓� [瀹夎涓璢
-        Integer updateNum = queueMapper.preemptToBeInstalledPatient(roomId, bedNo,
-                List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()),
-                QueueStatusEnum.INSTALLING.getStatus());
-        // 璇ュ伐浣� 娌℃湁 [宸查鐢╙ 浜哄憳
-        if (null == updateNum || 0 == updateNum) {
+        // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 [宸查鐢╙ [宸插彫鍥�-瀹夎] 鐨勪汉 璁剧疆涓� [瀹夎涓璢
+        QueueDO firstItem = queueMapper.getFirstItemByRoomAndStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
+        // 璇ュ伐浣� 娌℃湁 [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳
+        if (null == firstItem) {
             return QUEUE_NOT_READY_PATIENT;
         }
 
+        firstItem.setStatus( QueueStatusEnum.INSTALLING.getStatus() );
+        queueMapper.updateById( firstItem );
+
+        // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+        CheckTypeDO checkTypeDO = getCheckTypeItem( firstItem.getBookCheckType() );
+        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+            List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstItem.getPatId(),
+                                    checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.RECEIVED.getStatus());
+            for (int i = 0; i < affinityItems.size(); i++) {
+                QueueDO queueItem = affinityItems.get(i);
+                queueItem.setStatus(QueueStatusEnum.AFFINITY_RECEIVED.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
+                queueMapper.updateById(queueItem);
+            }
+        }
+
         // 瑁呮満宸ヤ綅 鏃犱紭鍏堥槦鍒�
         // 浼樺厛闃熷垪涓� 璇ュ伐浣� [宸查鐢╙浜虹殑鏁伴噺 鍑忎竴
         //BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );

--
Gitblit v1.9.3