From a0e8a9e3eb543cf60ae971a9425ea3ce65ccd7d5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 09 四月 2025 09:51:55 +0800
Subject: [PATCH] just refactor
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedBO.java | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 32 +++++++++++++++++---------------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedBO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedBO.java
index b1572a7..1789de9 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedBO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedBO.java
@@ -26,11 +26,11 @@
* 杩欎袱涓瓧娈� 鐢ㄤ簬鍒嗘祦鎺у埗, 鍙備笌鍒嗘祦鐨勫伐浣嶄娇鐢�
* 銆愬�欒瘖涓�戞偅鑰呮暟 銆佹渶澶у厑璁告暟
*/
- AtomicInteger readyPatNum = new AtomicInteger(0);
+ Integer readyPatNum = 0;
Integer maxReadyPatNum = 0;
@Override
public int compareTo(@NotNull BedBO o) {
- return Integer.compare(this.readyPatNum.get(), o.readyPatNum.get());
+ return Integer.compare(this.readyPatNum, o.readyPatNum);
}
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
index f4ef8e4..302399f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
@@ -270,9 +270,9 @@
firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
queueMapper.updateById( firstReadyQueueItem );
- // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴
+ // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 銆愬�欒瘖涓�戞偅鑰呮暟閲� 鍑忎竴
BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
- bo.readyPatNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
+ bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
refreshBedPriorityLevelInRoutingQueue(bo);
return GlobalErrorCodeConstants.SUCCESS;
@@ -372,7 +372,7 @@
BedBO bedBO = getBedQueueBO(roomId, bedNo);
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
- while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) {
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
Integer updateNum = queueMapper.queueRecalledPatient(
bedBO.getRoomId(),
@@ -394,8 +394,8 @@
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedBO.readyPatNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
refreshBedPriorityLevelInRoutingQueue(bedBO);
@@ -423,11 +423,11 @@
if (null == bedBO)
return;
- int curQueueNum = bedBO.readyPatNum.get();
- if (curQueueNum > bedBO.maxReadyPatNum)
+ int curQueueNum = bedBO.getReadyPatNum();
+ if (curQueueNum > bedBO.getMaxReadyPatNum())
throw new RuntimeException("hurryupOneCheckType: exceed max queue number!");
- if (curQueueNum == bedBO.maxReadyPatNum)
+ if (curQueueNum == bedBO.getMaxReadyPatNum())
return;
// 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
@@ -455,8 +455,8 @@
curSeqNum.getAndIncrement();
- // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
- bedBO.readyPatNum.incrementAndGet();
+ // 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
+ bedBO.readyPatNum++;
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
refreshBedPriorityLevelInRoutingQueue(bedBO);
@@ -499,7 +499,7 @@
}
private void hurryupOneBedCheckTypeList(BedBO bedBO) {
- while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) {
+ while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
bedBO.getRoomId(),
@@ -525,7 +525,7 @@
curSeqNum.getAndIncrement();
- bedBO.readyPatNum.incrementAndGet();
+ bedBO.readyPatNum++;
}
// 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
@@ -584,7 +584,7 @@
queueStatusList.add(QueueStatusEnum.READY.getStatus()); //[鍊欒瘖涓璢
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList);
bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) );
- bedBO.setReadyPatNum(new AtomicInteger(queueDOList.size()));
+ bedBO.setReadyPatNum( queueDOList.size() );
Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
@@ -624,8 +624,10 @@
Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
- routingQueue.remove(bedBO);
- routingQueue.offer(bedBO);
+ if (null != routingQueue) {
+ routingQueue.remove(bedBO);
+ routingQueue.offer(bedBO);
+ }
});
}
--
Gitblit v1.9.3