From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java |   34 +++++++---------------------------
 1 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
index 0f8a490..49812b1 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.lihu.jh.module.ecg.service.callingscreen;
 
 import cn.lihu.jh.framework.common.pojo.PageResult;
+import cn.lihu.jh.module.ecg.Utils;
 import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.CheckTypePageReqVO;
 import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
 import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
@@ -157,7 +158,7 @@
         });
 
         mapDisplayColQueue.values().forEach( _queueDOList -> {
-            //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+            //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
             List<QueueDO> affinityWaitingList = new ArrayList<>();
             ListIterator<QueueDO> iterator = _queueDOList.listIterator();
             while (iterator.hasNext()) {
@@ -167,14 +168,7 @@
                     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;
-                    }
-                }
-            });
+            Utils.insertAffinityItemsAfterMain(_queueDOList, affinityWaitingList);
         });
 
         return mapDisplayColQueue;
@@ -213,7 +207,7 @@
         // 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙璇婇棿灞�-妫�鏌ラ槦鍒楋級
         queueService.fillAppointmentInfo(queueDOList);
 
-        //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+        //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
         List<QueueDO> affinityWaitingList = new ArrayList<>();
         ListIterator<QueueDO> iterator = queueDOList.listIterator();
         while (iterator.hasNext()) {
@@ -223,14 +217,7 @@
                 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;
-                }
-            }
-        });
+        Utils.insertAffinityItemsAfterMain(queueDOList, affinityWaitingList);
 
         return queueDOList;
     }
@@ -260,7 +247,7 @@
         // 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙璇婇棿灞�-瑁呮満闃熷垪锛�
         queueService.fillAppointmentInfo(queueDOList);
 
-        //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+        //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
         List<QueueDO> affinityReceivedList = new ArrayList<>();
         ListIterator<QueueDO> iterator = queueDOList.listIterator();
         while (iterator.hasNext()) {
@@ -270,14 +257,7 @@
                 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;
-                }
-            }
-        });
+        Utils.insertAffinityItemsAfterMain(queueDOList, affinityReceivedList);
 
         return queueDOList;
     }

--
Gitblit v1.9.3