Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r13710 -r13766 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13710) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13766) @@ -782,8 +782,17 @@ Collection containerBarcodes, Long originalSterilizationRecordId) { Map result = new HashMap(); + if(sterilizationRecord.getId() == null || sterilizationRecord.getId() == 0L) + { + // 新加灭菌记录,校验 + if( !isAllSterilizationEnd(sterilizationRecord.getSterilizerName())) + { + result.put("success", false); + result.put("error", "灭菌炉正在灭菌中"); + return result; + } + } result.put("success", true); - //器械包条码增加单引号 Collection tousseInstanceBarcodesInclude = new ArrayList(); if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){