eight
2024-12-10 f77fbfc8c07881f5239ce49b0dc78faaec3628b0
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -252,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);
        }
        // 设置设备 使用中
@@ -747,7 +748,7 @@
        item.setExeDateTime( getCurTimeString() ); //
        ExmRequest exmRequest = new ExmRequest();
        exmRequest.setAuthorOrganization("47162057-2");
        exmRequest.setRequestId( patDetails.getApplyNo() );  //
        exmRequest.setRequestId( devRentDO.getApplyNo() );  //
        exmRequest.setPatientType( getPatientType(patDetails.getSource()) ); //
        exmRequest.setItem(item);
        hisFeeConfirmReqBody.setExmRequest(exmRequest);
@@ -757,7 +758,7 @@
        if (0 == returnValue) {
            devRentMapper.setPaid(rentId, isFeeConfirmOrCancel ? 1 : 0);
        }
        return returnValue;
        return returnValue;  // 0 成功  1 失败
    }
    // 标记 设备已被领取