From cce9d33e6c03ab48fb22c62fe5de3d1e902c598f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 14:25:51 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 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 eb40058..537c778 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,13 +1,15 @@
package cn.lihu.jh.module.ecg.service.queue;
import cn.lihu.jh.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.pojo.CommonResult;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
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.dataobject.room.RoomResVO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
-import cn.lihu.jh.module.ecg.enums.ErrorCodeConstants;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.infra.api.config.ConfigApi;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -26,6 +28,8 @@
import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -38,13 +42,15 @@
public class QueueServiceImpl implements QueueService {
@Resource
+ private ConfigApi configApi;
+
+ @Resource
private queueMapper queueMapper;
@Resource
private RoomMapper roomMapper;
AtomicInteger openingFlag = new AtomicInteger(0);
-
AtomicInteger curSeqNum = new AtomicInteger(0);
PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
@@ -52,6 +58,7 @@
ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
+ Integer queueReadyMax = 0;
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -208,7 +215,7 @@
BedQueueBO bedQueueBO = new BedQueueBO();
bedQueueBO.setRoomId(roomId);
bedQueueBO.setBedNo(bedNo);
- bedQueueBO.setMaxQueueNum(MAX_QUEUE_NUM);
+ bedQueueBO.setMaxQueueNum(queueReadyMax);
bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
priorityQueue.offer(bedQueueBO);
@@ -242,6 +249,22 @@
}
@Override
+ public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO) {
+ return error(QUEUE_BED_ABNORMAL);
+ }
+
+ RoomResVO roomResVO = roomMapper.getRoom(roomId, bedNo, docId);
+ if (null == roomResVO) {
+ return error(ECG_INNER_ERROR);
+ }
+
+ RoomRespVO roomRespVO = BeanUtils.toBean(roomResVO, RoomRespVO.class);
+ return success(roomRespVO);
+ }
+
+ @Override
public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
if (null == bedQueueBO)
@@ -272,9 +295,9 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
- statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.PAUSE);
Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName,
- BedStatusEnum.PAUSE, statusList);
+ BedStatusEnum.DOCTOR_ON, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
@@ -349,7 +372,7 @@
bedStatusEnumList.add(BedStatusEnum.OPENING);
bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
bedStatusEnumList.add(BedStatusEnum.PAUSE);
- List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
+ List<RoomResVO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
// 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
@@ -358,10 +381,10 @@
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
bedQueueBOList.forEach(item -> {
- item.maxQueueNum = MAX_QUEUE_NUM;
+ item.maxQueueNum = queueReadyMax;
Optional<QueueStatisticDO> queueStatisticDOOptional = queueStatisticDOList.stream().filter(it->it.getRoomId()==item.roomId && it.getBedNo().equals(item.getBedNo())).findFirst();
int queueNum = queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0;
- if ( MAX_QUEUE_NUM < queueNum )
+ if ( queueReadyMax < queueNum )
throw new RuntimeException("init: exceed max queue number!");
item.queueNum.set( queueNum );
@@ -521,6 +544,11 @@
return patientStatisticVO;
}
+ @Override
+ public void setQueueReadyMax(Integer max) {
+ queueReadyMax = max;
+ }
+
public void startBiz() {
if (1 == openingFlag.get())
return;
--
Gitblit v1.9.3