From d14e741e49fb8f5fe2b825cb7dc1577c37cb6a66 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 28 八月 2024 10:14:25 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 74 insertions(+), 8 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 88e09de..b63807c 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 @@ -8,6 +8,7 @@ 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 +27,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.module.ecg.Constants.ECG_OPENING_TIME_KEY; +import static cn.lihu.jh.module.ecg.Constants.ECG_QUEUE_READY_MAX_KEY; import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; /** @@ -38,13 +41,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 +57,7 @@ ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor(); + Integer queueReadyMax = 0; @Override public Integer createqueue(QueueSaveReqVO createReqVO) { @@ -130,6 +136,24 @@ } @Override + public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) { + Future<ErrorCode> future = singleThreadExecutor.submit( + new BedDoctorResumeCallable(this, roomId, bedNo, docId, docName) + ); + + try { + ErrorCode ret = future.get(); + return ret; + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + + return ECG_INNER_ERROR; + } + + @Override public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) { Future<ErrorCode> future = singleThreadExecutor.submit( new BedDoctorOnCallable(this, roomId, bedNo, docId, docName) @@ -177,7 +201,6 @@ // DB update List statusList = new ArrayList<BedStatusEnum>(); statusList.add(BedStatusEnum.CLOSED); - statusList.add(BedStatusEnum.CLOSING); Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, BedStatusEnum.OPENING, statusList); if ( null==updateNum || 0 == updateNum ) @@ -191,8 +214,9 @@ 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); mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO); return SUCCESS; @@ -204,13 +228,19 @@ if (null == bedQueueBO) return QUEUE_BED_ABNORMAL; + if (bedQueueBO.getQueueNum().get() >0) + return QUEUE_HAVE_PATIENT; + + BedStatusEnum destStatusEnum = destStatusEnum = BedStatusEnum.CLOSED; + mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo)); + priorityQueue.remove(bedQueueBO); + // DB update List statusList = new ArrayList<BedStatusEnum>(); statusList.add(BedStatusEnum.OPENING); statusList.add(BedStatusEnum.DOCTOR_ON); statusList.add(BedStatusEnum.PAUSE); - Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, - BedStatusEnum.CLOSING, statusList); + Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, destStatusEnum, statusList); if ( null==updateNum || 0 == updateNum ) return ROOM_INVALID_STATUS; @@ -222,6 +252,29 @@ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo)); if (null == bedQueueBO) return QUEUE_BED_ABNORMAL; + + bedQueueBO.setStatusEnum(BedStatusEnum.PAUSE); + priorityQueue.remove(bedQueueBO); + + // DB update + List statusList = new ArrayList<BedStatusEnum>(); + statusList.add(BedStatusEnum.DOCTOR_ON); + Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName, + BedStatusEnum.PAUSE, statusList); + if ( null==updateNum || 0 == updateNum ) + return ROOM_INVALID_STATUS; + + return SUCCESS; + } + + @Override + public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) { + BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo)); + if (null == bedQueueBO) + return QUEUE_BED_ABNORMAL; + + bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON); + priorityQueue.offer(bedQueueBO); // DB update List statusList = new ArrayList<BedStatusEnum>(); @@ -248,6 +301,8 @@ if ( null==updateNum || 0 == updateNum ) return ROOM_INVALID_STATUS; + bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON); + return SUCCESS; } @@ -264,6 +319,8 @@ BedStatusEnum.OPENING, statusList); if ( null==updateNum || 0 == updateNum ) return ROOM_INVALID_STATUS; + + bedQueueBO.setStatusEnum(BedStatusEnum.OPENING); return SUCCESS; } @@ -294,7 +351,11 @@ mapBedVsQueue.clear(); // 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃 - List<RoomDO> roomDOList = roomMapper.simpleRoomList(); + List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>(); + bedStatusEnumList.add(BedStatusEnum.OPENING); + bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON); + bedStatusEnumList.add(BedStatusEnum.PAUSE); + List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList); List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList(); // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃 @@ -303,10 +364,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 ); @@ -466,6 +527,11 @@ return patientStatisticVO; } + @Override + public void setQueueReadyMax(Integer max) { + queueReadyMax = max; + } + public void startBiz() { if (1 == openingFlag.get()) return; -- Gitblit v1.9.3