From 24b7c98e01c211e93f00293e6e4e96ba1b9db93f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 14:50:43 +0800
Subject: [PATCH] 常规检查 step 2
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 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 4485429..10d01f0 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
@@ -4,6 +4,7 @@
import java.util.concurrent.*;
import javax.annotation.Resource;
+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.devrent.DevRentDO;
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
@@ -61,6 +62,8 @@
private DevRentMapper devRentMapper;
ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
+
+ ConcurrentHashMap<String, RoomDO> mapRoomBed = new ConcurrentHashMap<>();
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -329,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);
}
@@ -342,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);
@@ -359,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);
@@ -409,6 +419,64 @@
return patientStatisticVO;
}
+ public PatientStatisticVO getBedDevInstallStatistic(Long roomId, String bedNo) {
+ PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
+ List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
+ bedQueueStatisticDOList.forEach(item -> {
+// } 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() );
+ }
+ });
+
+ return patientStatisticVO;
+ }
+
+ public PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo) {
+ PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
+ 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());
+ }
+ });
+
+ // 棰嗙敤鐣岄潰锛氱粺璁� 璇ヨ瘖瀹� [宸查鐢╙ 鐨勬暟閲�, 鍥犱负瀹夎鏃舵偅鑰呭綊灞炲伐浣嶄粠棰嗙敤宸ヤ綅鍙樻洿鍒板畨瑁呭伐浣嶏紝鎵�浠ユ棤娉曟牴鎹鐢ㄥ伐浣嶆潵缁熻锛屽彧鑳芥寜璇婂缁熻
+ 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(checkTypes, statusList);
+ patientStatisticVO.setQueuingNum(num);
+
+ return patientStatisticVO;
+ }
+
public void initCheckType() {
queueServiceTxFunctions.initCheckType( );
}
@@ -448,4 +516,12 @@
return roomMapper.getRoomByDocId(docId);
}
+ private RoomDO getRoomDO(Long roomId, String bedNo) {
+ RoomDO roomDO = mapRoomBed.get( Utils.formatRoomBed(roomId, bedNo) );
+ if ( null == roomDO)
+ roomDO = roomMapper.getRoom(roomId, bedNo);
+
+ return roomDO;
+ }
+
}
--
Gitblit v1.9.3