From 4b278300e8b3b1faabd5d080990cd3124f68612c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 13:09:28 +0800
Subject: [PATCH] 会取下一个时段的序号

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 c7bacba..c74c791 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
@@ -21,6 +21,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;
@@ -53,13 +54,14 @@
  */
 @Service
 @Validated
+@Slf4j
 public class DevRentServiceImpl implements DevRentService {
 
     @Resource
     QueueServiceTxFunctions queueServiceTxFunctions;
 
     @Resource
-    private RemoteDataService remoteDataService;
+    private FeeConfirmFeignService feeConfirmFeignService;
 
     @Resource
     private DevRentMapper devRentMapper;
@@ -250,10 +252,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);
         }
 
         // 璁剧疆璁惧 浣跨敤涓�
@@ -749,7 +752,8 @@
         exmRequest.setPatientType( getPatientType(patDetails.getSource()) ); //
         exmRequest.setItem(item);
         hisFeeConfirmReqBody.setExmRequest(exmRequest);
-        HisFeeConfirmRespResult result = remoteDataService.httpFeeApi("UpdateExmRequestStatus", "ECG", "ECG", hisFeeConfirmReqBody);
+        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);

--
Gitblit v1.9.3