From d5ed847bb09ca9245e7ea47524269ed46cefa7d5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 19 十一月 2024 18:03:51 +0800
Subject: [PATCH] 获取 时间段 信息
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 212 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 164 insertions(+), 48 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 a22dacf..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
@@ -3,14 +3,18 @@
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordSaveReqVO;
+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;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -19,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;
@@ -40,6 +45,9 @@
@Service
@Validated
public class DevRentServiceImpl implements DevRentService {
+
+ @Resource
+ QueueServiceTxFunctions queueServiceTxFunctions;
@Resource
private DevRentMapper devRentMapper;
@@ -75,7 +83,7 @@
jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
@@ -98,6 +106,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -117,21 +126,38 @@
}
// 鏇存柊..闃熷垪鐘舵��
- queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+ //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
+ createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
+ firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ queueMapper.updateById( firstOnStageQueueItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstOnStageQueueItem.getBookCheckType() );
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenRoutineFinish( firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes() );
+ }
return CommonResult.success(rent_id);
}
+ /**
+ * 棰嗙敤瀹屾垚 鎿嶄綔
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- Long rent_id = createReqVO.getId();
+ 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);
}
@@ -141,7 +167,7 @@
jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
@@ -164,6 +190,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -183,9 +210,21 @@
}
// 鏇存柊..闃熷垪鐘舵��
- queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+ //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.RECEIVED
+ QueueDO bedOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(
+ createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus() );
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedOnStageQueueItem.getBookCheckType() );
+ bedOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus()); // [宸查鐢╙ 鐘舵��
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫 , 鏇存柊 bedOnStageQueueItem
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenReadyFinish(/*IN, OUT*/bedOnStageQueueItem, checkTypeDO.getAffinityCheckTypes());
+ }
+
+ queueMapper.updateById( bedOnStageQueueItem );
return CommonResult.success(rent_id);
}
@@ -195,6 +234,12 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
Long rent_id = createReqVO.getId();
+
+ // 瀵逛簬宸叉湁棰嗙敤锛屼絾鏄鏈烘椂浣跨敤鐨勪笉鏄凡棰嗙敤璁惧锛岄渶閲婃斁 婧愰鐢� 璁惧
+ DevRentDO devRentDO = getDevRent(rent_id);
+ if ( null != devRentDO.getDevId() && !createReqVO.getDevId().equals(devRentDO.getDevId()) ) {
+ markDevFree( devRentDO.getDevId(), rent_id);
+ }
// 璁剧疆璁惧 浣跨敤涓�
Integer ret = markDevInUse(createReqVO.getDevId(), rent_id);
@@ -210,7 +255,7 @@
// 绗竴娆� 瀹夎鎿嶄綔
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
@@ -233,6 +278,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALLED.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -251,8 +297,20 @@
}
// 鏇存柊..闃熷垪鐘舵��
- queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
- QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+ //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ // QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ // QueueStatusEnum.INSTALLING => QueueStatusEnum.FINISH
+ QueueDO bedInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(
+ createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
+ bedInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ queueMapper.updateById( bedInstallingQueueItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedInstallingQueueItem.getBookCheckType() );
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenInstallFinish(bedInstallingQueueItem, checkTypeDO.getAffinityCheckTypes());
+ }
return CommonResult.success(rent_id);
}
@@ -285,6 +343,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
@@ -323,6 +382,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
@@ -354,7 +414,7 @@
jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
throw exception(ROUTINE_CHECK_EXIST);
@@ -374,6 +434,7 @@
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -414,7 +475,7 @@
jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -434,6 +495,7 @@
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -474,7 +536,7 @@
jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -494,6 +556,7 @@
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -515,23 +578,29 @@
@Transactional(rollbackFor = Exception.class)
public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
DevStateEnum devStateEnum = null;
- if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState())
+ DevRentStateEnum devRentStateEnum = null;
+ if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState()) {
devStateEnum = DevStateEnum.DAMAGED;
- else if (updateReqVO.getState() == DevStateEnum.LOST.getState())
+ devRentStateEnum = DevRentStateEnum.DAMAGED;
+ }
+ else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
devStateEnum = DevStateEnum.LOST;
+ devRentStateEnum = DevRentStateEnum.LOST;
+ }
else
throw exception(DEV_DISMANTLE_EXCEPTION);
// 璁惧閬楀け鏃�, 鏍囨敞閬楀け
markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );
- updateReqVO.setState( DevRentStateEnum.LOST.getState() );
+ updateReqVO.setState( devRentStateEnum.getState() );
updateDevRent( updateReqVO );
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.DAMAGED.getState());
jobTypeList.add( DevRentStateEnum.LOST.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
if (null == jobRecordDO) {
@@ -543,13 +612,14 @@
jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.LOST.getState() );
+ jobRecordSaveReqVO.setJobType( devRentStateEnum.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- jobRecordDO.setJobType( DevRentStateEnum.LOST.getState() );
+ jobRecordDO.setJobType( devRentStateEnum.getState() );
jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
jobRecordDO.setRemark( updateReqVO.getRemark() );
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -638,14 +708,15 @@
}
// 鏍囪 璁惧宸茶棰嗗彇
- private Integer markDevRecieved(String devId, Long rentId) {
+ private Integer markDevRecieved(String devId, Long rentId, PatDetails patDetails) {
// 璁惧鏍囨敞 宸查鍙�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
- deviveDO.setState( DevStateEnum.RECEIVED.getState() );
- deviveDO.setRentId( rentId );
- deviveDO.setStateDate( LocalDate.now() );
- return deviceMapper.updateById(deviveDO);
+ 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);
}
return 0;
@@ -653,21 +724,21 @@
// 鏍囪 璁惧宸茶浣跨敤
private Integer markDevInUse(String devId, Long rentId) {
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null == deviveDO)
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
+ if (null == deviceDO)
return 0;
- if (deviveDO.getState() == DevStateEnum.RECEIVED.getState() && deviveDO.getRentId() == rentId) {
- deviveDO.setState( DevStateEnum.INUSE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- return deviceMapper.updateById(deviveDO);
+ if (DevStateEnum.RECEIVED.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( DevStateEnum.INUSE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviceDO);
}
- if (deviveDO.getState() == DevStateEnum.FREE.getState()) {
- deviveDO.setState( DevStateEnum.INUSE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- deviveDO.setRentId( rentId );
- return deviceMapper.updateById(deviveDO);
+ if (DevStateEnum.FREE.isEqual(deviceDO.getState())) {
+ deviceDO.setState( DevStateEnum.INUSE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setRentId( rentId );
+ return deviceMapper.updateById(deviceDO);
}
return 0;
@@ -675,11 +746,11 @@
private Integer markDevDismantleException(String devId, Long rentId, LocalDate localDate, DevStateEnum devStateEnum) {
// 璁惧鏍囨敞閬楀け
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && deviveDO.getState() == DevStateEnum.INUSE.getState() && deviveDO.getRentId() == rentId) {
- deviveDO.setState( devStateEnum.getState() );
- deviveDO.setStateDate( localDate );
- return deviceMapper.updateById(deviveDO);
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
+ if (null != deviceDO && DevStateEnum.INUSE.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( devStateEnum.getState() );
+ deviceDO.setStateDate( localDate );
+ return deviceMapper.updateById(deviceDO);
}
return 0;
@@ -687,16 +758,61 @@
private Integer markDevFree(String devId, Long rentId) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
- if (null != deviveDO && deviveDO.getRentId() == rentId) {
- deviveDO.setState( DevStateEnum.FREE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- deviveDO.setRentId(null);
- return deviceMapper.updateById(deviveDO);
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId( devId );
+ if (null != deviceDO && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( DevStateEnum.FREE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setRentId(null);
+ deviceDO.setPatDetails(null);
+ return deviceMapper.updateById(deviceDO);
}
return 0;
}
+ private void procAffinityWhenRoutineFinish(String patId, Integer[] affinityCheckTypes) {
+ // 濡傛灉瀛樺湪 [浜插拰-鎺掗槦] 浜插拰椤癸紝鍒欓�夋嫨 鍏朵腑涓�涓翰鍜岄」 鎺ユ浛鍏� 澶勪簬 [灏辫瘖涓璢
+ List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ patId, affinityCheckTypes, QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ if (!affinityAffinityWaitingItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
+ queueMapper.updateById(tmpQueueDO);
+ }
+ }
+
+ private void procAffinityWhenReadyFinish(/*IN,OUT*/QueueDO bedOnStageQueueItem, Integer[] affinityCheckTypes) {
+ // 濡傛灉瀛樺湪 [瀹夎涓璢 浜插拰椤癸紝鍒欒窡闅忓叾涓竴涓翰鍜岄」
+ List<QueueDO> affinityInstallingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ bedOnStageQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.INSTALLING.getStatus());
+ if (!affinityInstallingItems.isEmpty()) {
+ QueueDO affinityInstallingItem = affinityInstallingItems.get(0);
+ bedOnStageQueueItem.setStatus(QueueStatusEnum.AFFINITY_RECEIVED.getStatus()); // 浜插拰-棰嗙敤
+ bedOnStageQueueItem.setRoomId( affinityInstallingItem.getRoomId() );
+ bedOnStageQueueItem.setBedNo( affinityInstallingItem.getBedNo() ); // 棰嗙敤 鍒� 瀹夎 鍙兘浼氬湪涓嶅悓宸ヤ綅
+ }
+
+ // 濡傛灉瀛樺湪 [浜插拰-鎺掗槦] 浜插拰椤癸紝鍒欓�夋嫨 鍏朵腑涓�涓翰鍜岄」 鎺ユ浛鍏� 澶勪簬 [灏辫瘖涓璢
+ List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ bedOnStageQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ if (!affinityAffinityWaitingItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
+ queueMapper.updateById( tmpQueueDO );
+ }
+ }
+
+ private void procAffinityWhenInstallFinish(QueueDO bedInstallingQueueItem, Integer[] affinityCheckTypes) {
+ List<QueueDO> affinityAffinityReceivedItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
+ bedInstallingQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
+ if (!affinityAffinityReceivedItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityAffinityReceivedItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.INSTALLING.getStatus());
+ tmpQueueDO.setRoomId( bedInstallingQueueItem.getRoomId() );
+ tmpQueueDO.setBedNo( bedInstallingQueueItem.getBedNo() ); // 浠� [棰嗙敤] 鍒� [瀹夎]锛� 鍙灔鍦ㄤ笉鍚屽伐浣嶄笂鎿嶄綔
+ queueMapper.updateById(tmpQueueDO);
+ }
+ }
+
}
--
Gitblit v1.9.3