From 3cea69db716ec0c4e0d9dcedeb61af319d0aed1c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 31 三月 2025 20:21:24 +0800
Subject: [PATCH] Revert "领用完成、 常规检查完成 启动抢 排队 患者"
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 16fb61b..69f3e1a 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
@@ -10,6 +10,7 @@
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.appointment.AppointmentMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
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;
@@ -74,6 +75,9 @@
@Resource
QueueMapper queueMapper;
+
+ @Resource
+ CheckTypeMapper checkTypeMapper;
@Override
public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
@@ -252,10 +256,11 @@
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);
+ throw exception(DEVICE_NOT_PAT_RECEIVED);
}
// 璁剧疆璁惧 浣跨敤涓�
@@ -725,11 +730,18 @@
}
// 纭垂澶勭悊
+ // 杩斿洖鍊�: 0 鎴愬姛 1 澶辫触 2 涓嶇敤纭垂
@Override
public Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel) {
DevRentDO devRentDO = devRentMapper.selectById(rentId);
- PatDetails patDetails = devRentDO.getPatDetails();
+ // 鏌ヨ妫�鏌ョ被鍨嬶紝纭畾鏄惁闇�瑕佺‘璐�
+ CheckTypeDO checkTypeDO = checkTypeMapper.getCheckTypeByValue(devRentDO.getCheckType());
+ if (0 == checkTypeDO.getExpenseRecognition()) {
+ return 2;
+ }
+
+ PatDetails patDetails = devRentDO.getPatDetails();
HisFeeConfirmReqBody hisFeeConfirmReqBody = new HisFeeConfirmReqBody();
MsgHeader msgHeader = new MsgHeader();
msgHeader.setMsgType("ODS_2212");
@@ -747,7 +759,7 @@
item.setExeDateTime( getCurTimeString() ); //
ExmRequest exmRequest = new ExmRequest();
exmRequest.setAuthorOrganization("47162057-2");
- exmRequest.setRequestId( patDetails.getApplyNo() ); //
+ exmRequest.setRequestId( devRentDO.getApplyNo() ); //
exmRequest.setPatientType( getPatientType(patDetails.getSource()) ); //
exmRequest.setItem(item);
hisFeeConfirmReqBody.setExmRequest(exmRequest);
@@ -757,7 +769,7 @@
if (0 == returnValue) {
devRentMapper.setPaid(rentId, isFeeConfirmOrCancel ? 1 : 0);
}
- return returnValue;
+ return returnValue; // 0 鎴愬姛 1 澶辫触 2 涓嶇敤纭垂
}
// 鏍囪 璁惧宸茶棰嗗彇
--
Gitblit v1.9.3