From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 af86eba..415acc4 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
@@ -57,11 +57,11 @@
Map<Integer, Map<Integer, List<ScreenQueueRespVO>>> mapVO = new HashMap<>();
map.keySet().forEach( displayCol -> {
- log.info("dispayCol: " + 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);
+ //log.info("displaySlot: " + displaySlot);
mapSoltQueueVO.put(displaySlot, BeanUtils.toBean(mapSoltQueueDO.get(displaySlot), ScreenQueueRespVO.class));
});
@@ -83,6 +83,7 @@
queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
queueStatusList.add(QueueStatusEnum.READY.getStatus());
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
--
Gitblit v1.9.3