From ee48cd57cfa890e978cb4e00c7efccc1f452c7df Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 07 四月 2025 21:56:50 +0800
Subject: [PATCH] 仅仅注解
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 de872f3..d50fcdf 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
@@ -39,8 +39,6 @@
BigScreenConfig bigScreenConfig;
- Map<Integer, List<CheckTypeDO>> mapDisplayColName = null;
-
Map<Integer, Integer> mapCheckTypeVsDisplayColumn = null;
Integer waitingFrom = 0;
@@ -54,13 +52,12 @@
@Override
public Map<Integer, List<String>> getDisplayColInfo() {
- if (null == mapDisplayColName) {
- CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
- checkTypePageReqVO.setPageSize(-1);
- PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
- mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
- mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
- }
+ CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
+ checkTypePageReqVO.setPageSize(-1);
+ checkTypePageReqVO.setCallingColumn(-1); // 鍒楀彿 -1 鐨勪笉鏄剧ず
+ PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPageForCallingScreen(checkTypePageReqVO);
+ Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
+ mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
Map<Integer, List<String>> _map = new HashMap<>();
mapDisplayColName.keySet().forEach(key -> {
@@ -69,6 +66,10 @@
return _map;
}
+ /**
+ * 澶у睆鏄剧ず鐨勬偅鑰呬俊鎭�
+ * 涓嶄細鏈夊畨瑁呯浉鍏崇殑鎮ｈ�呬俊鎭�
+ */
@Override
public Map<Integer, Map<Integer, List<QueueDO>>> callingData() {
Map<Integer, Map<Integer, List<QueueDO>>> mapDisplayColQueue = new HashMap<>();
@@ -91,6 +92,7 @@
queueStatusList.add(QueueStatusEnum.WAITING.getStatus());
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
queueDOList.stream().forEach(queueDO -> {
Map<Integer, List<QueueDO>> mapSlotQueue = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
@@ -99,7 +101,17 @@
});
mapDisplayColQueue.values().stream().forEach(mapSoltQueue -> mapSoltQueue.values().stream().forEach(
- slotQueueList -> slotQueueList.sort((o1, o2) -> o1.getSeqNum() - o2.getSeqNum())));
+ slotQueueList -> slotQueueList.sort((o1, o2) -> {
+ if (null == o1.getSeqNum() && null == o2.getSeqNum()) {
+ return o1.getBookTimeslot() - o2.getBookTimeslot();
+ } else if (null != o1.getSeqNum() && null != o2.getSeqNum()) {
+ return o1.getSeqNum() - o2.getSeqNum();
+ } else if (null == o1.getSeqNum()) {
+ return 1;
+ } else { //杩欓噷 蹇呭畾 null == o2.getSeqNum()
+ return -1;
+ }
+ })));
return mapDisplayColQueue;
}
--
Gitblit v1.9.3