From f77fbfc8c07881f5239ce49b0dc78faaec3628b0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 10 十二月 2024 12:09:24 +0800
Subject: [PATCH] Fix Bug: 无预约时间的在预约表会有多条记录
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 05025cc..6b7d3d5 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 -> {
--
Gitblit v1.9.3