update

eight

2024-11-29 04480e19c8b47c2cb469811d47679c923b82710d

 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,12 +752,13 @@
        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);
        }
        return returnValue;
        return returnValue;  // 0 成功  1 失败
    }

    // 标记 设备已被领取