Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r15271 -r15272
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15271)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15272)
@@ -1038,23 +1038,23 @@
 	setAlignment('center');// 对齐
 	
 	LODOP.ADD_PRINT_TEXT("7mm","5mm","43mm","5mm", "灭菌日期:"+obj.sterilizationDate);
-	setFontSizeBold(8,0);// 设置字体
+	setFontSizeBold(10,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("7mm","49mm","43mm","5mm", "有效日期:"+obj.validDate);
-	setFontSizeBold(8,0);// 设置字体
+	setFontSizeBold(10,0);// 设置字体
 	
-	var s2 = '清洗/核对/包装/灭菌:'+obj.washOperator+'/'+obj.reviewer + '/'+obj.operator+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
+	var s2 = '清洗/装配/核对/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
 	LODOP.ADD_PRINT_TEXT("12mm","5mm","77mm","5mm", s2);
-	setFontSizeBold(8,0);// 设置字体
+	setFontSizeBold(10,0);// 设置字体
 	
-	LODOP.ADD_PRINT_TEXT("12mm","60mm","RightMargin:0mm","5mm", "灭菌程序:"+obj.sterilingType);
-	setFontSizeBold(8,0);// 设置字体
+//	LODOP.ADD_PRINT_TEXT("12mm","60mm","RightMargin:0mm","5mm", "灭菌程序:"+obj.sterilingType);
+//	setFontSizeBold(8,0);// 设置字体
 	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_largeLabel(obj);
 	addPrintTable(tableStr,"17mm","0mm","RightMargin:0mm","34mm");
 	setAlignment('center');// 居中对齐	
 	
-	LODOP.ADD_PRINT_BARCODE("51mm","2mm","45mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("51mm","5mm","45mm","10mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', true);
 //	LODOP.ADD_PRINT_TEXT("23mm","31mm","30mm","6mm", obj.barcode);
 //	setFontSizeBold(10,0);// 设置字体
@@ -1294,9 +1294,18 @@
 			                                  		{maxLen:41,fontSize:4},
 			                                  		{maxLen:100,fontSize:3}
 			                                  		]);
+	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 = "<font font-weight:normal size=" + (fontSize - 2) + "px>" + obj.department 
-	+ "</font><font size=" +fontSize + "px><b>" +'-'+obj.name + "</b></font>";
+	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>";
+	}
+	
 	LODOP. ADD_PRINT_HTM ("1mm","0mm","RightMargin:0mm","14mm", departAndNameHtm);
 //	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","14mm", departAndName);
 //	setFontSizeBold(fontSize,1);// 设置字体