From c05a87199a66dfd912ac83270b26aeb9afd09c2d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 10:19:29 +0800
Subject: [PATCH] 仅注解
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 9 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 05025cc..6a9acd0 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
@@ -39,8 +39,6 @@
BigScreenConfig bigScreenConfig;
- Map<Integer, List<CheckTypeDO>> mapDisplayColName = null;
-
Map<Integer, Integer> mapCheckTypeVsDisplayColumn = null;
Integer waitingFrom = 0;
@@ -54,14 +52,18 @@
@Override
public Map<Integer, List<String>> getDisplayColInfo() {
- if (null == mapDisplayColName) {
- CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
- checkTypePageReqVO.setPageSize(-1);
- PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
- mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
- mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
- }
+ 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());
@@ -69,6 +71,10 @@
return _map;
}
+ /**
+ * 澶у睆鏄剧ず鐨勬偅鑰呬俊鎭�
+ * 涓嶄細鏈夊畨瑁呯浉鍏崇殑鎮ｈ�呬俊鎭�
+ */
@Override
public Map<Integer, Map<Integer, List<QueueDO>>> callingData() {
Map<Integer, Map<Integer, List<QueueDO>>> mapDisplayColQueue = new HashMap<>();
@@ -91,6 +97,7 @@
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 -> {
Map<Integer, List<QueueDO>> mapSlotQueue = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
@@ -169,6 +176,84 @@
return queueDOList;
}
+ @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;
+ }
+
+ @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 ) {
if (QueueStatusEnum.READY.getStatus() == queueStatus)
return 0;
--
Gitblit v1.9.3