Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r15279 -r15428
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15279)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15428)
@@ -1063,7 +1063,7 @@
 	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);
+	var s2 = '清洗/装配/包装/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
 	LODOP.ADD_PRINT_TEXT("12mm","12mm","77mm","3mm", s2);
 	setFontSizeBold(10,0);// 设置字体
 	
@@ -1134,7 +1134,7 @@
 	LODOP.ADD_PRINT_TEXT("30mm","54mm","43mm","5mm", "有效日期:"+obj.validDate);
 	setFontSizeBold(8,0);// 设置字体
 	
-	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
+	var s2 = '清洗/装配/包装/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
 	LODOP.ADD_PRINT_TEXT("36mm","5mm","77mm","5mm", s2);
 	setFontSizeBold(8,0);// 设置字体
 	
@@ -1249,7 +1249,7 @@
 	LODOP.ADD_PRINT_TEXT("12mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
 	setFontSizeBold(8,0);// 设置字体
 	
-	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
+	var s2 = '清洗/装配/包装/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
 	LODOP.ADD_PRINT_TEXT("16mm","10mm","RightMargin:0mm","4mm", s2);
 	setFontSizeBold(6,0);// 设置字体
 	
@@ -1302,12 +1302,12 @@
 //	setFontSizeBold(fontSize,1);// 设置字体
 //	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("8mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("8mm","15mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(7,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("12mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("12mm","15mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
 	setFontSizeBold(7,0);// 设置字体
 	
-	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
+	var s2 = '清洗/装配/包装/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
 	LODOP.ADD_PRINT_TEXT("16mm","0","RightMargin:0mm","4mm", s2);
 	setFontSizeBold(7,0);// 设置字体
 	setAlignment('center');// 对齐
@@ -1347,7 +1347,7 @@
 	+ "</b></font><font size=" +tousseSize + "px>" +'-'+obj.name + "</font></center>";
 	
 	if(obj.department == '手术室'){
-		departSize = fontSize - 2;
+		departSize = fontSize - 4;
 		tousseSize = fontSize;
 		departAndNameHtm = "<center><font size=" + departSize + "px>" + obj.department 
 		+ "</font><font size=" +tousseSize + "px><b>" +'-'+obj.name + "</b></font></center>";
@@ -1363,7 +1363,7 @@
 	LODOP.ADD_PRINT_TEXT("28mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
 	setFontSizeBold(11,0);// 设置字体
 	
-	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
+	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');// 对齐