From ef86458242721792b2f181183811904eddfb8ef5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 11:44:38 +0800
Subject: [PATCH] 大屏显示患者 实现调整
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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 f372601..6e8abc4 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
@@ -4,18 +4,16 @@
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
-import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.ecg.service.callingscreen.CallingScreenService;
-import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,24 +25,39 @@
@RestController
@RequestMapping("/ecg/screen")
@Validated
+@Slf4j
public class CallingScreenController {
@Resource
private CallingScreenService callingScreenService;
- @Resource
- private EcgConfigService ecgConfigService;
+ @GetMapping("/display-col-info")
+ @Operation(summary = "鍒椾笂鏄剧ず鐨勬鏌ョ被鍨嬪悕绉�")
+ @PermitAll
+ public CommonResult<Map<Integer, List<String>>> displayColInfo()
+ {
+ Map<Integer, List<String>> map = callingScreenService.getDisplayColInfo();
+ return success( map );
+ }
@GetMapping("/big-screen-data")
@Operation(summary = "澶у睆鍙彿鏁版嵁")
@PermitAll
- public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingData()
+ public CommonResult<Map<Integer, Map<Integer, List<ScreenQueueRespVO>>>> callingData()
{
- Map<Integer, List<QueueDO>> map = callingScreenService.callingData();
+ Map<Integer, Map<Integer, List<QueueDO>>> map = callingScreenService.getBigScreenPatient();
- Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
- map.keySet().forEach( key -> {
- mapVO.put(key, BeanUtils.toBean(map.get(key), ScreenQueueRespVO.class));
+ Map<Integer, 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);
});
return success( mapVO );
@@ -57,21 +70,12 @@
{
String reqIp = ServletUtil.getClientIP(request);
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
- queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
- List<QueueDO> queueDOList = callingScreenService.getRoomQueue(reqIp, queueStatusList);
-
- List<QueueDO> passedList = queueDOList.stream().filter(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus()).toList();
- queueDOList.removeIf(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus());
+ List<QueueDO> queueDOList1 = callingScreenService.getRoomCheckRelatedPatient(reqIp);
+ List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp);
Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
- mapVO.put(1, BeanUtils.toBean(queueDOList, ScreenQueueRespVO.class));
- mapVO.put(2, BeanUtils.toBean(passedList, ScreenQueueRespVO.class));
+ mapVO.put(1, BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class));
+ mapVO.put(2, BeanUtils.toBean(queueDOList2, ScreenQueueRespVO.class));
return success( mapVO );
}
--
Gitblit v1.9.3