Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r35430 -r36538 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 35430) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 36538) @@ -279,8 +279,8 @@ Map idCardInstanceIdTousseInstanceMap = new HashMap(); Map> idCardInstanceIdToInstrumentInstanceListMap = new HashMap>(); //2.查询出标识牌实例当前所包含的器械实例、查找出各器械实例的最新的器械循环实例 - fetchIdcardDefinitionMapAndTdMapByIdcardInstanceList(idCardInstanceList, idCardInstanceIdToInstrumentInstanceListMap, null, - null,null,idCardInstanceIdToIsRecyclingMap,null,classToHasGenerateNewTousseInstanceMap.get(cls)); + fetchIdcardDefinitionMapAndTdMapByIdcardInstanceList(idCardInstanceList, idCardInstanceIdToInstrumentInstanceListMap, new HashMap(), + new HashMap(), new HashMap>(),idCardInstanceIdToIsRecyclingMap,new HashMap(),classToHasGenerateNewTousseInstanceMap.get(cls)); //如果是标识牌实例的第一个创建器械包实例的追溯环节,则根据情况要不要删除器械循环实例(即这些标识牌实例下的器械循环实例没有关联后续环节的记录,只关联了首个环节的记录,则删除,否则只update该环节id字段为null) idCardInstanceList.stream().forEach(idCardInstance -> { /*if(isFirstSectionForCrateCycleInstace(cls, idCardInstanceIdToIsRecyclingMap.get(idCardInstance.getId()))){