Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r21242 -r21251 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 21242) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 21251) @@ -1468,10 +1468,6 @@ Long useRecordId = useRecordManager.saveOrUpdateWithPDA(params); UseRecord useRecord = useRecordManager.get(useRecordId); if(useRecord != null){ - boolean monitorGoodsRecyclingStatusForUseRecord = CssdUtils.getSystemSetConfigByNameBool("monitorGoodsRecyclingStatusForUseRecord"); - if(monitorGoodsRecyclingStatusForUseRecord && useRecord.recyclingStatus_partOrAll()){ - return JSONUtil.buildJsonObject(false, String.format("使用记录状态为%s,不能转换",useRecord.getRecyclingStatus())).toString(); - } String applicationFormType = CssdUtils.getSystemSetConfigByName("applicationFormType"); List ids = new ArrayList<>(); ids.add(useRecordId); Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r21238 -r21251 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21238) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21251) @@ -3674,6 +3674,10 @@ msg = String.format("病人为%s的记录为已申请状态", useRecord.getPatientName()); throw new RuntimeException(msg); } + boolean monitorGoodsRecyclingStatusForUseRecord = CssdUtils.getSystemSetConfigByNameBool("monitorGoodsRecyclingStatusForUseRecord"); + if(monitorGoodsRecyclingStatusForUseRecord && useRecord.recyclingStatus_partOrAll()){ + return JSONUtil.buildJsonObject(false, String.format("使用记录状态为%s,不能转换",useRecord.getRecyclingStatus())).toString(); + } useRecord.setApplicationTime(applicationCreateDate); //如果使用记录还未审核,则设置审核时间、审核人信息等