仅仅注解

eight

2025-04-07 ee48cd57cfa890e978cb4e00c7efccc1f452c7df

 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()));