Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r32188 -r32631
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 32188)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 32631)
@@ -3015,6 +3015,8 @@
 						if (persistenceTousseDefinition != null) {
 							deleteMaterialInstanceByTousseDefinition(persistenceTousseDefinition);
 							persistenceTousseDefinition.calculateMaterialSplitAmount();
+							// 外来器械不导入标签纸类型这个字段，导入时，不修改原来的外来器械定义的标签纸类型NFYY-12
+							tousseDefinition.setBarcodePaperType(null);
 							tousseDefinition = setPersistenceTousseDefinitionPropertyValueWithOtherTousseDefinition(
 									persistenceTousseDefinition, tousseDefinition);
 						}
@@ -3153,6 +3155,8 @@
 								.getName());
 				if (persistenceTousseDefinition != null) {
 					deleteMaterialInstanceByTousseDefinition(persistenceTousseDefinition);
+					// 外来器械不导入标签纸类型这个字段，导入时，不修改原来的外来器械定义的标签纸类型NFYY-12
+					tousseDefinition.setBarcodePaperType(null);
 					tousseDefinition = setPersistenceTousseDefinitionPropertyValueWithOtherTousseDefinition(
 							persistenceTousseDefinition, tousseDefinition);
 				}