Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r33383 -r33514 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 33383) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 33514) @@ -533,7 +533,7 @@ mi.setCount(count); mi.setIsImplant(md.getIsImplant()); mi.setMaterialDefinition(md); - mi.setMaterialName(md.getShowName()); + mi.setMaterialName(md.getName()); mi.setTousse(td); mi.setWashClassifyType(md.getWashClassifyType()); needAddMiList.add(mi); @@ -553,7 +553,7 @@ mi.setCount(count); mi.setIsImplant(md.getIsImplant()); mi.setMaterialDefinition(md); - mi.setMaterialName(md.getShowName()); + mi.setMaterialName(md.getName()); mi.setTousse(td); mi.setWashClassifyType(md.getWashClassifyType()); needAddMiList.add(mi); @@ -676,7 +676,7 @@ includeImplantFlag = TousseDefinition.INCLUDE_IMPLANT; } materialInstance.setMaterialDefinition(materialDefinition); - materialInstance.setMaterialName(materialDefinition.getShowName()); + materialInstance.setMaterialName(materialDefinition.getName()); materialInstance.setTousse(td); materialInstance.setSequence(sequence); //外来器械材料申请数量和回收数量分开