Index: ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
===================================================================
diff -u -r14882 -r14889
--- ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js	(.../printConfig.js)	(revision 14882)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js	(.../printConfig.js)	(revision 14889)
@@ -1071,8 +1071,8 @@
 	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('8mm','0mm','8mm','65mm',0,1);
-		LODOP.ADD_PRINT_LINE('44mm','0mm','44mm','65mm',0,1);
+		LODOP.ADD_PRINT_LINE('6mm','0mm','6mm','65mm',0,1);
+		LODOP.ADD_PRINT_LINE('34mm','0mm','34mm','65mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',15,1);
@@ -1081,46 +1081,48 @@
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
 	
-	LODOP.ADD_PRINT_TEXT("1mm","5mm","RightMargin:0mm","6mm", '德阳市人民医院');
+	LODOP.ADD_PRINT_TEXT("1mm","5mm","RightMargin:0mm","5mm", '德阳市人民医院');
 	setFontSizeBold(11,0);// 设置字体
 	
 	var tousseName = '品名:'+obj.name;
 	var fontSize = getFontSizeByStr(obj.name,[
-	                                        {maxLen:5,fontSize:20},
-	                                        {maxLen:10,fontSize:15},
-	                                  		{maxLen:20,fontSize:12},
-	                                		{maxLen:30,fontSize:8},
+	                                        {maxLen:5,fontSize:18},
+	                                        {maxLen:10,fontSize:13},
+	                                  		{maxLen:20,fontSize:9},
+	                                		{maxLen:30,fontSize:7},
 	                                		{maxLen:200,fontSize:5}
 	                                  		]);
 	
 	
 	
-	LODOP.ADD_PRINT_TEXT("8mm","1mm","10mm","5mm", '品名:');
-	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("6mm","1mm","12mm","5mm", '品名:');
+	setFontSizeBold(10,0);// 设置字体
 	
-	LODOP.ADD_PRINT_TEXT("8mm","11mm","RightMargin:0mm","16mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("6mm","11mm","RightMargin:0mm","8mm", obj.name);
 	setFontSizeBold(fontSize,1);// 设置字体
 	
-	LODOP.ADD_PRINT_TEXT("24mm","1mm","60mm","5mm", "科室:"+emptyStringIfUndefinedOrNull(obj.department));
+	LODOP.ADD_PRINT_TEXT("14mm","1mm","60mm","5mm", "科室:"+emptyStringIfUndefinedOrNull(obj.department));
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("29mm","1mm","40mm","5mm", "配包:"+obj.operator);
+	LODOP.ADD_PRINT_TEXT("19mm","1mm","40mm","5mm", "配包:"+obj.operator);
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("29mm","32mm","40mm","5mm", "核包:"+obj.reviewer);
+	LODOP.ADD_PRINT_TEXT("19mm","32mm","40mm","5mm", "核包:"+obj.reviewer);
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("34mm","1mm","40mm","5mm", "灭菌:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("24mm","1mm","40mm","5mm", "灭菌:"+obj.sterilizationDate);
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("34mm","32mm","40mm","5mm", "失效:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("24mm","32mm","40mm","5mm", "失效:"+obj.validDate);
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("39mm","1mm","40mm","5mm", "灭菌员:"+obj.operator);
+	LODOP.ADD_PRINT_TEXT("29mm","1mm","40mm","5mm", "灭菌员:"+obj.operator);
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("39mm","32mm","40mm","5mm", "炉次:"+emptyStringIfUndefinedOrNull(obj.frequency));
+	
+	var frequency = emptyStringIfUndefinedOrNull(obj.sterilizer)+'-'+emptyStringIfUndefinedOrNull(obj.frequency);
+	LODOP.ADD_PRINT_TEXT("29mm","32mm","40mm","5mm", "炉号/炉次:"+frequency);
 	setFontSizeBold(10,0);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("45mm","2mm","30mm","11mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("35mm","2mm","30mm","11mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText',0);
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("48mm","35mm","30mm","11mm", obj.barcode);
+	LODOP.ADD_PRINT_TEXT("38mm","35mm","30mm","11mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
 }
 var foreignProxyDisinfectionLabelConfig = {
@@ -1545,7 +1547,7 @@
     smallLabel2 : smallLabel2Config,
     // 中标签:65*50规格
     middleLable : middleLableConfig,
-    middleLable2 : middleLableConfig2,// 65*60
+    middleLable2 : middleLableConfig2,// 65*50
     // 大标签:100x80规格
     largeLabel : largeLabelConfig,
     // 加大标签:100x100规格