Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
===================================================================
diff -u -r17300 -r17528
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js	(.../printConfig.js)	(revision 17300)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js	(.../printConfig.js)	(revision 17528)
@@ -1079,32 +1079,35 @@
 	//alert(materialsTab)
 	return materialsTab;
 }
-//打两个条码，没有清单
+//打1个条码，没有清单 70x48
 function printMiddleLable_gyey(obj){
 	doGetLodop();
 	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('20mm','0mm','20mm','60mm',0,1);
-		LODOP.ADD_PRINT_LINE('30mm','0mm','30mm','60mm',0,1);
+		LODOP.ADD_PRINT_LINE('20mm','0mm','20mm','70mm',0,1);
+		LODOP.ADD_PRINT_LINE('30mm','0mm','30mm','70mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',15,1);
 	// 默认条码属性
 	LODOP.SET_PRINT_STYLE('ShowBarText', true);
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+	var name = obj.nameWithoutDepart;
+	if(obj.department){
+		//如果有科室,打印科室
+		name = obj.department + '-' + obj.nameWithoutDepart
+	}
 	
-	var fontSize = getFontSizeByStr(obj.name,[
-	                                        {maxLen:5,fontSize:25},
-	                                        {maxLen:7,fontSize:19},
-	                                        {maxLen:9,fontSize:15},
-	                                  		{maxLen:11,fontSize:13},
-	                                		{maxLen:13,fontSize:11},
-	                                		{maxLen:17,fontSize:9},
-	                                		{maxLen:200,fontSize:5}
+	var fontSize = getFontSizeByStr(name,[
+	                                        {maxLen:8,fontSize:25},
+	                                        {maxLen:12,fontSize:22},
+	                                        {maxLen:16,fontSize:19},
+	                                		{maxLen:21,fontSize:15},
+	                                		{maxLen:200,fontSize:10}
 	                                  		]);
-	LODOP.ADD_PRINT_TEXT("2mm","0mm","RightMargin:0mm","6mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("2mm","0mm","RightMargin:0mm","20mm", name);
 	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 	
@@ -1113,28 +1116,28 @@
 //	addPrintTable(tableStr,"12mm","1mm","RightMargin:1mm","29mm");
 //	setAlignment('center');// 居中对齐
 	
-	LODOP.ADD_PRINT_TEXT("21mm","1mm","34mm","5mm", "灭菌:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("21mm","15mm","54mm","5mm", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("21mm","33mm","30mm","5mm", "装配员:"+obj.operator);
+//	LODOP.ADD_PRINT_TEXT("21mm","33mm","30mm","5mm", "装配员:"+obj.operator);
+//	setFontSizeBold(11,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("26mm","15mm","54mm","5mm", "失效日期:"+obj.validDate);
 	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("26mm","1mm","34mm","5mm", "失效:"+obj.validDate);
-	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("26mm","33mm","30mm","5mm", "审核员:"+obj.reviewer);
-	setFontSizeBold(11,0);// 设置字体
+//	LODOP.ADD_PRINT_TEXT("26mm","33mm","30mm","5mm", "审核员:"+obj.reviewer);
+//	setFontSizeBold(11,0);// 设置字体
 
-	LODOP.ADD_PRINT_BARCODE("41mm","10mm","40mm","11mm","128Auto", obj.barcode);// 条码1
-	setAlignment('center');// 对齐
+//	LODOP.ADD_PRINT_BARCODE("41mm","10mm","40mm","11mm","128Auto", obj.barcode);// 条码1
+//	setAlignment('center');// 对齐
 	
-	var fontSize = getFontSizeByStr(obj.name,[
-		                                        {maxLen:10,fontSize:10},
-		                                  		{maxLen:20,fontSize:8},
-		                                		{maxLen:1000,fontSize:6}
-		                                  		]);
-	LODOP.ADD_PRINT_TEXT("53mm","0mm","RightMargin:0mm","3mm", obj.name);
-	setFontSizeBold(fontSize,1);// 设置字体
-	setAlignment('center');// 对齐
+//	var fontSize = getFontSizeByStr(obj.name,[
+//		                                        {maxLen:10,fontSize:10},
+//		                                  		{maxLen:20,fontSize:8},
+//		                                		{maxLen:1000,fontSize:6}
+//		                                  		]);
+//	LODOP.ADD_PRINT_TEXT("53mm","0mm","RightMargin:0mm","3mm", obj.name);
+//	setFontSizeBold(fontSize,1);// 设置字体
+//	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_BARCODE("67mm","10mm","40mm","11mm","128Auto", obj.barcode);// 条码2
+	LODOP.ADD_PRINT_BARCODE("34mm","15mm","40mm","11mm","128Auto", obj.barcode);// 条码2
 	setAlignment('center');// 对齐
 }
 //打印一个条码和清单