Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40492 -r40533 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40492) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40533) @@ -2862,15 +2862,21 @@ return; } Set tiIds = new HashSet(); + List excludeTis = new ArrayList(); for (TousseInstance ti : allTousseInstances) { + TousseDefinition td = ti.getTousseDefinition(); + if(td.isForeignOrSplitTousse()){//外来器械不验证 + continue; + } + excludeTis.add(ti); tiIds.add(ti.getId()); } Set checkResult = tousseDefOptionalSterilizationManager.batchCheckTousseDefOptionalSterilization(checkSterilisation, tiIds); Collection noPassList = null;//没通过验证的包实例 if(CollectionUtils.isEmpty(checkResult)){//说明都没包含指定的灭菌程序 - noPassList = allTousseInstances; + noPassList = excludeTis; }else{ - for(TousseInstance ti : allTousseInstances){ + for(TousseInstance ti : excludeTis){ if(!checkResult.contains(ti.getId())){ if(noPassList == null){ noPassList = new ArrayList();