From 2cb4f97e706193afbddf49e56fcf798e9dc8eb85 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 22 八月 2024 17:04:40 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 21 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 ceb0e55..16d2883 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
@@ -1,5 +1,6 @@
package cn.lihu.jh.module.ecg.service.queue;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
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.room.RoomMapper;
@@ -32,7 +33,15 @@
@Validated
public class QueueServiceImpl implements QueueService {
- final static Integer MAX_QUEUE_NUM = 2;
+ final static Integer MAX_QUEUE_NUM = 3;
+
+ @Resource
+ private queueMapper queueMapper;
+
+ @Resource
+ private RoomMapper roomMapper;
+
+ AtomicInteger openingFlag = new AtomicInteger(0);
AtomicInteger curSeqNum = new AtomicInteger(0);
@@ -41,11 +50,6 @@
ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
- @Resource
- private queueMapper queueMapper;
-
- @Resource
- private RoomMapper roomMapper;
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -89,11 +93,9 @@
return queueMapper.selectPage(pageReqVO);
}
- @Override
- public List<QueueStatisticDO> queueStatistics(List<Byte> statusList) {
- return queueMapper.queueStatistic(statusList);
- }
-
+ /**
+ * 绯荤粺閲嶅惎鏃讹紝浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ */
public void initQueue() {
priorityQueue.clear();
mapBedVsQueue.clear();
@@ -110,7 +112,11 @@
bedQueueBOList.forEach(item -> {
item.maxQueueNum = MAX_QUEUE_NUM;
Optional<QueueStatisticDO> queueStatisticDOOptional = queueStatisticDOList.stream().filter(it->it.getRoomId()==item.roomId && it.getBedNo().equals(item.getBedNo())).findFirst();
- item.queueNum.set( queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0 );
+ int queueNum = queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0;
+ if ( MAX_QUEUE_NUM < queueNum )
+ throw new RuntimeException("init: exceed max queue number!");
+
+ item.queueNum.set( queueNum );
priorityQueue.offer(item);
mapBedVsQueue.put(String.format("%09d%s", item.roomId, item.bedNo), item);
});
@@ -119,6 +125,9 @@
curSeqNum = new AtomicInteger(null == num ? 0 : num);
}
+ /**
+ * 杩欎釜閫昏緫 涓嶉渶瑕佷簡
+ */
public void reorderQueue() {
// 鏍规嵁棰勭害鍓嶅悗锛屼粠DB 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛� 鍒楄〃
List<Byte> queueStatusList = new ArrayList<>();
@@ -139,29 +148,41 @@
* 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
*/
public void hurryup() {
- while (true) {
+ while (1 == openingFlag.get()) {
BedQueueBO bedQueueBO = priorityQueue.peek();
if (null == bedQueueBO)
return;
int curQueueNum = bedQueueBO.queueNum.get();
if (curQueueNum > bedQueueBO.maxQueueNum)
- throw new RuntimeException("exceed max queue number!");
+ throw new RuntimeException("hurryup: exceed max queue number!");
if (curQueueNum == bedQueueBO.maxQueueNum)
return;
- Integer updateNum = queueMapper.preemptPatient(
+ // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
+ Integer updateNum = queueMapper.procPassedReturnPatient(
bedQueueBO.getRoomId(),
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
curSeqNum.get() + 1,
- QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.PASSED_RETURN.getStatus(),
QueueStatusEnum.READY.getStatus());
- // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
if (null == updateNum || 0 == updateNum) {
- return;
+ // 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
+ updateNum = queueMapper.preemptPatient(
+ bedQueueBO.getRoomId(),
+ bedQueueBO.getRoomName(),
+ bedQueueBO.getBedNo(),
+ curSeqNum.get() + 1,
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus());
+
+ // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
+ if (null == updateNum || 0 == updateNum) {
+ return;
+ }
}
curSeqNum.getAndIncrement();
@@ -185,15 +206,23 @@
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
- singleThreadExecutor.submit( () -> {
+ if (0 == openingFlag.get())
+ return;
+
+ singleThreadExecutor.execute( () -> {
hurryup();
});
}
private void nextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 灏辫瘖鍑嗗涓殑浜� 璁剧疆涓哄氨璇婁腑
- queueMapper.updateQueueStatus(roomId, bedNo,
+ Integer updateNum = queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
+
+ // 璇ュ伐浣� 娌℃湁 灏辫瘖鍑嗗涓� 浜哄憳
+ if (null == updateNum || 0 == updateNum) {
+ return;
+ }
// 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
@@ -201,7 +230,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- singleThreadExecutor.submit( () -> {
+ singleThreadExecutor.execute( () -> {
hurryup();
});
}
@@ -227,4 +256,43 @@
return queueDOList;
}
+ public PatientStatisticVO getPatientStatistic(Long roomId, String bedNo) {
+ PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
+ List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
+ bedQueueStatisticDOList.forEach(item -> {
+ if (QueueStatusEnum.READY.getStatus() == item.getStatus()) {
+ patientStatisticVO.setReadyNum(item.getTotalInStatus());
+ } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
+ patientStatisticVO.setFinishedNum(item.getTotalInStatus());
+ } else if (QueueStatusEnum.PASSED.getStatus() == item.getStatus()) {
+ patientStatisticVO.setPassedNum(item.getTotalInStatus());
+ }
+ });
+
+ List<Byte> statusList = new ArrayList<>();
+ statusList.add(QueueStatusEnum.WAITING.getStatus());
+ Integer num = queueMapper.statusStatistic(statusList);
+ patientStatisticVO.setQueuingNum(num);
+
+ return patientStatisticVO;
+ }
+
+ public void startBiz() {
+ openingFlag.set(1);
+ hurryup();
+ }
+
+ @Override
+ public Integer passedPatientReturn(Long roomId, String bedNo, String patId) {
+ Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
+ QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
+ return updateNum;
+ }
+
+ @Override
+ public Integer queueJump(String patId, Byte jumped) {
+ Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
+ return null;
+ }
+
}
--
Gitblit v1.9.3