From 39f4a033065d262fd3ed146b3b597faa09bd9c86 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 14:05:25 +0800
Subject: [PATCH] bug fix
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 fde56f9..4dede33 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
@@ -140,7 +140,7 @@
//queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
- QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
+ QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(createReqVO.getRoomId(),
createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
// QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
@@ -227,10 +227,11 @@
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
// QueueStatusEnum.ONSTAGE => QueueStatusEnum.RECEIVED
- QueueDO bedOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(
+ QueueDO bedOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(
createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus() );
CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedOnStageQueueItem.getBookCheckType() );
bedOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus()); // [宸查鐢╙ 鐘舵��
+ bedOnStageQueueItem.setAffinityItem( 0 ); // 浜插拰鏍囪 娓呴櫎锛屽湪瀹夎闃舵閲嶆柊浜插拰
// 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫 , 鏇存柊 bedOnStageQueueItem
if (checkTypeDO.getAffinityCheckTypes().length > 0) {
@@ -315,7 +316,7 @@
// QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
// QueueStatusEnum.INSTALLING => QueueStatusEnum.FINISH
- QueueDO bedInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(
+ QueueDO bedInstallingQueueItem = queueMapper.getBedFirstQueueItemByStatus(
createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
bedInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
queueMapper.updateById( bedInstallingQueueItem );
@@ -756,9 +757,16 @@
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;
+
+ Integer returnValue = 1;
+ try {
+ HisFeeConfirmRespResult result = feeConfirmFeignService.httpFeeApi("UpdateExmRequestStatus", "ECG", "ECG", hisFeeConfirmReqBody);
+ log.info( result.getMsgHeader().getStatus() );
+ returnValue = result.getMsgHeader().getStatus().equals("true") ? 0 : 1;
+ } catch (RuntimeException ex) {
+ returnValue = 1;
+ }
+
if (0 == returnValue) {
devRentMapper.setPaid(rentId, isFeeConfirmOrCancel ? 1 : 0);
}
@@ -851,6 +859,7 @@
if (!affinityInstallingItems.isEmpty()) {
QueueDO affinityInstallingItem = affinityInstallingItems.get(0);
bedOnStageQueueItem.setStatus(QueueStatusEnum.AFFINITY_INSTALL.getStatus()); // 浜插拰-棰嗙敤
+ bedOnStageQueueItem.setAffinityItem(1);
bedOnStageQueueItem.setRoomId( affinityInstallingItem.getRoomId() );
bedOnStageQueueItem.setBedNo( affinityInstallingItem.getBedNo() ); // 棰嗙敤 鍒� 瀹夎 鍙兘浼氬湪涓嶅悓宸ヤ綅
}
--
Gitblit v1.9.3