From 647095a34d62db02533cf9c121436900b51c757c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 十月 2024 15:07:13 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 86 insertions(+), 16 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..4c9be7e 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
@@ -332,8 +332,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<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
+ if ( num != null && num > 0)
+ return;
startNextPatient(roomId, bedNo);
}
@@ -345,7 +352,7 @@
//Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
- // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
+ // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
@@ -362,7 +369,7 @@
//Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo,
// QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
- // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
+ // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
@@ -380,6 +387,15 @@
startNextPatient(roomId, bedNo);
}
+ @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<Byte> statusList) {
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, statusList);
return queueDOList;
@@ -391,6 +407,7 @@
return queueDOList;
}
+ // 甯歌妫�鏌� 鍖荤敓鐣岄潰鐨勭粺璁′俊鎭�
public PatientStatisticVO getPatientStatistic(Long roomId, String bedNo) {
PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
@@ -404,9 +421,12 @@
}
});
+ // 缁熻 璇ュ伐浣嶇被鍨嬬殑銆愭帓闃熶腑銆戜汉鍛樻暟閲�
+ RoomDO roomDO = getRoomDO(roomId, bedNo);
+ Integer[] checkTypes = roomDO.getCheckTypes();
List<Byte> 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 +436,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 +457,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<>();
statusList.add(QueueStatusEnum.WAITING.getStatus());
- Integer num = queueMapper.checkTypeAndStatusStatistic(roomId, bedNo, checkTypes, statusList);
+ Integer num = queueMapper.checkTypeAndStatusStatistic(checkTypes, statusList);
patientStatisticVO.setQueuingNum(num);
return patientStatisticVO;
@@ -480,6 +516,15 @@
}
@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());
+ // 瀹夎宸ヤ綅 涓嶈璁� 浼樺厛闃熷垪
+ //startHurryUpOneBed(roomId, bedNo);
+ return updateNum;
+ }
+
+ @Override
public Integer patientJump(String patId, Byte jumped) {
Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
@@ -493,6 +538,31 @@
return roomMapper.getRoomByDocId(docId);
}
+ @Override
+ public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) {
+ List<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
+ queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList);
+ return queueDOList;
+ }
+
+ @Override
+ public List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo) {
+ List<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED_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) );
+ return queueDOList;
+ }
+
private RoomDO getRoomDO(Long roomId, String bedNo) {
RoomDO roomDO = mapRoomBed.get( Utils.formatRoomBed(roomId, bedNo) );
if ( null == roomDO)
--
Gitblit v1.9.3