From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 124 insertions(+), 23 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..0f8a490 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
@@ -34,6 +34,15 @@
@Resource
private RoomMapper roomMapper;
+ /**
+ * 闇�姹�1锛氱敤浜庡洖濉偅鑰呬俊鎭紙鎬у埆/鍑虹敓鏃ユ湡/鐥呭尯/搴婂彿/鐢佃瘽/鏉ユ簮/寮�鍗曞尰甯堢瓑锛夈��
+ * <p>
+ * 涓嬪垪灞忓箷鏌ヨ鏄�**鐩存帴鏌� queueMapper** 鐨勶紝涓嶇粡杩� QueueService 鐨勬煡璇㈡柟娉曪紝
+ * 鍥犳蹇呴』鏄惧紡璋冪敤 fillAppointmentInfo 琛ラ綈锛涘惁鍒欏ぇ灞�/璇婇棿灞忓彧鏈夊鍚嶃��
+ */
+ @Resource
+ private cn.lihu.jh.module.ecg.service.queue.QueueService queueService;
+
@Resource
private CheckTypeMapper checkTypeMapper;
@@ -58,7 +67,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 +84,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;
}
@@ -78,13 +97,38 @@
@Override
public Map<Integer, List<QueueDO>> getBigScreenPatient() {
Map<Integer, List<QueueDO>> mapDisplayColQueue = new HashMap<>();
- int displayColCnt = (int) mapCheckTypeVsDisplayColumn.values().stream().distinct().count();
- for (int dispCol=0; dispCol<displayColCnt; dispCol++) {
- List<QueueDO> columnQueueData = new ArrayList<>();
- mapDisplayColQueue.put(dispCol, columnQueueData);
- }
- mapDisplayColQueue.values().forEach(List::clear);
+ // 銆愪慨澶� NPE銆戞寜**鐪熷疄 calling_column 鍊�**寤洪敭锛岃�屼笉鏄� 0..count-1銆�
+ //
+ // 鍘熷疄鐜帮細
+ // int displayColCnt = distinct().count(); // 渚嬪 = 5
+ // for (i = 0; i < displayColCnt; i++) put(i, ...); // 寤洪敭 0,1,2,3,4
+ // 浣嗕笅闈㈠彇鍊肩敤鐨勬槸**鐪熷疄 calling_column**锛堝 0,1,3,4,-1锛夛紝
+ // 鍏朵腑 -1锛堣〃绀�"涓嶅湪澶у睆鏄剧ず"锛夋案杩滀笉浼氳寤洪敭 鈫� get(-1) 杩斿洖 null 鈫� NPE锛�
+ // 瀵艰嚧**鏁翠釜澶у睆鎺ュ彛 500銆佹暣灞忕┖鐧�**銆傚疄娴� check_type 涓湁 7 涓被鍨嬬殑
+ // calling_column = -1锛�700/800/900/1200/1300/1400/1500锛夛紝鍙杩欎簺绫诲瀷鏈夋偅鑰�
+ // 鍦ㄦ帓闃燂紝灏变細瑙﹀彂锛堝ぇ灞� SQL 鏃� check_type 杩囨护锛屽繀鐒惰鎹炲嚭锛夈��
+ //
+ // 淇鍚庯細鍙负**鏈夋晥鐨勬樉绀哄垪**锛�>=0锛夊缓閿紱-1 鐨勭被鍨嬪湪澶у睆涓嶆樉绀猴紝
+ // 鐢变笅鏂� col 鍒ゅ畾璺宠繃锛屼笉鍐嶄骇鐢� NPE銆�
+ //
+ // 銆愬仴澹�с�憁apCheckTypeVsDisplayColumn 浠呭湪 getDisplayColInfo() 涓祴鍊�
+ // 锛堝０鏄庡涓� null锛夈�傛甯稿惎鍔ㄦ祦绋嬬敱 MySpringEventListener 璋冪敤璇ユ柟娉曞垵濮嬪寲锛�
+ // 浣嗚嫢鍚姩闃舵璇ヨ皟鐢ㄦ湭鎴愬姛锛堜緥濡� CheckTypeMapper 鏌ヨ寮傚父锛夛紝
+ // 杩欓噷浼氱洿鎺� NPE 鈫� 澶у睆鍐嶆 500銆傛晠鍏堝垽绌哄苟鎯版�у垵濮嬪寲銆�
+ if (null == mapCheckTypeVsDisplayColumn) {
+ log.warn("[getBigScreenPatient] 鏄剧ず鍒楁槧灏勫皻鏈垵濮嬪寲锛屽皾璇曟儼鎬у垵濮嬪寲");
+ try {
+ getDisplayColInfo();
+ } catch (Exception e) {
+ log.error("[getBigScreenPatient] 鏄剧ず鍒楁槧灏勫垵濮嬪寲澶辫触锛岃繑鍥炵┖缁撴灉", e);
+ return mapDisplayColQueue; // 杩斿洖绌� map锛屽墠绔睍绀虹┖灞忚�岄潪 500
+ }
+ }
+ mapCheckTypeVsDisplayColumn.values().stream()
+ .filter(col -> col != null && col >= 0)
+ .distinct()
+ .forEach(col -> mapDisplayColQueue.put(col, new ArrayList<>()));
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -94,31 +138,80 @@
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 );
+ // 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙鎬у埆/鍑虹敓鏃ユ湡/鐥呭尯/搴婂彿/鐢佃瘽/鏉ユ簮/寮�鍗曞尰甯堢瓑锛�
+ queueService.fillAppointmentInfo(queueDOList);
queueDOList.forEach(queueDO -> {
- List<QueueDO> columnQueueData = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
+ Integer col = mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType());
+ // 鍙岄噸闃插尽锛氭槧灏勭己澶辨垨鍒椾负 -1锛堜笉鏄剧ず锛夋椂璺宠繃锛岄伩鍏� NPE
+ if (col == null || col < 0) {
+ return;
+ }
+ List<QueueDO> columnQueueData = mapDisplayColQueue.get(col);
+ if (columnQueueData == null) {
+ log.warn("[getBigScreenPatient][鏄剧ず鍒楁湭鍒濆鍖栵紝宸茶烦杩嘳 checkType={} callingColumn={}",
+ queueDO.getBookCheckType(), col);
+ return;
+ }
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());
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ // 銆愰渶姹�8 淇銆戣ˉ涓娿�屽凡杩囧彿-鎺掗槦銆�(3)銆�
+ //
+ // 闇�姹傚師鏂囷細銆岃繃鍙锋偅鑰呭簲鍑虹幇鍦�**澶у睆鍜岃瘖闂村睆**銆嶏紝涓斻�岃繃鍙蜂笌绛夊緟涓帓鍦ㄤ竴璧枫�佹寜搴忓彿鍗囧簭銆嶃��
+ // 澶у睆鐨� getBigScreenPatient 宸插惈 PASSED_WAITING(3)锛屼絾鏈柟娉曪紙璇婇棿灞忥級**婕忎簡**锛�
+ // 瀵艰嚧 status=3 鐨勬偅鑰呭湪澶у睆鍙銆佸湪璇婇棿灞忎笉鍙銆�
+ //
+ // 瀹炴祴澶嶇幇锛堟瀯閫� seq 1~5 鍏� 5 浣嶆偅鑰咃紝鍚� status=3 涓� 5锛夛細
+ // 澶у睆杩斿洖 5 浣� 鉁� 锛涜瘖闂村睆杩斿洖 4 浣嶏紙缂� status=3 閭ｄ綅锛夝煍�
+ //
+ // 鎺掑簭鏃犻渶棰濆澶勭悊锛歡etRoomQueueByStatus 鐨� order by 宸叉妸 status in (3,5) 褰掍负鍚屼竴缁�
+ // 锛堟帓鍦ㄥ氨璇婁腑涔嬪悗銆佸�欒瘖涔嬪墠锛夛紝缁勫唴鍐嶆寜 seq_num銆乥ook_timeslot 鍗囧簭 鈥斺�� 姝ｅ悎闇�姹傘��
+ queueStatusList.add(QueueStatusEnum.PASSED_WAITING.getStatus());
queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);
+ // 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙璇婇棿灞�-妫�鏌ラ槦鍒楋級
+ queueService.fillAppointmentInfo(queueDOList);
//鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
List<QueueDO> affinityWaitingList = new ArrayList<>();
@@ -142,15 +235,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());
@@ -158,6 +257,8 @@
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);
+ // 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙璇婇棿灞�-瑁呮満闃熷垪锛�
+ queueService.fillAppointmentInfo(queueDOList);
//鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
List<QueueDO> affinityReceivedList = new ArrayList<>();
--
Gitblit v1.9.3