From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 28 十一月 2024 14:40:46 +0800
Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 71 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 26 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 19825ba..cb90a2d 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
@@ -322,19 +322,9 @@
queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus());
// 澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
- // 濡傛灉瀛樺湪 澶勪簬 [灏辫瘖鍑嗗涓璢 | [灏辫瘖涓璢 鐨勪翰鍜岄」锛屽垯璺熼殢鍏朵腑涓�涓翰鍜岄」
CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( queueSaveReqVO.getBookCheckType() );
if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
- List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatusList( queueSaveReqVO.getPatId(), checkTypeDO.getAffinityCheckTypes(),
- List.of(QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus()));
- if (!affinityItems.isEmpty()) {
- QueueDO queueItem = affinityItems.get(0);
- queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY_WAITING.getStatus()); // [浜插拰-鎺掗槦] 鐘舵��
- queueSaveReqVO.setRoomId(queueItem.getRoomId());
- queueSaveReqVO.setRoomName(queueItem.getRoomName());
- queueSaveReqVO.setBedNo(queueItem.getBedNo());
- queueSaveReqVO.setSeqNum(queueItem.getSeqNum());
- }
+ procAffinityWhenQueue(/*IN,OUT*/queueSaveReqVO, checkTypeDO.getAffinityCheckTypes());
}
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
@@ -346,7 +336,12 @@
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 );
}
// 甯歌妫�鏌� 鍙彿
@@ -533,13 +528,16 @@
}
@Override
- public Integer recallInstallPatient(Long roomId, String bedNo, String patId, Integer checkType, String bedNo_operator) {
+ 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) {
- updateAffinityItemsWhenInstallRecall(patId, checkType, bedNo_operator);
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( checkType );
+ if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenInstallRecall(patId, checkTypeDO.getAffinityCheckTypes(), roomId_operator, bedNo_operator);
+ }
}
// 瀹夎宸ヤ綅 涓嶆秹鍙� 浼樺厛闃熷垪
@@ -547,12 +545,18 @@
return updateNum;
}
+ /**
+ * 鍔犳��
+ * @param patId
+ * @param jumped
+ * @return
+ */
@Override
public Integer patientJump(String patId, Byte jumped) {
Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
QueueDO queueDO = queueMapper.getQueueByPatId(patId);
- startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
+ //startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
return updateNum;
}
@@ -642,17 +646,32 @@
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);
- }
+ private void procAffinityWhenInstallRecall(String patId, Integer[] affinityCheckTypes, Long roomId_operator, String bedNo_operator) {
+ List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ patId, affinityCheckTypes, QueueStatusEnum.AFFINITY_RECEIVED.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()));
+ if (!affinityItems.isEmpty()) {
+ QueueDO queueItem = affinityItems.get(0);
+ queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY_WAITING.getStatus()); // [浜插拰-鎺掗槦] 鐘舵��
+ queueSaveReqVO.setAffinityItem( 1 );
+ queueSaveReqVO.setRoomId(queueItem.getRoomId());
+ queueSaveReqVO.setRoomName(queueItem.getRoomName());
+ queueSaveReqVO.setBedNo(queueItem.getBedNo());
+ queueSaveReqVO.setSeqNum(queueItem.getSeqNum());
+ }
+ }
+
}
--
Gitblit v1.9.3