From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 34 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 45ce17b..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
@@ -9,6 +9,8 @@
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.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;
@@ -20,6 +22,7 @@
import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -52,13 +55,14 @@
*/
@Service
@Validated
+@Slf4j
public class DevRentServiceImpl implements DevRentService {
@Resource
QueueServiceTxFunctions queueServiceTxFunctions;
@Resource
- private RemoteDataService remoteDataService;
+ private FeeConfirmFeignService feeConfirmFeignService;
@Resource
private DevRentMapper devRentMapper;
@@ -71,6 +75,9 @@
@Resource
QueueMapper queueMapper;
+
+ @Resource
+ CheckTypeMapper checkTypeMapper;
@Override
public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
@@ -87,7 +94,7 @@
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
- // 鍚屾牱 鍦ㄩ绾︾‘璁ゆ椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
+ // 鍦ㄩ绾︾‘璁ゆ椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
@@ -153,8 +160,6 @@
procAffinityWhenRoutineFinish( firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes() );
}
- // 纭垂澶勭悊
- feeConfirm(firstOnStageQueueItem, userHisId, userNickname);
return CommonResult.success(rent_id);
}
@@ -168,6 +173,8 @@
public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 鍦ㄩ绾︾‘璁ゆ椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId(); // dev_rent 琛ㄧ殑ID
// 鏍囨敞璁惧 宸查鍙�
@@ -249,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);
}
// 璁剧疆璁惧 浣跨敤涓�
@@ -721,6 +729,49 @@
return devRentMapper.getRentByState(searchReqVO);
}
+ // 纭垂澶勭悊
+ // 杩斿洖鍊�: 0 鎴愬姛 1 澶辫触 2 涓嶇敤纭垂
+ @Override
+ public Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel) {
+ DevRentDO devRentDO = devRentMapper.selectById(rentId);
+
+ // 鏌ヨ妫�鏌ョ被鍨嬶紝纭畾鏄惁闇�瑕佺‘璐�
+ 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");
+ msgHeader.setMsgVersion("3.0");
+ msgHeader.setSender("ECG");
+ hisFeeConfirmReqBody.setMsgHeader(msgHeader);
+ Item item = new Item();
+ item.setItemCode( getHisCheckCode(devRentDO.getCheckType()) ); //
+ item.setItemStatus( isFeeConfirmOrCancel? "5" : "6" ); // 5 纭垂 6 鍙栨秷纭垂
+ item.setExeOrganization("47162057-2");
+ item.setExeDeptName("蹇冪數绉�");
+ item.setExeDept("蹇冪數绉�");
+ item.setExeDoctor( hisId ); //
+ item.setExeDoctorName( userNickname ); //
+ item.setExeDateTime( getCurTimeString() ); //
+ ExmRequest exmRequest = new ExmRequest();
+ exmRequest.setAuthorOrganization("47162057-2");
+ exmRequest.setRequestId( devRentDO.getApplyNo() ); //
+ exmRequest.setPatientType( getPatientType(patDetails.getSource()) ); //
+ exmRequest.setItem(item);
+ hisFeeConfirmReqBody.setExmRequest(exmRequest);
+ HisFeeConfirmRespResult result = feeConfirmFeignService.httpFeeApi("UpdateExmRequestStatus", "ECG", "ECG", hisFeeConfirmReqBody);
+ log.info( result.getMsgHeader().getStatus() );
+ Integer returnValue = result.getMsgHeader().getStatus().equals("true") ? 0 : 1;
+ if (0 == returnValue) {
+ devRentMapper.setPaid(rentId, isFeeConfirmOrCancel ? 1 : 0);
+ }
+ return returnValue; // 0 鎴愬姛 1 澶辫触 2 涓嶇敤纭垂
+ }
+
// 鏍囪 璁惧宸茶棰嗗彇
private Integer markDevRecieved(String devId, Long rentId, PatDetails patDetails) {
// 璁惧鏍囨敞 宸查鍙�
@@ -826,34 +877,6 @@
tmpQueueDO.setBedNo( bedInstallingQueueItem.getBedNo() ); // 浠� [棰嗙敤] 鍒� [瀹夎]锛� 鍙灔鍦ㄤ笉鍚屽伐浣嶄笂鎿嶄綔
queueMapper.updateById(tmpQueueDO);
}
- }
-
- private void feeConfirm(QueueDO queueItem, String hisId, String userNickname, Boolean isFeeConfirmCancel) throws JsonProcessingException {
- PatDetails patDetails = queueItem.getPatDetails();
-
- HisFeeConfirmReqBody hisFeeConfirmReqBody = new HisFeeConfirmReqBody();
- MsgHeader msgHeader = new MsgHeader();
- msgHeader.setMsgType("ODS_2212");
- msgHeader.setMsgVersion("3.0");
- msgHeader.setSender("ECG");
- hisFeeConfirmReqBody.setMsgHeader(msgHeader);
- Item item = new Item();
- item.setItemCode( getHisCheckCode(queueItem.getBookCheckType()) ); //
- item.setItemStatus( isFeeConfirmCancel? "6" : "5" ); //
- item.setExeOrganization("47162057-2");
- item.setExeDeptName("蹇冪數绉�");
- item.setExeDept("蹇冪數绉�");
- item.setExeDoctor( hisId ); //
- item.setExeDoctorName( userNickname ); //
- item.setExeDateTime( getCurTimeString() ); //
- ExmRequest exmRequest = new ExmRequest();
- exmRequest.setAuthorOrganization("47162057-2");
- exmRequest.setRequestId( patDetails.getApplyNo() ); //
- exmRequest.setPatientType( getPatientType(patDetails.getSource()) ); //
- exmRequest.setItem(item);
- hisFeeConfirmReqBody.setExmRequest(exmRequest);
- HisFeeConfirmRespResult result = remoteDataService.httpFeeApi("UpdateExmRequestStatus", "ECG", "ECG", hisFeeConfirmReqBody);
- result.getMsgHeader().getStatus();
}
private String getHisCheckCode(Integer checkType) {
--
Gitblit v1.9.3