From 58f2c54f59b536f546812868393a2cf5b427eaa6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 11:24:18 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
index 48d615c..1a7489b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -126,24 +126,6 @@
}
/**
- * 杩欎釜閫昏緫 涓嶉渶瑕佷簡
- */
- public void reorderQueue() {
- // 鏍规嵁棰勭害鍓嶅悗锛屼粠DB 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛� 鍒楄〃
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- List<QueueDO> queueDOList = queueMapper.getOrderedQueue(queueStatusList);
- if (queueDOList.isEmpty())
- return;
-
- AtomicInteger seqNum = new AtomicInteger(1);
- queueDOList.forEach(item -> {item.setSeqNum(seqNum.getAndIncrement());});
- queueMapper.updateBatch(queueDOList);
-
- curSeqNum.set( seqNum.get() );
- }
-
- /**
* TODO 鏂板紑闃熷垪鏃讹紝闇�瑕佹妸鎺掗槦涓殑浜� 杞埌 灏辫瘖鍑嗗 鐘舵��
* 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
*/
@@ -227,9 +209,7 @@
if (0 == openingFlag.get())
return;
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
private void nextPatient(Long roomId, String bedNo) {
@@ -248,9 +228,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -301,16 +279,25 @@
}
@Override
- public Integer passedPatientReturn(Long roomId, String bedNo, String patId) {
+ public Integer recallPatient(Long roomId, String bedNo, String patId) {
Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
+ startHurryUp();
return updateNum;
}
@Override
- public Integer queueJump(String patId, Byte jumped) {
+ public Integer patientJump(String patId, Byte jumped) {
Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
- return null;
+ startHurryUp();
+ return updateNum;
+ }
+
+ private void startHurryUp() {
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
}
}
+
--
Gitblit v1.9.3