Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java =================================================================== diff -u -r32567 -r32570 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java (.../ButtJointUseRecordAction.java) (revision 32567) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java (.../ButtJointUseRecordAction.java) (revision 32570) @@ -541,14 +541,14 @@ .get(mi_id); TousseDefinition tousseDefinition = mi.getTousse(); if(TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tousseDefinition.getTousseType())){ - TousseDefinition ancestorTd = null; - if(tdMap.containsKey(tousseDefinition.getAncestorID())){ - ancestorTd = tdMap.get(tousseDefinition.getAncestorID()); + TousseDefinition parentTd = null; + if(tdMap.containsKey(tousseDefinition.getParentID())){ + parentTd = tdMap.get(tousseDefinition.getParentID()); }else{ - ancestorTd = (TousseDefinition)objectDao.getById(TousseDefinition.class.getSimpleName(), tousseDefinition.getAncestorID()); - tdMap.put(tousseDefinition.getAncestorID(), ancestorTd); + parentTd = (TousseDefinition)objectDao.getById(TousseDefinition.class.getSimpleName(), tousseDefinition.getParentID()); + tdMap.put(tousseDefinition.getParentID(), parentTd); } - for (MaterialInstance materialInstance : ancestorTd.getMaterialInstances()) { + for (MaterialInstance materialInstance : parentTd.getMaterialInstances()) { if(materialInstance.getMaterialDefinitionId() == mi.getMaterialDefinitionId()){ materialInstance.setImplantAmountOfUseRecord(amount); if(materialInstance.getUsedAmountOfIncludeImplant() == null){