From cb2507b0fddb4aeda36ea21addf77459d32d9996 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 12:10:01 +0800
Subject: [PATCH] 大屏 亲和项 处理

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
index 6e8abc4..44c62b3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
+++ b/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 );

--
Gitblit v1.9.3