From 971bd30b611531464d7a878352e453ab4511f93f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 19 六月 2025 19:36:24 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 265 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 165 insertions(+), 100 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 9eba672..4926a0b 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,11 +8,12 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
-import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
import lombok.extern.slf4j.Slf4j;
+import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -29,6 +30,7 @@
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
+
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
@@ -57,7 +59,7 @@
private RoomMapper roomMapper;
@Resource
- private CallMapper callMapper;
+ private AppointmentMapper appointmentMapper;
@Resource
private DevRentMapper devRentMapper;
@@ -94,7 +96,7 @@
@Override
public ErrorCode startBedOpen(Long roomId, String roomName, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(queueServiceTxFunctions, roomId, roomName, bedNo));
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedOpenCallable(queueServiceTxFunctions, roomId, roomName, bedNo));
try {
ErrorCode ret = future.get();
@@ -111,7 +113,7 @@
@Override
public ErrorCode startBedClose(Long roomId, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit( new BedCloseCallable(queueServiceTxFunctions, roomId, bedNo));
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedCloseCallable(queueServiceTxFunctions, roomId, bedNo));
try {
ErrorCode ret = future.get();
@@ -128,9 +130,7 @@
@Override
public ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
- Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorPauseCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
- );
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorPauseCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
try {
ErrorCode ret = future.get();
@@ -147,9 +147,7 @@
@Override
public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
- Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorResumeCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
- );
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorResumeCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
try {
ErrorCode ret = future.get();
@@ -166,9 +164,7 @@
@Override
public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
- Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
- );
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
try {
ErrorCode ret = future.get();
@@ -185,9 +181,7 @@
@Override
public ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
- Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorOffCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
- );
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorOffCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
try {
ErrorCode ret = future.get();
@@ -204,9 +198,7 @@
@Override
public ErrorCode startNextPatient(Long roomId, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorNextPatientCallable(queueServiceTxFunctions, roomId, bedNo)
- );
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorNextPatientCallable(queueServiceTxFunctions, roomId, bedNo));
try {
ErrorCode ret = future.get();
@@ -223,9 +215,7 @@
@Override
public ErrorCode startNextInstallPatient(Long roomId, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit(
- new BedDoctorNextInstallPatientCallable(queueServiceTxFunctions, roomId, bedNo)
- );
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorNextInstallPatientCallable(queueServiceTxFunctions, roomId, bedNo));
try {
ErrorCode ret = future.get();
@@ -242,21 +232,21 @@
@Override
public void startHurryUpOneBed(Long roomId, String bedNo) {
- singleThreadExecutor.execute( () -> {
+ singleThreadExecutor.execute(() -> {
queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
});
}
@Override
public void startHurryUpOneCheckType(Integer checkType) {
- singleThreadExecutor.execute( () -> {
- queueServiceTxFunctions.hurryupOneCheckType( checkType );
+ singleThreadExecutor.execute(() -> {
+ queueServiceTxFunctions.hurryupOneCheckType(checkType);
});
}
@Override
public void startBedReload() {
- singleThreadExecutor.execute( () -> {
+ singleThreadExecutor.execute(() -> {
queueServiceTxFunctions.bedReload();
queueServiceTxFunctions.hurryupAllBed();
queueServiceTxFunctions.monitorInfo();
@@ -265,7 +255,7 @@
@Override
public void startResetRoom(Boolean needCloseBed) {
- singleThreadExecutor.execute( () -> {
+ singleThreadExecutor.execute(() -> {
queueServiceTxFunctions.resetRoom(needCloseBed);
queueServiceTxFunctions.bedReload();
queueServiceTxFunctions.monitorInfo();
@@ -284,8 +274,8 @@
return error(ROOM_NOT_SIT);
}
- BedQueueBO bedQueueBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
- if (null == bedQueueBO) {
+ BedBO bedBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
+ if (null == bedBO) {
log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return error(QUEUE_BED_NOT_EXIST);
}
@@ -307,48 +297,48 @@
@Override
public PageResult<QueueDO> getqueuePage(QueuePageReqVO pageReqVO) {
- return queueMapper.selectPage(pageReqVO);
+ PageResult<QueueDO> queueDOPageResult = queueMapper.selectPage(pageReqVO);
+ queueDOPageResult.getList().forEach(queueDO -> {
+ queueDO.setTolerance(appointmentMapper.getByApplyNo(queueDO.getApplyNo()).getTolerance());
+ });
+ return queueDOPageResult;
}
/**
* 棰勭害纭鍚庣殑鎺掗槦
+ *
* @param queueSaveReqVO
*/
@Override
@Transactional
public void queue(QueueSaveReqVO queueSaveReqVO) {
- queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //榛樿鐘舵��: 鎺掗槦涓�
+ // 榛樿浠� [鎺掗槦涓璢 鐘舵�� 杩涘叆 queue 琛�
+ queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus());
// 澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
- CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( queueSaveReqVO.getBookCheckType() );
- if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
- List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypes(queueSaveReqVO.getPatId(), checkTypeDO.getAffinityCheckTypes());
-
- for (int i=0; i < affinityItems.size(); i++) {
- QueueDO queueItem = affinityItems.get(i);
- if (QueueStatusEnum.READY.getStatus() == queueItem.getStatus()
- || QueueStatusEnum.ONSTAGE.getStatus() == queueItem.getStatus()) {
- queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY_WAITING.getStatus()); //鏀瑰彉 鎺掗槦鐘舵��
- queueSaveReqVO.setRoomId(queueItem.getRoomId());
- queueSaveReqVO.setRoomName(queueItem.getRoomName());
- queueSaveReqVO.setBedNo(queueItem.getBedNo());
- queueSaveReqVO.setSeqNum(queueItem.getSeqNum());
- break;
- }
- }
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(queueSaveReqVO.getBookCheckType());
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenQueue(/*IN,OUT*/queueSaveReqVO, checkTypeDO.getAffinityCheckTypes());
}
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
DevRentDO devRent = BeanUtils.toBean(queueSaveReqVO, DevRentDO.class);
- devRent.setState( DevRentStateEnum.FREE.getState() );
- devRent.setPatDetails( queueSaveReqVO.getPatDetails() );
- devRent.setCheckType( queueSaveReqVO.getBookCheckType() );
+ devRent.setApplyNo(queueSaveReqVO.getApplyNo());
+ devRent.setEpisodeId(queueSaveReqVO.getEpisodeId());
+ devRent.setState(DevRentStateEnum.FREE.getState());
+ devRent.setPatDetails(queueSaveReqVO.getPatDetails());
+ devRent.setCheckType(queueSaveReqVO.getBookCheckType());
devRentMapper.insert(devRent);
- startHurryUpOneCheckType( queue.getBookCheckType() );
+ startHurryUpOneCheckType(queue.getBookCheckType());
+ }
+
+ @Override
+ public List<QueueDO> selectBookSeqNumByAppointIdList(List<Long> appointIdList) {
+ return queueMapper.selectBookSeqNumByAppointIdList(appointIdList);
}
// 甯歌妫�鏌� 鍙彿
@@ -362,8 +352,7 @@
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
- if ( num != null && num > 0)
- return;
+ if (num != null && num > 0) return;
startNextPatient(roomId, bedNo);
}
@@ -375,8 +364,7 @@
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
- if ( num != null && num > 0)
- return;
+ if (num != null && num > 0) return;
startNextPatient(roomId, bedNo);
}
@@ -388,16 +376,20 @@
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
- if ( num != null && num > 0)
- return;
+ if (num != null && num > 0) return;
startNextInstallPatient(roomId, bedNo);
}
+ @Override
+ public void passWaitingPatient(String patId, Integer bookCheckType) {
+ // 浠� DB 鎶� 鎺掗槦涓殑浜� 璁剧疆涓� 杩囧彿-鎺掗槦涓�
+ Integer ret = queueMapper.updatePatientQueueStatus(patId, bookCheckType, QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.PASSED_WAITING.getStatus());
+ }
+
public void passNextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓鸿繃鍙�
- Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
+ Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
startNextPatient(roomId, bedNo);
}
@@ -405,20 +397,30 @@
@Override
public void passInstallNextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� [瀹夎涓璢鐨勪汉 璁剧疆涓� [杩囧彿-瀹夎]
- Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus());
+ Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus());
startNextPatient(roomId, bedNo);
}
public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Integer> statusList) {
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, statusList);
+ if (!CollectionUtils.isEmpty(queueDOList)) {
+ queueDOList.forEach(queueDO -> {
+ queueDO.setTolerance(appointmentMapper.getByApplyNo(queueDO.getApplyNo()).getTolerance());
+ });
+ }
return queueDOList;
}
@Override
+
public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Integer> statusList) {
List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
+ if (!CollectionUtils.isEmpty(queueDOList)) {
+ queueDOList.forEach(queueDO -> {
+ queueDO.setTolerance(appointmentMapper.getByApplyNo(queueDO.getApplyNo()).getTolerance());
+ });
+ }
return queueDOList;
}
@@ -459,15 +461,23 @@
});
// 瑁呮満鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎宸ヤ綅鐪嬩笉鍒� [宸查鐢╙ 鎮ｈ�咃紝鎵�浠ユ棤娉曟牴鎹鏈哄伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻
- patientStatisticVO.setReceivedNum( 0 );
+ patientStatisticVO.setReceivedNum(0);
List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId);
roomQueueStatisticDOList.forEach(item -> {
if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
- patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
}
});
return patientStatisticVO;
+ }
+
+ @Override
+ public Integer recallPassWaitingPatient(String patId, Integer bookCheckType) {
+ // 浠� DB 鎶� 杩囧彿-鎺掗槦涓殑浜� 璁剧疆涓� 鎺掗槦涓�
+ Integer ret = queueMapper.updatePatientQueueStatus(patId, bookCheckType, QueueStatusEnum.PASSED_WAITING.getStatus(), QueueStatusEnum.WAITING.getStatus());
+
+ return ret;
}
public PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo) {
@@ -482,15 +492,15 @@
});
// 棰嗙敤鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎鏃舵偅鑰呭綊灞炲伐浣嶄粠棰嗙敤宸ヤ綅鍙樻洿鍒板畨瑁呭伐浣嶏紝鎵�浠ユ棤娉曟牴鎹鐢ㄥ伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻
- patientStatisticVO.setReceivedNum( 0 );
+ patientStatisticVO.setReceivedNum(0);
List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId);
roomQueueStatisticDOList.forEach(item -> {
if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
- patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
} else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) {
- patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
} else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
- patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
}
});
@@ -506,12 +516,11 @@
}
public void initCheckType() {
- queueServiceTxFunctions.initCheckType( );
+ queueServiceTxFunctions.initCheckType();
}
public void startBiz() {
- if (1 == queueServiceTxFunctions.getOpeningFlag())
- return;
+ if (1 == queueServiceTxFunctions.getOpeningFlag()) return;
queueServiceTxFunctions.setOpeningFlag(1);
startBedReload();
@@ -523,50 +532,69 @@
}
@Override
- public Integer recallPatient(Long roomId, String bedNo, String patId) {
- Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
- QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
+ public Integer recallPatient(Long roomId, String bedNo, String patId, Integer checkType) {
+ Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId, checkType, QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 涓嶉渶瑕佸湪杩欓噷澶勭悊
+ // 浼氬湪 HurryUpOnBed 閲岄潰澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬�
+
startHurryUpOneBed(roomId, bedNo);
return updateNum;
}
@Override
- public Integer recallInstallPatient(Long roomId, String bedNo, String patId) {
- Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo, patId,
- QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus());
- // 瀹夎宸ヤ綅 涓嶈璁� 浼樺厛闃熷垪
+ public Integer recallInstallPatient(Long roomId, String bedNo, String patId, Integer checkType, Long roomId_operator, String bedNo_operator) {
+ Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo_operator, patId, checkType, QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus());
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊
+ if (null != updateNum && 1 == updateNum) {
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(checkType);
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenInstallRecall(patId, checkTypeDO.getAffinityCheckTypes(), roomId_operator, bedNo_operator);
+ }
+ }
+
+ // 瀹夎宸ヤ綅 涓嶆秹鍙� 浼樺厛闃熷垪
//startHurryUpOneBed(roomId, bedNo);
return updateNum;
}
+ /**
+ * 鍔犳��
+ *
+ * @param patId
+ * @param jumped
+ * @return
+ */
@Override
- public Integer patientJump(String patId, Byte jumped) {
- Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
+ public Integer patientJump(String patId, Integer bookCheckType, Byte jumped) {
+ Integer updateNum = queueMapper.queueJump(patId, bookCheckType, QueueStatusEnum.WAITING.getStatus(), jumped);
- QueueDO queueDO = queueMapper.getQueueByPatId(patId);
+ QueueDO queueDO = queueMapper.getQueueByPatId(patId, bookCheckType);
startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
return updateNum;
}
@Override
- public RoomDO getDocRoomInfo(Long docId) {
+ public List<RoomDO> getDocRoomInfo(Long docId) {
return roomMapper.getRoomByDocId(docId);
}
/**
- * 鑾峰彇 鎸囧畾宸ヤ綅 寰呮鏌寰呴鐢ㄧ殑浜�
+ * 鑾峰彇 鎸囧畾宸ヤ綅 銆愭鏌棰嗙敤銆戠浉鍏崇殑鎮ｈ��
+ *
* @param roomId
* @param bedNo
* @return
*/
@Override
- public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) {
+ public List<QueueDO> getCheckRelatedPatient(Long roomId, String bedNo) {
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
queueStatusList.add(QueueStatusEnum.READY.getStatus());
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- queueStatusList.add(QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList);
//鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
@@ -574,14 +602,14 @@
ListIterator<QueueDO> iterator = queueDOList.listIterator();
while (iterator.hasNext()) {
QueueDO item = iterator.next();
- if (item.getStatus() == QueueStatusEnum.AFFINITY_WAITING.getStatus()) {
+ if (item.getStatus() == QueueStatusEnum.AFFINITY.getStatus()) {
iterator.remove();
affinityWaitingList.add(item);
}
}
- affinityWaitingList.forEach( affinityWaitingItem -> {
- for (int i = queueDOList.size()-1; i >= 0; i--) {
- if ( affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
+ affinityWaitingList.forEach(affinityWaitingItem -> {
+ for (int i = queueDOList.size() - 1; i >= 0; i--) {
+ if (affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum()) {
queueDOList.add(i + 1, affinityWaitingItem);
break;
}
@@ -591,32 +619,39 @@
return queueDOList;
}
+ /**
+ * 鑾峰彇 鎸囧畾宸ヤ綅 銆愬畨瑁呫�戠浉鍏崇殑鎮ｈ��
+ *
+ * @param roomId
+ * @param bedNo
+ * @return
+ */
@Override
- public List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo) {
+ public List<QueueDO> getInstallRelatedPatient(Long roomId, String bedNo) {
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
- queueStatusList.add(QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
- List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList);
+ queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
+ queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
+ List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList); // 鍙互鐪嬪埌鏈瘖瀹� 寰呭畨瑁呯殑鎮ｈ��
queueStatusList.clear();
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
- queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
- queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList) );
+ queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList)); // 褰撳墠宸ヤ綅鐨�
//鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
List<QueueDO> affinityReceivedList = new ArrayList<>();
ListIterator<QueueDO> iterator = queueDOList.listIterator();
while (iterator.hasNext()) {
QueueDO item = iterator.next();
- if (item.getStatus() == QueueStatusEnum.AFFINITY_RECEIVED.getStatus()) {
+ if (item.getStatus() == QueueStatusEnum.AFFINITY_INSTALL.getStatus()) {
iterator.remove();
affinityReceivedList.add(item);
}
}
- affinityReceivedList.forEach( affinityReceivedItem -> {
- for (int i = queueDOList.size()-1; i >= 0; i--) {
- if ( affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
+ affinityReceivedList.forEach(affinityReceivedItem -> {
+ for (int i = queueDOList.size() - 1; i >= 0; i--) {
+ if (affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum()) {
queueDOList.add(i + 1, affinityReceivedItem);
break;
}
@@ -627,11 +662,41 @@
}
private RoomDO getRoomDO(Long roomId, String bedNo) {
- RoomDO roomDO = mapRoomBed.get( Utils.formatRoomBed(roomId, bedNo) );
- if ( null == roomDO)
- roomDO = roomMapper.getRoom(roomId, bedNo);
+ RoomDO roomDO = mapRoomBed.get(Utils.formatRoomBed(roomId, bedNo));
+ if (null == roomDO) roomDO = roomMapper.getRoom(roomId, bedNo);
return roomDO;
}
+ /**
+ * 瑁呮満鍙洖锛屾槸鎶㈠崰寮忕殑锛屼細鏀瑰彉瑁呮満宸ヤ綅
+ */
+ private void procAffinityWhenInstallRecall(String patId, Integer[] affinityCheckTypes, Long roomId_operator, String bedNo_operator) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(patId, affinityCheckTypes, QueueStatusEnum.AFFINITY_INSTALL.getStatus());
+ for (int i = 0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ queueItem.setRoomId(roomId_operator);
+ queueItem.setBedNo(bedNo_operator);
+ //queueItem.setSeqNum( preemptQueueItem.getSeqNum() ); // 瑁呮満鏃� 鍐呴儴搴忓彿涓嶅彉 鏁呬笉闇�鏇存柊
+ queueMapper.updateById(queueItem);
+ }
+ }
+
+ /**
+ * 棰勭害纭鍚庯紝涓诲姩瀵绘眰渚濋檮
+ */
+ private void procAffinityWhenQueue(/*IN, OUT*/QueueSaveReqVO queueSaveReqVO, Integer[] affinityCheckTypes) {
+ // 濡傛灉瀛樺湪 [鍊欒瘖涓璢 [灏辫瘖涓璢 [杩囧彿] [宸插彫鍥瀅 鑳借渚濋檮鐨勬鏌ラ」锛屽垯渚濋檮鍒板叾涓竴涓�
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatusList(queueSaveReqVO.getPatId(), affinityCheckTypes, List.of(QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus()));
+ if (!affinityItems.isEmpty()) {
+ QueueDO queueItem = affinityItems.get(0);
+ queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY.getStatus()); // [浜插拰-鎺掗槦] 鐘舵��
+ queueSaveReqVO.setAffinityItem(1);
+ queueSaveReqVO.setRoomId(queueItem.getRoomId());
+ queueSaveReqVO.setRoomName(queueItem.getRoomName());
+ queueSaveReqVO.setBedNo(queueItem.getBedNo());
+ queueSaveReqVO.setSeqNum(queueItem.getSeqNum());
+ }
+ }
+
}
--
Gitblit v1.9.3