Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r21251 -r21253 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21251) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21253) @@ -3676,7 +3676,13 @@ } boolean monitorGoodsRecyclingStatusForUseRecord = CssdUtils.getSystemSetConfigByNameBool("monitorGoodsRecyclingStatusForUseRecord"); if(monitorGoodsRecyclingStatusForUseRecord && useRecord.recyclingStatus_partOrAll()){ - return JSONUtil.buildJsonObject(false, String.format("使用记录状态为%s,不能转换",useRecord.getRecyclingStatus())).toString(); + String message = null; + if(org.apache.commons.lang3.StringUtils.isNotBlank(useRecord.getPatientName())){ + message = String.format("病人名称为[%s]的使用记录不能生成申请单,请确认该条记录为未回收状态",useRecord.getPatientName()); + }else{ + message = String.format("使用记录状态为%s,不能转换",useRecord.getStatus()); + } + throw new SystemException(message); } useRecord.setApplicationTime(applicationCreateDate);