Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r15275 -r15279
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15275)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15279)
@@ -1029,21 +1029,42 @@
 	
 	var departAndName = obj.department+'-'+obj.name
 	var fontSize = getFontSizeByStr(departAndName,[
-		                                        {maxLen:10,fontSize:10},
-		                                  		{maxLen:20,fontSize:8},
-		                                		{maxLen:1000,fontSize:6}
-		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","6mm", departAndName);
+//			                                        {maxLen:6,fontSize:8},
+//			                                  		{maxLen:7,fontSize:7},
+//			                                  		{maxLen:9,fontSize:6},
+			                                  		{maxLen:21,fontSize:5},
+			                                  		{maxLen:24,fontSize:4},
+			                                  		{maxLen:100,fontSize:3}
+			                                  		]);
+//	var fontSize = getFontSizeByStr(departAndName,[
+//		                                        {maxLen:10,fontSize:10},
+//		                                  		{maxLen:20,fontSize:8},
+//		                                		{maxLen:1000,fontSize:6}
+//		                                  		]);
+	
+	var departSize = fontSize;
+	var tousseSize = fontSize - 2;
+	var departAndNameHtm = "<center><font size=" + departSize + "px><b>" + obj.department 
+	+ "</b></font><font size=" +tousseSize + "px>" +'-'+obj.name + "</font><center>";
+	
+	if(obj.department == '手术室'){
+		departSize = fontSize - 2;
+		tousseSize = fontSize;
+		departAndNameHtm = "<center><font size=" + departSize + "px>" + obj.department 
+		+ "</font><font size=" +tousseSize + "px><b>" +'-'+obj.name + "</b></font><center>";
+	}
+	
+	LODOP.ADD_PRINT_HTM("1mm","0mm","RightMargin:0mm","6mm", departAndNameHtm);
 	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("7mm","12mm","43mm","5mm", "灭菌日期:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("8mm","12mm","43mm","3mm", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(10,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("7mm","49mm","43mm","5mm", "有效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("8mm","49mm","43mm","3mm", "有效日期:"+obj.validDate);
 	setFontSizeBold(10,0);// 设置字体
 	
 	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
-	LODOP.ADD_PRINT_TEXT("12mm","12mm","77mm","5mm", s2);
+	LODOP.ADD_PRINT_TEXT("12mm","12mm","77mm","3mm", s2);
 	setFontSizeBold(10,0);// 设置字体
 	
 //	LODOP.ADD_PRINT_TEXT("12mm","60mm","RightMargin:0mm","5mm", "灭菌程序:"+obj.sterilingType);
@@ -1202,16 +1223,27 @@
 	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:10},
-		                                  		{maxLen:20,fontSize:8},
-		                                		{maxLen:1000,fontSize:6}
-		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","6mm", departAndName);
-	setFontSizeBold(fontSize,1);// 设置字体
-	setAlignment('center');// 对齐
+			                                  		{maxLen:13,fontSize:4},
+			                                  		{maxLen:18,fontSize:3},
+			                                  		{maxLen:200,fontSize:2}
+			                                  		]);
+	var departSize = fontSize;
+	var tousseSize = fontSize - 1;
+	var departAndNameHtm = "<center><font size=" + departSize + "px><b>" + obj.department 
+	+ "</b></font><font size=" +tousseSize + "px>" +'-'+obj.name + "</font></center>";
 	
+	if(obj.department == '手术室'){
+		departSize = fontSize - 1;
+		tousseSize = fontSize;
+		departAndNameHtm = "<center><font size=" + departSize + "px>" + obj.department 
+		+ "</font><font size=" +tousseSize + "px><b>" +'-'+obj.name + "</b></font></center>";
+	}
+	LODOP.ADD_PRINT_HTM("1mm","0mm","RightMargin:0mm","6mm", departAndNameHtm);
+//	setFontSizeBold(fontSize,1);// 设置字体
+//	setAlignment('center');// 对齐
+	
 	LODOP.ADD_PRINT_TEXT("8mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(8,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("12mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
@@ -1245,16 +1277,31 @@
 	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:8},
-		                                  		{maxLen:20,fontSize:6},
-		                                		{maxLen:1000,fontSize:4}
-		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","6mm", departAndName);
-	setFontSizeBold(fontSize,1);// 设置字体
-	setAlignment('center');// 对齐
+//			                                        {maxLen:6,fontSize:8},
+//			                                  		{maxLen:7,fontSize:7},
+//			                                  		{maxLen:9,fontSize:6},
+//			                                  		{maxLen:21,fontSize:5},
+			                                  		{maxLen:11,fontSize:4},
+			                                  		{maxLen:13,fontSize:3},
+			                                  		{maxLen:100,fontSize:2}
+			                                  		]);
+	var departSize = fontSize;
+	var tousseSize = fontSize - 1;
+	var departAndNameHtm = "<center><font size=" + departSize + "px><b>" + obj.department 
+	+ "</b></font><font size=" +tousseSize + "px>" +'-'+obj.name + "</font></center>";
 	
+	if(obj.department == '手术室'){
+		departSize = fontSize - 1;
+		tousseSize = fontSize;
+		departAndNameHtm = "<center><font size=" + departSize + "px>" + obj.department 
+		+ "</font><font size=" +tousseSize + "px><b>" +'-'+obj.name + "</b></font></center>";
+	}
+	LODOP.ADD_PRINT_HTM("1mm","0mm","RightMargin:0mm","6mm", departAndNameHtm);
+//	setFontSizeBold(fontSize,1);// 设置字体
+//	setAlignment('center');// 对齐
+	
 	LODOP.ADD_PRINT_TEXT("8mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(7,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("12mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
@@ -1296,14 +1343,14 @@
 			                                  		]);
 	var departSize = fontSize;
 	var tousseSize = fontSize - 2;
-	var departAndNameHtm = "<font size=" + departSize + "px><b>" + obj.department 
-	+ "</b></font><font size=" +tousseSize + "px>" +'-'+obj.name + "</font>";
+	var departAndNameHtm = "<center><font size=" + departSize + "px><b>" + obj.department 
+	+ "</b></font><font size=" +tousseSize + "px>" +'-'+obj.name + "</font></center>";
 	
 	if(obj.department == '手术室'){
 		departSize = fontSize - 2;
 		tousseSize = fontSize;
-		departAndNameHtm = "<font size=" + departSize + "px>" + obj.department 
-		+ "</font><font size=" +tousseSize + "px><b>" +'-'+obj.name + "</b></font>";
+		departAndNameHtm = "<center><font size=" + departSize + "px>" + obj.department 
+		+ "</font><font size=" +tousseSize + "px><b>" +'-'+obj.name + "</b></font></center>";
 	}
 	
 	LODOP. ADD_PRINT_HTM ("1mm","0mm","RightMargin:0mm","14mm", departAndNameHtm);