诊间屏 数据 测试支持功能

eight

2025-04-09 ee09bfa0695d0d89015ad1a7348949539b16cc1b

诊间屏 数据  测试支持功能

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java

@@ -61,12 +61,12 @@
    @GetMapping("/room-screen-data")
    @Operation(summary = "诊间屏数据")
    @PermitAll
    public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingDataRoom(HttpServletRequest request)
    public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingDataRoom(HttpServletRequest request, @RequestParam(value = "roomId", required = false)Long roomId)
    {
        String reqIp = ServletUtil.getClientIP(request);

        List<QueueDO> queueDOList1 = callingScreenService.getRoomCheckRelatedPatient(reqIp);
        List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp);
        List<QueueDO> queueDOList1 = callingScreenService.getRoomCheckRelatedPatient(reqIp, roomId);
        List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp, roomId);

        Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
        mapVO.put(1, BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class));

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

@@ -17,6 +17,6 @@
    Map<Integer, List<String>> getDisplayColInfo();
    Map<Integer, List<QueueDO>> getBigScreenPatient();

    List<QueueDO> getRoomCheckRelatedPatient(String ip);
    List<QueueDO> getRoomInstallRelatedPatient(String ip);
    List<QueueDO> getRoomCheckRelatedPatient(String ip, Long roomId);
    List<QueueDO> getRoomInstallRelatedPatient(String ip, Long roomId);
}

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

@@ -125,14 +125,16 @@
    }

    @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());
@@ -164,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());