From ee09bfa0695d0d89015ad1a7348949539b16cc1b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 09 四月 2025 08:57:47 +0800
Subject: [PATCH] 诊间屏 数据 测试支持功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 3451fa9..965228c 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
@@ -2,28 +2,21 @@
import cn.hutool.extra.servlet.ServletUtil;
import cn.lihu.jh.framework.common.pojo.CommonResult;
-import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.CheckTypePageReqVO;
-import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
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.checktype.CheckTypeService;
-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;
-import java.util.stream.Collectors;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
@@ -32,21 +25,34 @@
@RestController
@RequestMapping("/ecg/screen")
@Validated
+@Slf4j
public class CallingScreenController {
@Resource
private CallingScreenService callingScreenService;
+
+ @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()
{
- Map<Integer, List<QueueDO>> map = callingScreenService.callingData();
+ 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.keySet().forEach( displayCol -> {
+ //log.info("dispayCol: " + displayCol);
+ List<QueueDO> columnQueueDOList = map.get(displayCol);
+ List<ScreenQueueRespVO> screenQueueRespVOList = BeanUtils.toBean(columnQueueDOList, ScreenQueueRespVO.class);
+ mapVO.put(displayCol, screenQueueRespVOList);
});
return success( mapVO );
@@ -55,26 +61,16 @@
@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<Integer> 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.INSTALLING.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() || queue.getStatus() == QueueStatusEnum.PASSED_INSTALL.getStatus()).toList();
-// queueDOList.removeIf(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus());
+ 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(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