叫号屏 显示列 refactor

eight

2024-10-29 498f1abcebeafde9761cbc1c236d35cfaf58947e

叫号屏 显示列 refactor

 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,11 @@

    @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);
        PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(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 -> {