From 8cef5428fbeda836463463344eef4a5c5ef1cd3e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 09:59:05 +0800
Subject: [PATCH] 获取小屏显示患者列表
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 148 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 124 insertions(+), 24 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
index 8f77ace..db9a436 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
@@ -41,8 +41,6 @@
Map<Integer, Integer> mapCheckTypeVsDisplayColumn = null;
- Map<Integer, List<QueueDO>> mapDisplaySlotVsCallingData = new HashMap<>();
-
Integer waitingFrom = 0;
Integer passedFrom = 0;
@@ -51,13 +49,42 @@
this.bigScreenConfig = bigScreenConfig;
}
+
@Override
- public Map<Integer, List<QueueDO>> callingData() {
- if (null == mapCheckTypeVsDisplayColumn) {
- getDisplayColumnConfig();
- } else {
- mapDisplaySlotVsCallingData.values().stream().forEach(slotQueueList -> slotQueueList.clear());
+ public Map<Integer, List<String>> getDisplayColInfo() {
+ CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
+ checkTypePageReqVO.setPageSize(-1);
+ checkTypePageReqVO.setCallingColumn(-1); // 鍒楀彿 -1 鐨勪笉鏄剧ず
+ PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPageForCallingScreen(checkTypePageReqVO);
+ Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
+ mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
+
+ Map<Integer, List<String>> _map = new HashMap<>();
+ mapDisplayColName.keySet().forEach(key -> {
+ _map.put(key, mapDisplayColName.get(key).stream().map(item->item.getName()).toList());
+ });
+ return _map;
+ }
+
+ /**
+ * 澶у睆鏄剧ず鐨勬偅鑰呬俊鎭�
+ * 涓嶄細鏈夊畨瑁呯浉鍏崇殑鎮ｈ�呬俊鎭�
+ */
+ @Override
+ public Map<Integer, Map<Integer, List<QueueDO>>> callingData() {
+ Map<Integer, Map<Integer, List<QueueDO>>> mapDisplayColQueue = new HashMap<>();
+ int displayColCnt = (int) mapCheckTypeVsDisplayColumn.values().stream().distinct().count();
+ for (int dispCol=0; dispCol<displayColCnt; dispCol++) {
+ Map<Integer, List<QueueDO>> mapSoltQueueData = new HashMap<>();
+ mapSoltQueueData.put(0, new ArrayList<>());
+ mapSoltQueueData.put(1, new ArrayList<>());
+ mapSoltQueueData.put(2, new ArrayList<>());
+ mapDisplayColQueue.put(dispCol, mapSoltQueueData);
}
+
+ mapDisplayColQueue.values().stream().forEach(mapSlotQueue -> {
+ mapSlotQueue.values().stream().forEach(queueList -> queueList.clear());
+ });
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -65,14 +92,27 @@
queueStatusList.add(QueueStatusEnum.WAITING.getStatus());
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
queueDOList.stream().forEach(queueDO -> {
- List<QueueDO> listSolt = getDisplatSlotByQueue( queueDO.getBookCheckType(), queueDO.getStatus());
- listSolt.add( queueDO );
+ Map<Integer, List<QueueDO>> mapSlotQueue = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
+ List<QueueDO> soltList = mapSlotQueue.get(getDisplatSlotByQueueStatus(queueDO.getStatus()));
+ soltList.add( queueDO );
});
- mapDisplaySlotVsCallingData.values().stream().forEach(slotQueueList -> slotQueueList.sort(null));
- return mapDisplaySlotVsCallingData;
+ mapDisplayColQueue.values().stream().forEach(mapSoltQueue -> mapSoltQueue.values().stream().forEach(
+ slotQueueList -> slotQueueList.sort((o1, o2) -> {
+ if (null == o1.getSeqNum() && null == o2.getSeqNum()) {
+ return o1.getBookTimeslot() - o2.getBookTimeslot();
+ } else if (null != o1.getSeqNum() && null != o2.getSeqNum()) {
+ return o1.getSeqNum() - o2.getSeqNum();
+ } else if (null == o1.getSeqNum()) {
+ return 1;
+ } else { //杩欓噷 蹇呭畾 null == o2.getSeqNum()
+ return -1;
+ }
+ })));
+ return mapDisplayColQueue;
}
@Override
@@ -131,22 +171,82 @@
return queueDOList;
}
- private void getDisplayColumnConfig() {
- CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
- checkTypePageReqVO.setPageSize(-1);
- PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
- mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
-
- int displayColCnt = (int) mapCheckTypeVsDisplayColumn.values().stream().distinct().count();
- for (int i=0; i<displayColCnt; i++) {
- mapDisplaySlotVsCallingData.put(i*1000 + 0, new ArrayList<>());
- mapDisplaySlotVsCallingData.put(i*1000 + 1, new ArrayList<>());
- mapDisplaySlotVsCallingData.put(i*1000 + 2, new ArrayList<>());
+ @Override
+ public List<QueueDO> getRoomCheckRelatedPatient(String ip) {
+ List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
+ Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
+ if (!optionalQueueDO.isPresent()) {
+ return new ArrayList<QueueDO>();
}
+
+ Long roomId = optionalQueueDO.get().getRoomId();
+ List<Integer> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
+ queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
+ List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);
+
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ List<QueueDO> affinityWaitingList = new ArrayList<>();
+ ListIterator<QueueDO> iterator = queueDOList.listIterator();
+ while (iterator.hasNext()) {
+ QueueDO item = iterator.next();
+ if (item.getStatus() == QueueStatusEnum.AFFINITY.getStatus()) {
+ iterator.remove();
+ affinityWaitingList.add(item);
+ }
+ }
+ affinityWaitingList.forEach( affinityWaitingItem -> {
+ for (int i = queueDOList.size()-1; i >= 0; i--) {
+ if ( affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
+ queueDOList.add(i + 1, affinityWaitingItem);
+ break;
+ }
+ }
+ });
+
+ return queueDOList;
}
- private List<QueueDO> getDisplatSlotByQueue( Integer checkType, Integer queueStatus ) {
- return mapDisplaySlotVsCallingData.get(mapCheckTypeVsDisplayColumn.get(checkType)*1000 + getDisplatSlotByQueueStatus(queueStatus));
+ @Override
+ public List<QueueDO> getRoomInstallRelatedPatient(String ip) {
+ List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
+ Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
+ if (!optionalQueueDO.isPresent()) {
+ return new ArrayList<QueueDO>();
+ }
+
+ Long roomId = optionalQueueDO.get().getRoomId();
+ List<Integer> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
+ queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
+ queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
+ List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);
+
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ List<QueueDO> affinityReceivedList = new ArrayList<>();
+ ListIterator<QueueDO> iterator = queueDOList.listIterator();
+ while (iterator.hasNext()) {
+ QueueDO item = iterator.next();
+ if (item.getStatus() == QueueStatusEnum.AFFINITY_INSTALL.getStatus()) {
+ iterator.remove();
+ affinityReceivedList.add(item);
+ }
+ }
+ affinityReceivedList.forEach( affinityReceivedItem -> {
+ for (int i = queueDOList.size()-1; i >= 0; i--) {
+ if ( affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
+ queueDOList.add(i + 1, affinityReceivedItem);
+ break;
+ }
+ }
+ });
+
+ return queueDOList;
}
private Integer getDisplatSlotByQueueStatus( Integer queueStatus ) {
--
Gitblit v1.9.3