Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r16817 -r16846
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 16817)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 16846)
@@ -406,8 +406,10 @@
 			ForeignTousseApplication foreignTousseApplication,
 			JSONArray jsonArray, SupplyRoomConfig config) {
 		String cleanedEntirely = "";
+		String barcodePaperType = "";
 		if(config != null){
 			cleanedEntirely = config.getForeignTousseCleanedEntirely();
+			barcodePaperType = config.getBarcodePaperType();
 		}
 		if(StringUtils.isBlank(cleanedEntirely)){
 			cleanedEntirely = TousseDefinition.STR_YES;
@@ -523,6 +525,7 @@
 				tousseDefinitionManager.saveOrUpdate(ancestorTD);
 				ancestorTD.setParentID(ancestorTD.getId());
 				ancestorTD.setAncestorID(ancestorTD.getId());
+				ancestorTD.setBarcodePaperType(barcodePaperType);
 			}
 			tousseDefinition.setAncestorID(ancestorTD.getId());
 			tousseDefinition.setBarcodePaperType(ancestorTD.getBarcodePaperType());
@@ -537,6 +540,11 @@
 				defaultSterilingMethod = config.getFtDefaultSterilingMethod();
 			}
 			tousseDefinition.setSterilingMethod(defaultSterilingMethod);
+			//默认拿祖先标签类型，如果空就拿科室供应室标签类型
+			if(StringUtils.isNotBlank(ancestorTD.getBarcodePaperType())){
+				barcodePaperType = ancestorTD.getBarcodePaperType();
+			}
+			tousseDefinition.setBarcodePaperType(barcodePaperType);
 			tousseDefinitionManager.saveOrUpdate(tousseDefinition);
 			
 			obj.put("tousseDefinitionId", tousseDefinition.getId());