Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r19658 -r19841
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 19658)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 19841)
@@ -880,7 +880,7 @@
 	tableHtml += "</tr>";
 	
 	tableHtml += "<tr>";
-	tableHtml += "<td colspan='2' style='font-size: 16px;' align='center'>"+name+"</td>";
+	tableHtml += "<td colspan='2' style='font-size: 34px;' align='center'>"+name+"</td>";
 	tableHtml += "</tr>";
 	
 	tableHtml += "<tr>";
@@ -962,9 +962,8 @@
 	var formType = '';
 	if(pageType == "加大标签"){
 		formType = "exLargeLabel";
-	}else if(pageType == "大标签2"){
-		formType = "largeLabel2";
-	}else if(pageType == "大标签"){
+	}
+	else if(pageType == "大标签"){
 		formType = "largeLabel";
 	}else if(pageType == "中标签"){ //需要改造，调用print(obj)进行打印
 		formType = "middleLable";
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
===================================================================
diff -u -r19637 -r19841
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 19637)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 19841)
@@ -1147,80 +1147,6 @@
 	LODOP.ADD_PRINT_BARCODE("69mm","10mm","40mm","10mm","128Auto", obj.barcode);// 条码2
 	setAlignment('center');// 对齐
 }
-var foreignTousseSmallLabelConfig = {
-		customPrint:foreignTousseSmallLabel_zsyy
-}
-function foreignTousseSmallLabel_zsyy(printSummaryObj){
-
-	doGetLodop();
-	var name = printSummaryObj.name ;
-	var barcode = printSummaryObj.barcode;
-	var material = printSummaryObj.material;
-	var operator = printSummaryObj.operator;
-	var reviewer = printSummaryObj.reviewer;
-	var sterilizationDate = printSummaryObj.sterilizationDate;
-	var validDate = printSummaryObj.validDate;
-	var foreignPackageObjectArray = printSummaryObj.foreignPackageObjectArray;
-	var sterilizer = printSummaryObj.sterilizer;
-	var frequency = printSummaryObj.frequency;
-	var hospitalName = printSummaryObj.hospitalName;
-	var total = printSummaryObj.total;
-	var labelType = printSummaryObj.labelType;
-	var doctor = StringUtils.defaultIfEmpty(printSummaryObj.doctor,'');
-	var tableHtml ="<table border ='0' style=\"width: 50mm; height: 30mm\">";
-	tableHtml += "<tr>";
-	tableHtml += "<td colspan='4' style='font-size: 11px;'><center>"+name+"</center>";
-//	tableHtml += "<hr width=300 size=1 color=#00ffff align=center noshade>";
-	tableHtml += "</td>";
-	tableHtml += "</tr>";
-	
-	tableHtml += "<tr>";
-	tableHtml += "<td style='font-size: 10px;'><center>灭菌:</center></td>";
-	tableHtml += "<td style='font-size: 10px;' align='left'>"+sterilizationDate+"</td>";
-	tableHtml += "<td style='font-size: 10px;'><center>装配员:</center></td>";
-	tableHtml += "<td style='font-size: 10px;' align='left'>"+operator+"</td>";
-	tableHtml += "</tr>";
-	
-	tableHtml += "<tr>";
-	tableHtml += "<td style='font-size: 10px;'><center>失效:</center></td>";
-	tableHtml += "<td style='font-size: 10px;' align='left'>"+validDate+"</td>";
-	tableHtml += "<td style='font-size: 10px;'><center>审核员:</center></td>";
-	tableHtml += "<td style='font-size: 10px;' align='left'>"+reviewer+"</td>";
-	tableHtml += "</tr>";
-	
-	tableHtml += "<tr>";
-	tableHtml += "<td style='font-size: 10px;' colspan='4' align='center'>"+doctor+'&nbsp;&nbsp;&nbsp;'+total+"</td>";
-	tableHtml += "</tr>";
-	
-	/*tableHtml += "<tr>";
-	tableHtml += "<td style='font-size: 10px;'><center>病人:</center></td>";
-	tableHtml += "<td style='font-size: 10px;' align='left'>"+foreignPackageObjectArray[2]+"</td>";
-	tableHtml += "<td style='font-size: 10px;'><center>住院号:</center></td>";
-	tableHtml += "<td style='font-size: 10px;' align='left'>"+foreignPackageObjectArray[0]+"</td>";
-	tableHtml += "</tr>";*/
-	
-	if(sterilizer == null || sterilizer.length == 0){
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 10px;'><center>"+hospitalName+"</center></td>";
-		tableHtml += "</tr>";
-	}else{
-		var str = "【"+sterilizer + "】第" + frequency +"炉";
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 10px;'><center>"+str+"</center></td>";
-		tableHtml += "</tr>";
-	}
-	tableHtml += "<tr>";
-	tableHtml += "<td colspan='4' style='font-size: 10px;'><center>";
-	tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
-	tableHtml += "</br>"+barcode;
-	tableHtml += "</center></td></tr>";
-	
-	tableHtml += "</table>";
-	
-	LODOP.ADD_PRINT_HTM(0,0,"100%","100%","<body leftmargin=0 topmargin=0>"+tableHtml+"</body>");
-	LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
-
-}
 //小标签配置，50x30mm
 var smallLabelConfig = {
 		// 可带表格线的table定义
@@ -1519,9 +1445,10 @@
 	var name = obj.tousseDefinition.name
 	var fontSize = getFontSizeByStr(name,[
 		                                        {maxLen:8,fontSize:16},
-		                                        {maxLen:12,fontSize:14},
-		                                  		{maxLen:20,fontSize:12},
-		                                		{maxLen:1000,fontSize:10}
+		                                        {maxLen:10,fontSize:12},
+                                                {maxLen:12,fontSize:10},
+		                                  		{maxLen:20,fontSize:8},
+		                                		{maxLen:1000,fontSize:8}
 		                                  		]);
 	LODOP.ADD_PRINT_TEXT("3mm","1mm","RightMargin:0mm","10mm", name);
 	setFontSizeBold(fontSize,1);// 设置字体
@@ -1531,11 +1458,11 @@
 	if(!isUndefinedOrNull(obj.idNumber)){
 		idNumber += obj.idNumber;
 	}
-	LODOP.ADD_PRINT_TEXT("9mm","1mm","RightMargin:0mm","6mm", idNumber);
+	LODOP.ADD_PRINT_TEXT("10mm","1mm","RightMargin:0mm","6mm", idNumber);
 	setFontSizeBold(14,0);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_BARCODE("17mm","11mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("17mm","13mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 	LODOP.PRINT();
 }
 function buildTousseDefinitionMeterialTable_zsyy(idCardInstance,tousseDefinition,unit){
@@ -1705,7 +1632,6 @@
     smallLabel2 : smallLabelConfig2_2,
     // 中标签:80x60规格
     middleLable : middleLableConfig,
-    foreignTousseSmallLabel:foreignTousseSmallLabelConfig,// 外来器械小标签
     foreignTousseMiddleLable:foreignTousseMiddleLableConfig,// 外来器械中标签
     // 大标签:100x80规格
     largeLabel : exLargeLabelConfig,