From 160ae352de2d3d6cab01203ce2ae8b104b900afd Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 09 四月 2025 08:44:27 +0800
Subject: [PATCH] just refactor - rename
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
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 6b7b460..8a8db51 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
@@ -7,7 +7,6 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
@@ -148,7 +147,7 @@
}
mapOpeningBed.remove( Utils.formatRoomBed(roomId, bedNo) );
- removeRoutingQueue(bedBO);
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -169,7 +168,7 @@
}
bedBO.setStatus(BedStatusEnum.DOCTOR_PAUSE.getStatus());
- removeRoutingQueue(bedBO);
+ removeBedFromRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -191,7 +190,7 @@
}
bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addRoutingQueue(bedBO);
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -212,7 +211,7 @@
}
bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- addRoutingQueue(bedBO);
+ addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -233,7 +232,7 @@
return ROOM_INVALID_STATUS;
}
- removeRoutingQueue(bedBO);
+ removeBedFromRoutingQueue(bedBO);
bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
return GlobalErrorCodeConstants.SUCCESS;
@@ -275,7 +274,7 @@
BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
bo.readyPatNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
- refreshRoutingQueue(bo);
+ refreshBedPriorityLevelInRoutingQueue(bo);
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -331,7 +330,7 @@
bedBOList.forEach(item -> {
mapOpeningBed.put( Utils.formatRoomBed(item.roomId, item.bedNo), item);
if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) {
- addRoutingQueue(item);
+ addBedToRoutingQueue(item);
}
});
@@ -399,7 +398,7 @@
bedBO.readyPatNum.incrementAndGet();
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
- refreshRoutingQueue(bedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
// 澶勭悊 鎺掗槦涓� 鎮h��
@@ -460,7 +459,7 @@
bedBO.readyPatNum.incrementAndGet();
// 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭
- refreshRoutingQueue(bedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
}
@@ -530,7 +529,7 @@
}
// 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
- refreshRoutingQueue(bedBO);
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
}
/**
@@ -575,7 +574,7 @@
return ret;
}
- private void addRoutingQueue(BedBO bedBO) {
+ private void addBedToRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
@@ -604,7 +603,7 @@
});
}
- private void removeRoutingQueue(BedBO bedBO) {
+ private void removeBedFromRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
@@ -617,7 +616,7 @@
});
}
- private void refreshRoutingQueue(BedBO bedBO) {
+ private void refreshBedPriorityLevelInRoutingQueue(BedBO bedBO) {
// 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴�
if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType()))
return;
--
Gitblit v1.9.3