Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r14887 -r14939 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14887) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 14939) @@ -1237,9 +1237,16 @@ String functionCheck = ParerUtils.getCellFormatValue(row, 15); // 是否外来器械材料 String isForeignMaterial = ParerUtils.getCellFormatValue(row, 16); - - MaterialDefinition materialDefinition = materialDefinitionManager - .getMaterialDefinitionByName(name, specification); + + MaterialDefinition materialDefinition = null; + if(Constants.STR_YES.equals(isForeignMaterial)){ + materialDefinition = materialDefinitionManager + .getForeignTousseMaterialDefinition(name, specification); + }else{ + materialDefinition = materialDefinitionManager + .getMaterialDefinitionByName(name, specification); + } + if (materialDefinition == null) { materialDefinition = new MaterialDefinition(); materialDefinition.setName(name);