From a5a95203b21daf91d1c0fe81ad28a0a23ad68cc3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 16:40:07 +0800
Subject: [PATCH] 防止 同诊室 同时点 安装-召回

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
index 4f8ec89..10ca305 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -523,18 +523,28 @@
     }
 
     @Override
-    public Integer recallPatient(Long roomId, String bedNo, String patId) {
-        Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
+    public Integer recallPatient(Long roomId, String bedNo, String patId, Integer checkType) {
+        Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId, checkType,
                 QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
+
+        // 妫�鏌ラ」鐩�.浜插拰鎬� 涓嶉渶瑕佸湪杩欓噷澶勭悊
+        // 浼氬湪 HurryUpOnBed 閲岄潰澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬�
+
         startHurryUpOneBed(roomId, bedNo);
         return updateNum;
     }
 
     @Override
-    public Integer recallInstallPatient(Long roomId, String bedNo, String patId) {
-        Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo, patId,
+    public Integer recallInstallPatient(Long roomId, String bedNo, String patId, Integer checkType, String bedNo_operator) {
+        Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo_operator, patId, checkType,
                 QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus());
-        // 瀹夎宸ヤ綅 涓嶈璁� 浼樺厛闃熷垪
+
+        // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊
+        if (null != updateNum && 1 == updateNum) {
+            updateAffinityItemsWhenInstallRecall(patId, checkType, bedNo_operator);
+        }
+
+        // 瀹夎宸ヤ綅 涓嶆秹鍙� 浼樺厛闃熷垪
         //startHurryUpOneBed(roomId, bedNo);
         return updateNum;
     }
@@ -566,7 +576,28 @@
         queueStatusList.add(QueueStatusEnum.READY.getStatus());
         queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
         queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+        queueStatusList.add(QueueStatusEnum.AFFINITY_WAITING.getStatus());
         List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList);
+
+        //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+        List<QueueDO> affinityWaitingList = new ArrayList<>();
+        ListIterator<QueueDO> iterator = queueDOList.listIterator();
+        while (iterator.hasNext()) {
+            QueueDO item = iterator.next();
+            if (item.getStatus() == QueueStatusEnum.AFFINITY_WAITING.getStatus()) {
+                iterator.remove();
+                affinityWaitingList.add(item);
+            }
+        }
+        affinityWaitingList.forEach( affinityWaitingItem -> {
+            for (int i = queueDOList.size()-1; i >= 0; i--) {
+                if ( affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
+                    queueDOList.add(i + 1, affinityWaitingItem);
+                    break;
+                }
+            }
+        });
+
         return queueDOList;
     }
 
@@ -575,12 +606,33 @@
         List<Integer> queueStatusList = new ArrayList<>();
         queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
         queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
+        queueStatusList.add(QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
         List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList);
 
         queueStatusList.clear();
         queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
         queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
         queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList) );
+
+        //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+        List<QueueDO> affinityReceivedList = new ArrayList<>();
+        ListIterator<QueueDO> iterator = queueDOList.listIterator();
+        while (iterator.hasNext()) {
+            QueueDO item = iterator.next();
+            if (item.getStatus() == QueueStatusEnum.AFFINITY_RECEIVED.getStatus()) {
+                iterator.remove();
+                affinityReceivedList.add(item);
+            }
+        }
+        affinityReceivedList.forEach( affinityReceivedItem -> {
+            for (int i = queueDOList.size()-1; i >= 0; i--) {
+                if ( affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
+                    queueDOList.add(i + 1, affinityReceivedItem);
+                    break;
+                }
+            }
+        });
+
         return queueDOList;
     }
 
@@ -592,4 +644,17 @@
         return roomDO;
     }
 
+    private void updateAffinityItemsWhenInstallRecall(String patId, Integer checkType, String bedNo_operator) {
+        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( checkType );
+        if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+            List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(patId,
+                    checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
+            for (int i = 0; i < affinityItems.size(); i++) {
+                QueueDO queueItem = affinityItems.get(i);
+                queueItem.setBedNo( bedNo_operator );
+                //queueItem.setSeqNum( preemptQueueItem.getSeqNum() );  // 瑁呮満鏃� 鍐呴儴搴忓彿涓嶅彉
+                queueMapper.updateById(queueItem);
+            }
+        }
+    }
 }

--
Gitblit v1.9.3