代码提交

liusheng

2025-09-15 3d1344ca6f0613bf3726d2c40d35f3928f82a910

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java

@@ -58,7 +58,16 @@
        PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPageForCallingScreen(checkTypePageReqVO);

        // 显示列 包含的检查类型列表
        Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
        Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().
            collect(
                Collectors.groupingBy(
                    CheckTypeDO::getCallingColumn,
                    Collectors.collectingAndThen(
                        Collectors.toList(),
                        list -> list.stream().sorted(Comparator.comparing(CheckTypeDO::getId)).toList()
                    )
                )
            );

        // 检查类型 对应的显示列
        mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
@@ -66,7 +75,8 @@
        // 显示列 对应的检查类型名列表
        Map<Integer, List<String>> _map = new HashMap<>();
        mapDisplayColName.keySet().forEach(key -> {
            _map.put(key, mapDisplayColName.get(key).stream().map(item->item.getName()+item.getSeqPrefix()).toList());
            List<String> displayColNameList = mapDisplayColName.get(key).stream().map(item->item.getName()+item.getSeqPrefix()).toList();
            _map.put(key, displayColNameList);
        });
        return _map;
    }
@@ -94,7 +104,7 @@
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED_WAITING.getStatus());
        queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
        List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
        List<QueueDO> queueDOList = queueMapper.getBigScreenQueueByStatus( queueStatusList );
        queueDOList.forEach(queueDO -> {
            List<QueueDO> columnQueueData = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
            columnQueueData.add( queueDO );
@@ -165,6 +175,9 @@
        return queueDOList;
    }

    /**
     * 诊间屏 安装患者列表
     */
    @Override
    public List<QueueDO> getRoomInstallRelatedPatient(String ip, Long roomId) {
        if (null == roomId) {