From c04653a6df7a4f9d3bd593f51ae9a8cd7ee93122 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 15:17:18 +0800
Subject: [PATCH] 患者顺序 处理
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 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..adbed9b 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,7 +227,7 @@
// 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()); // [宸查鐢╙ 鐘舵��
@@ -315,7 +315,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 +756,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);
}
--
Gitblit v1.9.3