update

eight

2025-04-11 dadd95ea351e9747fb66bcc0e57f3ebcae5de73a

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

@@ -66,7 +66,7 @@
        // 显示列 对应的检查类型名列表
        Map<Integer, List<String>> _map = new HashMap<>();
        mapDisplayColName.keySet().forEach(key -> {
            _map.put(key, mapDisplayColName.get(key).stream().map(item->item.getName()).toList());
            _map.put(key, mapDisplayColName.get(key).stream().map(item->item.getName()+item.getSeqPrefix()).toList());
        });
        return _map;
    }
@@ -100,18 +100,41 @@
            columnQueueData.add( queueDO );
        });

        mapDisplayColQueue.values().forEach( _queueDOList -> {
            //把 [亲和的] 挪到主项后面
            List<QueueDO> affinityWaitingList = new ArrayList<>();
            ListIterator<QueueDO> iterator = _queueDOList.listIterator();
            while (iterator.hasNext()) {
                QueueDO item = iterator.next();
                if (item.getStatus() == QueueStatusEnum.AFFINITY.getStatus()) {
                    iterator.remove();
                    affinityWaitingList.add(item);
                }
            }
            affinityWaitingList.forEach( affinityWaitingItem -> {
                for (int i = _queueDOList.size()-1; i >= 0; i--) {
                    if ( affinityWaitingItem.getSeqNum() == _queueDOList.get(i).getSeqNum() ) {
                        _queueDOList.add(i + 1, affinityWaitingItem);
                        break;
                    }
                }
            });
        });

        return mapDisplayColQueue;
    }

    @Override
    public List<QueueDO> getRoomCheckRelatedPatient(String ip) {
        List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
        Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
        if (!optionalQueueDO.isPresent()) {
            return  new ArrayList<QueueDO>();
    public List<QueueDO> getRoomCheckRelatedPatient(String ip, Long roomId) {
        if (null == roomId) {
            List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
            Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
            if (!optionalQueueDO.isPresent()) {
                return new ArrayList<QueueDO>();
            }
            roomId = optionalQueueDO.get().getRoomId();
        }

        Long roomId = optionalQueueDO.get().getRoomId();
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
        queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -143,14 +166,17 @@
    }

    @Override
    public List<QueueDO> getRoomInstallRelatedPatient(String ip) {
        List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
        Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
        if (!optionalQueueDO.isPresent()) {
            return  new ArrayList<QueueDO>();
        }
    public List<QueueDO> getRoomInstallRelatedPatient(String ip, Long roomId) {
        if (null == roomId) {
            List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
            Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
            if (!optionalQueueDO.isPresent()) {
                return new ArrayList<QueueDO>();
            }

        Long roomId = optionalQueueDO.get().getRoomId();
            roomId = optionalQueueDO.get().getRoomId();
        }
        
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());