Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r14007 -r14023
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 14007)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 14023)
@@ -445,7 +445,6 @@
 			.getElementById('LODOP_EM'));
 
 	setPrinterByConfig();
-	
 	var myObj = printConfig[formTypeOfPrinted];
 	if(isUndefinedOrNullOrEmpty(myObj)){
 		var msg = '未找到('+formTypeOfPrinted+')的打印配置';
@@ -841,6 +840,9 @@
 	return newDate;
 }
 //根据标签纸类型设置打印页面类型
+function setFormTypeOfPrinted(obj){
+	setFormTypeOfPrintedByPageType(obj.tousseType,obj.pageType);
+}
 function setFormTypeOfPrintedByPageType(tousseType,pageType){
 	var formType = pageTypeToFormTypeOfPrinted(tousseType,pageType);
 	if(formType == ''){
@@ -859,12 +861,20 @@
 		formType = "middleLable";
 	}else if(pageType == "中标签2"){ //需要改造，调用print(obj)进行打印
 		formType = "middleLable2";
+	}else if(pageType == "小标签"){
+		formType = "smallLabel";
 	}else if(pageType == "小标签2"){
 		formType = "smallLabel2";
 	}
 	if(formType != ''){
 		if(tousseType=='消毒物品'){
 			formType = formType + '_disinfect'; 
+		}else if(tousseType=='外部代理灭菌'){
+			if(formType != 'smallLabel'){
+				formType = formType + '_foreignProxyDisinfection'; 
+			}else{
+				formType = 'foreignProxyDisinfectionLabel';
+			}
 		}
 	}
 	return formType;
@@ -1113,13 +1123,12 @@
 };
 
 //打印外部代理灭菌器械包
-function defaultForeignPrintPackage(sterilizationDate,barcode,depart,name,material,sterilingType,validDate,sterilizer,frequency,hospitalName,applicant,maker,assistant) {
-	if (barcode != null &&  barcode != '') {
-		var obj = {'barcode':barcode, 'name':name, 'applicant':applicant, 'depart': depart, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
-				'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':sterilingType,
-				'maker':maker,'assistant':assistant};
-		formTypeOfPrinted = "foreignProxyDisinfectionLabel";
-		print(obj);
+function defaultForeignPrintPackage(printSummaryObj) {
+	
+	if (!isUndefinedOrNullOrEmpty(printSummaryObj.barcode)) {
+		setFormTypeOfPrinted(printSummaryObj);
+//		formTypeOfPrinted = "foreignProxyDisinfectionLabel";
+		print(printSummaryObj);
 		
 		LODOP.PRINT();
 //		LODOP.PREVIEW();//打印预览