From a5a95203b21daf91d1c0fe81ad28a0a23ad68cc3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 16:40:07 +0800
Subject: [PATCH] 防止 同诊室 同时点 安装-召回
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 226 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 191 insertions(+), 35 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 da4e17e..10ca305 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
@@ -6,6 +6,7 @@
import cn.lihu.jh.module.ecg.Utils;
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.devrent.DevRentMapper;
@@ -197,7 +198,7 @@
e.printStackTrace();
}
- System.out.println("startBedDoctorOff ========");
+ //System.out.println("startBedDoctorOff ========");
return ECG_INNER_ERROR;
}
@@ -216,7 +217,7 @@
e.printStackTrace();
}
- System.out.println("startNextPatient ========");
+ //System.out.println("startNextPatient ========");
return ECG_INNER_ERROR;
}
@@ -317,12 +318,34 @@
@Override
@Transactional
public void queue(QueueSaveReqVO queueSaveReqVO) {
- queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
+ 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;
+ }
+ }
+ }
+
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() );
devRentMapper.insert(devRent);
startHurryUpOneCheckType( queue.getBookCheckType() );
@@ -332,8 +355,15 @@
@Override
public void finishNextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
- Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+ //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
+ // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
+ List<Integer> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
+ if ( num != null && num > 0)
+ return;
startNextPatient(roomId, bedNo);
}
@@ -341,12 +371,8 @@
// 棰嗙敤 鍙彿
@Override
public void finishReceiveNextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� [灏辫瘖涓璢 鐨勪汉 璁剧疆涓� 銆愬凡棰嗙敤銆�
- //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
-
- // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
- List<Byte> queueStatusList = new ArrayList<>();
+ // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
if ( num != null && num > 0)
@@ -358,12 +384,8 @@
// 瑁呮満 鍙彿
@Override
public void finishInstallNextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶� [瀹夎涓璢 鐨勪汉 璁剧疆涓� [宸插氨璇奭
- //Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
- // QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
-
- // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
- List<Byte> queueStatusList = new ArrayList<>();
+ // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [瀹夎涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
+ List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
if ( num != null && num > 0)
@@ -380,17 +402,27 @@
startNextPatient(roomId, bedNo);
}
- public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
+ @Override
+ public void passInstallNextPatient(Long roomId, String bedNo) {
+ // 浠� DB 鎶� [瀹夎涓璢鐨勪汉 璁剧疆涓� [杩囧彿-瀹夎]
+ 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);
return queueDOList;
}
@Override
- public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Byte> statusList) {
+ public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Integer> statusList) {
List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
return queueDOList;
}
+ // 甯歌妫�鏌� 鍖荤敓鐣岄潰鐨勭粺璁′俊鎭�
public PatientStatisticVO getPatientStatistic(Long roomId, String bedNo) {
PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
@@ -404,9 +436,12 @@
}
});
- List<Byte> statusList = new ArrayList<>();
+ // 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲�
+ RoomDO roomDO = getRoomDO(roomId, bedNo);
+ Integer[] checkTypes = roomDO.getCheckTypes();
+ List<Integer> statusList = new ArrayList<>();
statusList.add(QueueStatusEnum.WAITING.getStatus());
- Integer num = queueMapper.statusStatistic(statusList);
+ Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList);
patientStatisticVO.setQueuingNum(num);
return patientStatisticVO;
@@ -416,10 +451,19 @@
PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
bedQueueStatisticDOList.forEach(item -> {
- if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
- patientStatisticVO.setReceivedNum(item.getTotalInStatus());
- } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
+// } else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) {
+// patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
patientStatisticVO.setFinishedNum(item.getTotalInStatus());
+ }
+ });
+
+ // 瑁呮満鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎宸ヤ綅鐪嬩笉鍒� [宸查鐢╙ 鎮ｈ�咃紝鎵�浠ユ棤娉曟牴鎹鏈哄伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻
+ patientStatisticVO.setReceivedNum( 0 );
+ List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId);
+ roomQueueStatisticDOList.forEach(item -> {
+ if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
+ patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
}
});
@@ -428,27 +472,34 @@
public PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo) {
PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
- patientStatisticVO.setFinishedNum(0);
List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
bedQueueStatisticDOList.forEach(item -> {
if (QueueStatusEnum.READY.getStatus() == item.getStatus()) {
patientStatisticVO.setReadyNum(item.getTotalInStatus());
} else if (QueueStatusEnum.PASSED.getStatus() == item.getStatus()) {
patientStatisticVO.setPassedNum(item.getTotalInStatus());
- } else if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
- patientStatisticVO.setFinishedNum( item.getTotalInStatus() + patientStatisticVO.getFinishedNum() );
- } else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) {
- patientStatisticVO.setFinishedNum( item.getTotalInStatus() + patientStatisticVO.getFinishedNum() );
- } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
- patientStatisticVO.setFinishedNum(item.getTotalInStatus() + patientStatisticVO.getFinishedNum());
}
});
+ // 棰嗙敤鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎鏃舵偅鑰呭綊灞炲伐浣嶄粠棰嗙敤宸ヤ綅鍙樻洿鍒板畨瑁呭伐浣嶏紝鎵�浠ユ棤娉曟牴鎹鐢ㄥ伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻
+ patientStatisticVO.setReceivedNum( 0 );
+ List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId);
+ roomQueueStatisticDOList.forEach(item -> {
+ if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
+ patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ } else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) {
+ patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
+ patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
+ }
+ });
+
+ // 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲�
RoomDO roomDO = getRoomDO(roomId, bedNo);
Integer[] checkTypes = roomDO.getCheckTypes();
- List<Byte> statusList = new ArrayList<>();
+ List<Integer> statusList = new ArrayList<>();
statusList.add(QueueStatusEnum.WAITING.getStatus());
- Integer num = queueMapper.checkTypeAndStatusStatistic(roomId, bedNo, checkTypes, statusList);
+ Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList);
patientStatisticVO.setQueuingNum(num);
return patientStatisticVO;
@@ -472,10 +523,29 @@
}
@Override
- public Integer recallPatient(Long roomId, String bedNo, String patId) {
- Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
+ 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 checkType, 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) {
+ updateAffinityItemsWhenInstallRecall(patId, checkType, bedNo_operator);
+ }
+
+ // 瀹夎宸ヤ綅 涓嶆秹鍙� 浼樺厛闃熷垪
+ //startHurryUpOneBed(roomId, bedNo);
return updateNum;
}
@@ -493,6 +563,79 @@
return roomMapper.getRoomByDocId(docId);
}
+ /**
+ * 鑾峰彇 鎸囧畾宸ヤ綅 寰呮鏌寰呴鐢ㄧ殑浜�
+ * @param roomId
+ * @param bedNo
+ * @return
+ */
+ @Override
+ public List<QueueDO> getToBeCheckedPatient(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());
+ List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList);
+
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ List<QueueDO> affinityWaitingList = new ArrayList<>();
+ ListIterator<QueueDO> iterator = queueDOList.listIterator();
+ while (iterator.hasNext()) {
+ QueueDO item = iterator.next();
+ if (item.getStatus() == QueueStatusEnum.AFFINITY_WAITING.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() ) {
+ queueDOList.add(i + 1, affinityWaitingItem);
+ break;
+ }
+ }
+ });
+
+ return queueDOList;
+ }
+
+ @Override
+ public List<QueueDO> getToBeInstalledPatient(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.clear();
+ queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
+ queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
+ 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()) {
+ iterator.remove();
+ affinityReceivedList.add(item);
+ }
+ }
+ 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;
+ }
+ }
+ });
+
+ return queueDOList;
+ }
+
private RoomDO getRoomDO(Long roomId, String bedNo) {
RoomDO roomDO = mapRoomBed.get( Utils.formatRoomBed(roomId, bedNo) );
if ( null == roomDO)
@@ -501,4 +644,17 @@
return roomDO;
}
+ private void updateAffinityItemsWhenInstallRecall(String patId, Integer checkType, String bedNo_operator) {
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( checkType );
+ if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(patId,
+ checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
+ for (int i = 0; i < affinityItems.size(); i++) {
+ QueueDO queueItem = affinityItems.get(i);
+ queueItem.setBedNo( bedNo_operator );
+ //queueItem.setSeqNum( preemptQueueItem.getSeqNum() ); // 瑁呮満鏃� 鍐呴儴搴忓彿涓嶅彉
+ queueMapper.updateById(queueItem);
+ }
+ }
+ }
}
--
Gitblit v1.9.3