From ca64d931ce30254e34d64ce28cf3a53e54a9159f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 26 八月 2024 09:32:50 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 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..8a806d3 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
@@ -77,6 +77,33 @@
queueMapper.deleteById(id);
}
+ @Override
+ public Integer bedControl(Long roomId, String bedNo, Integer status) {
+ // 钀ヤ笟鏈熼棿涓嶈兘鍏抽棴宸ヤ綅
+ if ( status == 0 && openingFlag.get() == 1 )
+ return 301;
+
+ // 褰撳墠鐘舵��
+ roomMapper.select
+
+ // DB update
+ Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, status);
+ if ( null==updateNum || 0 == updateNum )
+ return 310;
+
+ if ( status == 10 ) {
+ BedQueueBO bedQueueBO = new BedQueueBO();
+ bedQueueBO.setRoomId(roomId);
+ bedQueueBO.setBedNo(bedNo);
+ bedQueueBO.setMaxQueueNum(MAX_QUEUE_NUM);
+ bedQueueBO.setQueueNum(new AtomicInteger(0));
+ priorityQueue.offer(bedQueueBO);
+ mapBedVsQueue.put(String.format("%09d%s", bedQueueBO.roomId, bedQueueBO.bedNo), bedQueueBO);
+ }
+
+ return 0;
+ }
+
private void validatequeueExists(Integer id) {
if (queueMapper.selectById(id) == null) {
throw exception(QUEUE_NOT_EXISTS);
@@ -94,9 +121,11 @@
}
/**
- * 绯荤粺閲嶅惎鏃讹紝浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 锛侊紒寮�璇婃湡闂达紝涓嶈兘鎵ц杩欎釜鏂规硶锛屽惁鍒欎細鏈� P0 闂
+ * 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
*/
- public void initQueue() {
+ public void initBedQueueAndSeqNumFromDB() {
priorityQueue.clear();
mapBedVsQueue.clear();
@@ -123,24 +152,6 @@
Integer num = queueMapper.getMaxSeqNum();
curSeqNum = new AtomicInteger(null == num ? 0 : num);
- }
-
- /**
- * 杩欎釜閫昏緫 涓嶉渶瑕佷簡
- */
- 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() );
}
/**
@@ -227,9 +238,7 @@
if (0 == openingFlag.get())
return;
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
private void nextPatient(Long roomId, String bedNo) {
@@ -248,9 +257,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -296,21 +303,42 @@
}
public void startBiz() {
+ if (1 == openingFlag.get())
+ return;
+
+ // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
+ queueMapper.clearQueue();
+
+ initBedQueueAndSeqNumFromDB();
+
openingFlag.set(1);
hurryup();
}
+ public void closeBiz() {
+ openingFlag.set(0);
+ }
+
@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