From e743e68c542c4f3fac4e085df830aa74fd34fd49 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 20 八月 2024 18:04:20 +0800
Subject: [PATCH] 医生叫号 初步实现
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 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 6ce69e2..dd6ba85 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
@@ -2,11 +2,8 @@
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.dataobject.room.RoomStatisticsDO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
-import lombok.Data;
-import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -17,13 +14,13 @@
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
@@ -97,34 +94,6 @@
return queueMapper.queueStatistic(statusList);
}
- @Override
- public void queue(QueueSaveReqVO queueSaveReqVO) {
- BedQueueBO bedQueueBO = priorityQueue.peek();
- if (null == bedQueueBO)
- return;
-
- if (bedQueueBO.queueNum.get() == bedQueueBO.maxQueueNum) {
- queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
- QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
- queueMapper.insert(queue); // queue.getId();
- } else if (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
- queueSaveReqVO.setStatus(QueueStatusEnum.READY.getStatus()); //鍊欒瘖鍑嗗涓�
- queueSaveReqVO.setRoomId(bedQueueBO.getRoomId());
- queueSaveReqVO.setRoomName(bedQueueBO.getRoomName());
- queueSaveReqVO.setBedNo(bedQueueBO.getBedNo());
- queueSaveReqVO.setSeqNum(curSeqNum.get());
- QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
- queueMapper.insert(queue); // queue.getId();
-
- curSeqNum.getAndIncrement();
- bedQueueBO.queueNum.getAndIncrement();
- BedQueueBO bedQueueBO2 = priorityQueue.poll();
- priorityQueue.offer(bedQueueBO2);
- }
-
-
- }
-
public void initQueue() {
priorityQueue.clear();
mapBedVsQueue.clear();
@@ -133,7 +102,7 @@
List<RoomDO> roomDOList = roomMapper.simpleRoomList();
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
- // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛� 鍒楄〃
+ // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
@@ -150,6 +119,21 @@
curSeqNum = new AtomicInteger(null == num ? 1 : ++num);
hurryup();
+ }
+
+ 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() );
}
/**
@@ -183,16 +167,16 @@
}
}
- public void finishPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
- Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
- System.out.println("瀹屾垚鏁伴噺: " + ret);
+ @Override
+ public void queue(QueueSaveReqVO queueSaveReqVO) {
+ queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
+ QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
+ queueMapper.insert(queue); // queue.getId();
+
+ hurryup();
}
- public void nextPatient(Long roomId, String bedNo) {
- finishPatient(roomId, bedNo);
-
+ private void nextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 灏辫瘖鍑嗗涓殑浜� 璁剧疆涓哄氨璇婁腑
queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
@@ -206,8 +190,27 @@
hurryup();
}
+ public void finishNextPatient(Long roomId, String bedNo) {
+ // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
+ Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+ System.out.println("瀹屾垚鏁伴噺: " + ret);
+
+ nextPatient(roomId, bedNo);
+ }
+
+ public void passNextPatient(Long roomId, String bedNo) {
+ // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓鸿繃鍙�
+ Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
+ System.out.println("瀹屾垚鏁伴噺: " + ret);
+
+ nextPatient(roomId, bedNo);
+ }
+
public List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, statusList);
return queueDOList;
}
+
}
--
Gitblit v1.9.3