Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r15266 -r15270
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15266)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15270)
@@ -1275,42 +1275,51 @@
 	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('15mm','0mm','15mm','66mm',0,1);
-		LODOP.ADD_PRINT_LINE('28mm','0mm','28mm','66mm',0,1);
+		LODOP.ADD_PRINT_LINE('20mm','0mm','20mm','66mm',0,1);
+		LODOP.ADD_PRINT_LINE('40mm','0mm','40mm','66mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',12,1);
 	// 默认条码属性
 	LODOP.SET_PRINT_STYLE('ShowBarText', true);
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
-	var departAndName = obj.department+'-'+obj.name
+	
+	var departAndName = obj.department + '-' + obj.name;
 	var fontSize = getFontSizeByStr(departAndName,[
-		                                        {maxLen:10,fontSize:12},
-		                                  		{maxLen:20,fontSize:10},
-		                                		{maxLen:1000,fontSize:8}
-		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","14mm", departAndName);
-	setFontSizeBold(fontSize,1);// 设置字体
+			                                        {maxLen:6,fontSize:8},
+			                                  		{maxLen:7,fontSize:7},
+			                                  		{maxLen:9,fontSize:6},
+			                                  		{maxLen:21,fontSize:5},
+			                                  		{maxLen:41,fontSize:4},
+			                                  		{maxLen:100,fontSize:3}
+			                                  		]);
+	
+	var departAndNameHtm = "<font font-weight:normal size=" + (fontSize - 2) + "px>" + obj.department 
+	+ "</font><font size=" +fontSize + "px><b>" +'-'+obj.name + "</b></font>";
+	LODOP. ADD_PRINT_HTM ("1mm","0mm","RightMargin:0mm","14mm", departAndNameHtm);
+//	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","14mm", departAndName);
+//	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("16mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("20mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
-	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("21mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
+	setFontSizeBold(11,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("28mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
+	setFontSizeBold(11,0);// 设置字体
 	
-	var s2 = '灭菌批次: '+obj.operator+'灭菌员: '+emptyStringIfUndefinedOrNull(obj.sterilizationUser)
-	LODOP.ADD_PRINT_TEXT("24mm","10mm","RightMargin:0mm","4mm", s2);
-	setFontSizeBold(6,0);// 设置字体
+	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
+	LODOP.ADD_PRINT_TEXT("35mm","0mm","RightMargin:0mm","8mm", s2);
+	setFontSizeBold(10,0);// 设置字体
+	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_BARCODE("29mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("43mm","10mm","30mm","3mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
-	LODOP.ADD_PRINT_TEXT("32mm","40mm","30mm","6mm", obj.barcode);
+	LODOP.ADD_PRINT_TEXT("43mm","40mm","30mm","3mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("39mm","10mm","30mm","6mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("46mm","10mm","30mm","3mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
-	LODOP.ADD_PRINT_TEXT("42mm","40mm","30mm","6mm", obj.barcode);
+	LODOP.ADD_PRINT_TEXT("46mm","40mm","30mm","3mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
 }
 var foreignProxyDisinfectionLabelConfig = {