Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r16251 -r16817
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 16251)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 16817)
@@ -151,7 +151,7 @@
             		var printSummaryObj = {
             				'barcode':barcodes[j],'virtualBasketSeqNum':seq,'name':tousseName,'material':"",'operator':operatorToPrint,'reviewer':reviewerToPrint,'sterilizationUser':sterilizationUserToPrint,'sterilizationDate':sterilizationDate,'validDate':validDate,
             				'foreignPackageObjectArray':applicationItems,'sterilizer':sterilizer,'frequency':frequency,'markTousse':markTousse,'hospitalName':hospitalName,'total':total,
-            				pageType:foreignDefaultLabelpaper,'labelType':foreignDefaultLabelpaper,'doctor':foreignTousseAppInfo.doctor,'patient':foreignTousseAppInfo.patient,'surgery':foreignTousseAppInfo.surgery,'operationTime':foreignTousseAppInfo.operationTime,
+            				pageType:tousseObj.pageType,'labelType':tousseObj.pageType,'doctor':foreignTousseAppInfo.doctor,'patient':foreignTousseAppInfo.patient,'surgery':foreignTousseAppInfo.surgery,'operationTime':foreignTousseAppInfo.operationTime,
             				'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea,
             				'bedNumber':foreignTousseAppInfo.bedNumber,'depart':foreignTousseAppInfo.ascriptionDepartment,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment,
             				'packageTypeAbbreviation':packageTypeAbbreviation,'applicationItemTotal':foreignTousseAppInfo.applicationItemTotal,'operationRoom':foreignTousseAppInfo.operationRoom
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r16804 -r16817
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 16804)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 16817)
@@ -525,6 +525,7 @@
 				ancestorTD.setAncestorID(ancestorTD.getId());
 			}
 			tousseDefinition.setAncestorID(ancestorTD.getId());
+			tousseDefinition.setBarcodePaperType(ancestorTD.getBarcodePaperType());
 			tousseDefinition.setPrintAmount(ancestorTD.getPrintAmount());
 			String defaultPackageType = ancestorTD.getPackageType();
 			if(StringUtils.isBlank(defaultPackageType)){
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16805 -r16817
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16805)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16817)
@@ -4048,6 +4048,7 @@
 		newTousseDefinition.setIsReview(td.getIsReview());
 		newTousseDefinition.setHandlerDepartCode(td.getHandlerDepartCode());
 		newTousseDefinition.setHandlerDepartName(td.getHandlerDepartName());
+		newTousseDefinition.setBarcodePaperType(td.getBarcodePaperType());
 		newTousseDefinition.setPrintAmount(td.getPrintAmount());
 		newTousseDefinition.setParentID(td.getId());
 		newTousseDefinition.setIncludeImplant(includeImplantFlag);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r16384 -r16817
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 16384)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 16817)
@@ -289,6 +289,15 @@
 		url : WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageTypeAndExpirationDateInfo.do',
 		baseParams :{addNullValue:true}
 	});
+	
+	var barcodePaperTypeStore = new Ext.data.JsonStore({
+		fields : [ 'name'],
+		url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllBarcodePaperType.do',
+		listeners:{
+			load:function(store,records) {
+			}
+		}
+	});
 
 	formObj = new top.Ext.FormPanel({
 		id : 'foreignTousseDefinitionForm',
@@ -391,7 +400,7 @@
 							anchor : '100%'
 						}]
 					},{
-				    	  columnWidth : .5,
+				    	  columnWidth : .33,
 				    	  layout : 'form',
 				    	  labelWidth : 80,
 				    	  items:[{
@@ -409,7 +418,25 @@
 								anchor : '95%'
 				    	  }]
 				      },{
-				    	  columnWidth : .5,
+		                  columnWidth : .34,
+		                  layout : 'form',
+		                  items:[{
+		                      xtype : 'combo',
+		                      fieldLabel : '标签纸类型',
+		                      id : 'barcodePaperType',
+		                      name : 'barcodePaperType',
+		                      editable:false,
+		                      valueField : 'name',
+		                      displayField : 'name',
+		                      store : barcodePaperTypeStore,
+		                      value : '小标签',
+		                      allowBlank : false,
+		                      forceSelection : true,
+		                      triggerAction : 'all',
+		                      anchor : '100%'
+		                  }]
+		              },{
+				    	  columnWidth : .33,
 				    	  layout : 'form',
 				    	  labelWidth : 80,
 				    	  items:[{