From 811e30133a6dcc6853aafbbe2bbd6a1b88e8fc71 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 13 九月 2024 10:35:07 +0800
Subject: [PATCH] 调整拆机查询实现-支持根据患者查找
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 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 0fe1d44..43026b5 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
@@ -1,5 +1,6 @@
package cn.lihu.jh.module.ecg.service.devrent;
+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.jobrecord.JobRecordDO;
@@ -40,12 +41,19 @@
@Override
@Transactional
- public Long installOperation(DevRentSaveReqVO createReqVO) {
+ public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
Long rent_id = createReqVO.getId();
if (null == rent_id) {
+
+ // 鍒ゆ柇鏄惁宸茬粡鏈夎鏈鸿褰�
+ Integer recordNum = jobRecordMapper.getPatientJobNum(createReqVO.getPatId(), createReqVO.getRentTime(), 0);
+ if (null != recordNum && recordNum > 0) {
+ return CommonResult.error(DEV_INSTALL_EXIST);
+ }
+
rent_id = createDevRent(createReqVO);
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
@@ -63,10 +71,15 @@
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
+ // 鎾ら攢 鏀惧純鎿嶄綔
+ createReqVO.setCancelled(0);
+
updateDevRent( createReqVO );
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
if (null != jobRecordDO) {
+ jobRecordDO.setCancelled( createReqVO.getCancelled() );
+ jobRecordDO.setDevId(createReqVO.getDevId());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -74,7 +87,7 @@
jobRecordMapper.updateById(jobRecordDO);
}
}
- return rent_id;
+ return CommonResult.success(rent_id);
}
@Override
@@ -109,6 +122,57 @@
jobRecordMapper.updateById(jobRecordDO);
}
return 0L;
+ }
+
+ @Override
+ public CommonResult<Long> cancelOperation(DevCancelReqVO cancelReqVO) {
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ createReqVO.setCancelled(1);
+
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
+
+ // 鍒ゆ柇鏄惁宸茬粡鏈夋媶鏈鸿褰�
+ Integer recordNum = jobRecordMapper.getPatientJobNum(createReqVO.getPatId(), createReqVO.getRentTime(), 0);
+ if (null != recordNum && recordNum > 0) {
+ return CommonResult.error(DEV_INSTALL_EXIST);
+ }
+
+ rent_id = createDevRent(createReqVO);
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ //jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setJobType(0);
+ jobRecordSaveReqVO.setCancelled(1);
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ updateDevRent( createReqVO );
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
+ if (null != jobRecordDO) {
+ //jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setCancelled(1);
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ }
+ return CommonResult.success(rent_id);
}
@Override
@@ -156,8 +220,8 @@
}
@Override
- public DevRentDO getLatestRent(String devId) {
- return devRentMapper.getLatestRent(devId);
+ public DevRentDO getLatestRent(DevRentSearchReqVO searchReqVO) {
+ return devRentMapper.getLatestRent(searchReqVO);
}
}
\ No newline at end of file
--
Gitblit v1.9.3