From 1390394266feb6b162ee3bb81ab26adc7b948fe8 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 09:35:24 +0800
Subject: [PATCH] just rename
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 173abf3..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
@@ -54,7 +54,8 @@
public Map<Integer, List<String>> getDisplayColInfo() {
CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
checkTypePageReqVO.setPageSize(-1);
- PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
+ 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()));
@@ -65,6 +66,10 @@
return _map;
}
+ /**
+ * 澶у睆鏄剧ず鐨勬偅鑰呬俊鎭�
+ * 涓嶄細鏈夊畨瑁呯浉鍏崇殑鎮ｈ�呬俊鎭�
+ */
@Override
public Map<Integer, Map<Integer, List<QueueDO>>> callingData() {
Map<Integer, Map<Integer, List<QueueDO>>> mapDisplayColQueue = new HashMap<>();
@@ -87,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()));
--
Gitblit v1.9.3