患者顺序 处理

eight

2025-04-14 c04653a6df7a4f9d3bd593f51ae9a8cd7ee93122

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

@@ -43,21 +43,16 @@
    @GetMapping("/big-screen-data")
    @Operation(summary = "大屏叫号数据")
    @PermitAll
    public CommonResult<Map<Integer, Map<Integer, List<ScreenQueueRespVO>>>> callingData()
    public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingData()
    {
        Map<Integer, Map<Integer, List<QueueDO>>> map = callingScreenService.getBigScreenPatient();
        Map<Integer, List<QueueDO>> map = callingScreenService.getBigScreenPatient();

        Map<Integer, Map<Integer, List<ScreenQueueRespVO>>> mapVO = new HashMap<>();
        Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
        map.keySet().forEach( displayCol -> {
            //log.info("dispayCol: " + displayCol);
            Map<Integer, List<QueueDO>> mapSoltQueueDO = map.get(displayCol);
            Map<Integer, List<ScreenQueueRespVO>> mapSoltQueueVO = new HashMap<>();
            mapSoltQueueDO.keySet().forEach( displaySlot -> {
                //log.info("displaySlot: " + displaySlot);
                mapSoltQueueVO.put(displaySlot, BeanUtils.toBean(mapSoltQueueDO.get(displaySlot), ScreenQueueRespVO.class));
            });

            mapVO.put(displayCol, mapSoltQueueVO);
            List<QueueDO> columnQueueDOList = map.get(displayCol);
            List<ScreenQueueRespVO> screenQueueRespVOList = BeanUtils.toBean(columnQueueDOList, ScreenQueueRespVO.class);
            mapVO.put(displayCol, screenQueueRespVOList);
        });

        return success( mapVO );
@@ -66,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));