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 | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 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 b961cb3..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 @@ -160,17 +160,29 @@ 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()); - // 娌℃湁鎶㈠埌鎺掗槦鎮h�� if (null == updateNum || 0 == updateNum) { - return; + // 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰� + updateNum = queueMapper.preemptPatient( + bedQueueBO.getRoomId(), + bedQueueBO.getRoomName(), + bedQueueBO.getBedNo(), + curSeqNum.get() + 1, + QueueStatusEnum.WAITING.getStatus(), + QueueStatusEnum.READY.getStatus()); + + // 娌℃湁鎶㈠埌鎺掗槦鎮h�� + if (null == updateNum || 0 == updateNum) { + return; + } } curSeqNum.getAndIncrement(); @@ -270,4 +282,17 @@ 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