From 2f939b4546b7f331e520f1b86b0fa988a1510f62 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 16:01:15 +0800
Subject: [PATCH] 安装阶段 重新标记亲和
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 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 e152f46..8a53348 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
@@ -58,7 +58,16 @@
PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPageForCallingScreen(checkTypePageReqVO);
// 鏄剧ず鍒� 鍖呭惈鐨勬鏌ョ被鍨嬪垪琛�
- Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
+ Map<Integer, List<CheckTypeDO>> mapDisplayColName = pageResult.getList().stream().
+ collect(
+ Collectors.groupingBy(
+ CheckTypeDO::getCallingColumn,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ list -> list.stream().sorted(Comparator.comparing(CheckTypeDO::getId)).toList()
+ )
+ )
+ );
// 妫�鏌ョ被鍨� 瀵瑰簲鐨勬樉绀哄垪
mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
@@ -66,7 +75,8 @@
// 鏄剧ず鍒� 瀵瑰簲鐨勬鏌ョ被鍨嬪悕鍒楄〃
Map<Integer, List<String>> _map = new HashMap<>();
mapDisplayColName.keySet().forEach(key -> {
- _map.put(key, mapDisplayColName.get(key).stream().map(item->item.getName()).toList());
+ List<String> displayColNameList = mapDisplayColName.get(key).stream().map(item->item.getName()+item.getSeqPrefix()).toList();
+ _map.put(key, displayColNameList);
});
return _map;
}
@@ -94,24 +104,47 @@
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_WAITING.getStatus());
queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
- List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
+ List<QueueDO> queueDOList = queueMapper.getBigScreenQueueByStatus( queueStatusList );
queueDOList.forEach(queueDO -> {
List<QueueDO> columnQueueData = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
columnQueueData.add( queueDO );
+ });
+
+ mapDisplayColQueue.values().forEach( _queueDOList -> {
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ 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 mapDisplayColQueue;
}
@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>();
+ public List<QueueDO> getRoomCheckRelatedPatient(String ip, Long roomId) {
+ if (null == roomId) {
+ 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>();
+ }
+ roomId = optionalQueueDO.get().getRoomId();
}
- Long roomId = optionalQueueDO.get().getRoomId();
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -142,15 +175,21 @@
return queueDOList;
}
+ /**
+ * 璇婇棿灞� 瀹夎鎮ｈ�呭垪琛�
+ */
@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>();
- }
+ public List<QueueDO> getRoomInstallRelatedPatient(String ip, Long roomId) {
+ if (null == roomId) {
+ 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();
+ roomId = optionalQueueDO.get().getRoomId();
+ }
+
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
--
Gitblit v1.9.3