From f5d724112f59af209442b3ca8e932b37f05cebb7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 09:21:22 +0800
Subject: [PATCH] 大屏  显示列内 排序

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 1637b2c..9d356b5 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
@@ -684,6 +684,7 @@
 
     @Override
     public PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO) {
+        pageReqVO.setState(0);
         return devRentMapper.selectPage(pageReqVO);
     }
 
@@ -755,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