From b454297193072400039be927e8bbd929970d973e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 19 十一月 2024 16:13:47 +0800
Subject: [PATCH] 设备管理-患者详情 逻辑
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index fc52a46..5607b22 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -6,6 +6,7 @@
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.mysql.devmanage.DeviceMapper;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
@@ -22,6 +23,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
@@ -155,7 +157,7 @@
Long rent_id = createReqVO.getId(); // dev_rent 琛ㄧ殑ID
// 鏍囨敞璁惧 宸查鍙�
- Integer ret = markDevRecieved(createReqVO.getDevId(), rent_id);
+ Integer ret = markDevRecieved(createReqVO.getDevId(), rent_id, createReqVO.getPatDetails());
if (null == ret || 0 == ret) {
throw exception(DEVICE_NOT_FREE);
}
@@ -706,13 +708,14 @@
}
// 鏍囪 璁惧宸茶棰嗗彇
- private Integer markDevRecieved(String devId, Long rentId) {
+ private Integer markDevRecieved(String devId, Long rentId, PatDetails patDetails) {
// 璁惧鏍囨敞 宸查鍙�
DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviceDO && DevStateEnum.FREE.isEqual(deviceDO.getState())) {
deviceDO.setState( DevStateEnum.RECEIVED.getState() );
deviceDO.setRentId( rentId );
deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setPatDetails( patDetails );
return deviceMapper.updateById(deviceDO);
}
@@ -760,6 +763,7 @@
deviceDO.setState( DevStateEnum.FREE.getState() );
deviceDO.setStateDate( LocalDate.now() );
deviceDO.setRentId(null);
+ deviceDO.setPatDetails(null);
return deviceMapper.updateById(deviceDO);
}
@@ -777,7 +781,7 @@
}
}
- private void procAffinityWhenReadyFinish(QueueDO bedOnStageQueueItem, Integer[] affinityCheckTypes) {
+ private void procAffinityWhenReadyFinish(/*IN,OUT*/QueueDO bedOnStageQueueItem, Integer[] affinityCheckTypes) {
// 濡傛灉瀛樺湪 [瀹夎涓璢 浜插拰椤癸紝鍒欒窡闅忓叾涓竴涓翰鍜岄」
List<QueueDO> affinityInstallingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
bedOnStageQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.INSTALLING.getStatus());
--
Gitblit v1.9.3