Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
===================================================================
diff -u -r14459 -r14507
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 14459)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 14507)
@@ -949,7 +949,7 @@
 		                                  		{maxLen:20,fontSize:11},
 		                                		{maxLen:1000,fontSize:8}
 		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("1mm","1mm","RightMargin:0mm","5mm", obj.name);
 	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 
@@ -965,7 +965,7 @@
 	setFontSizeBold(10,0);// 设置字体
 	
 	LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
-
+	
 }
 // 小标签2
 var smallLabelConfig2 = {
@@ -1101,54 +1101,94 @@
 	    }
 }
 function printForeignProxyDisinfectionLabel_gdsy(obj){
+//	doGetLodop();
+//	
+//	// 划线
+//	if(obj.markTousse){
+//		LODOP.ADD_PRINT_LINE('9mm','0mm','9mm','50mm',0,1);
+//		LODOP.ADD_PRINT_LINE('18mm','0mm','18mm','50mm',0,1);
+//	}
+//	// 设置默认字体
+//	setDefaultFontNameSizeBold('宋体',12,1);
+//	// 默认条码属性
+//	LODOP.SET_PRINT_STYLE('ShowBarText', true);
+//	LODOP.SET_PRINT_STYLE('FontSize', 6);
+//	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+//	// 包名
+//	var fontSize = getFontSizeByStr(obj.name,[
+//		                                        {maxLen:10,fontSize:10},
+//		                                        {maxLen:15,fontSize:8},
+//		                                  		{maxLen:20,fontSize:6},
+//		                                  		{maxLen:25,fontSize:5},
+//		                                  		{maxLen:30,fontSize:5},
+//		                                		{maxLen:1000,fontSize:4}
+//		                                  		]);
+//	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","8mm", obj.name);
+//	setFontSizeBold(fontSize,1);// 设置字体
+//	setAlignment('center');// 对齐
+//	// 科室
+//	fontSize = getFontSizeByStr(obj.depart,[
+//	                                        {maxLen:10,fontSize:10},
+//	                                        {maxLen:15,fontSize:8},
+//	                                  		{maxLen:20,fontSize:6},
+//	                                  		{maxLen:25,fontSize:5},
+//	                                  		{maxLen:30,fontSize:5},
+//	                                		{maxLen:1000,fontSize:4}
+//	                                  		]);
+//	LODOP.ADD_PRINT_TEXT("10mm","0mm","RightMargin:0mm","5mm", obj.depart);
+//	setFontSizeBold(fontSize,1);// 设置字体
+//	setAlignment('center');// 对齐
+//	
+////	LODOP.ADD_PRINT_TEXT("10mm","1mm","34mm","5mm", "灭菌程序:"+obj.sterilingType);
+////	setFontSizeBold(8,0);// 设置字体
+////	LODOP.ADD_PRINT_TEXT("10mm","30mm","30mm","5mm", "审核人:"+obj.applicant);
+////	setFontSizeBold(8,0);// 设置字体
+//	LODOP.ADD_PRINT_TEXT("15mm","1mm","34mm","5mm", "灭菌:"+obj.sterilizationDate);
+//	setFontSizeBold(8,0);// 设置字体
+//	LODOP.ADD_PRINT_TEXT("15mm","26mm","30mm","5mm", "失效:"+obj.validDate);
+//	setFontSizeBold(8,0);// 设置字体
+//	
+//	LODOP.ADD_PRINT_BARCODE("19mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	// 新的样式
 	doGetLodop();
-	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('9mm','0mm','9mm','50mm',0,1);
-		LODOP.ADD_PRINT_LINE('18mm','0mm','18mm','50mm',0,1);
+		LODOP.ADD_PRINT_LINE('7mm','0mm','7mm','50mm',0,1);
+		LODOP.ADD_PRINT_LINE('19mm','0mm','19mm','50mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',12,1);
 	// 默认条码属性
 	LODOP.SET_PRINT_STYLE('ShowBarText', true);
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
-	// 包名
-	var fontSize = getFontSizeByStr(obj.name,[
-		                                        {maxLen:10,fontSize:10},
-		                                        {maxLen:15,fontSize:8},
-		                                  		{maxLen:20,fontSize:6},
-		                                  		{maxLen:25,fontSize:5},
-		                                  		{maxLen:30,fontSize:5},
-		                                		{maxLen:1000,fontSize:4}
-		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","8mm", obj.name);
-	setFontSizeBold(fontSize,1);// 设置字体
-	setAlignment('center');// 对齐
+	
 	// 科室
-	fontSize = getFontSizeByStr(obj.depart,[
+	var fontSize = getFontSizeByStr(obj.depart,[
 	                                        {maxLen:10,fontSize:10},
 	                                        {maxLen:15,fontSize:8},
 	                                  		{maxLen:20,fontSize:6},
 	                                  		{maxLen:25,fontSize:5},
-	                                  		{maxLen:30,fontSize:5},
+	                                  		{maxLen:30,fontSize:4},
 	                                		{maxLen:1000,fontSize:4}
 	                                  		]);
-	LODOP.ADD_PRINT_TEXT("10mm","0mm","RightMargin:0mm","5mm", obj.depart);
+	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","6mm", obj.depart);
 	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
+
+//	var sterilizationDate = "灭菌日期:"+obj.sterilizationDate+' ['+obj.virtualBasketSeqNum+']';
+	var sterilizationDate = "灭菌日期:"+obj.sterilizationDate;
+	LODOP.ADD_PRINT_TEXT("7mm","1mm","RightMargin:0mm","4mm", sterilizationDate);
+	setFontSizeBold(12,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("11mm","1mm","RightMargin:0mm","4mm", "失效日期:"+obj.validDate);
+	setFontSizeBold(12,0);// 设置字体
+	var line4 = "制作:"+obj.maker+'  核对:'+obj.assistant;
+	LODOP.ADD_PRINT_TEXT("15mm","1mm","RightMargin:0mm","3mm", line4);
+	setFontSizeBold(10,0);// 设置字体
 	
-//	LODOP.ADD_PRINT_TEXT("10mm","1mm","34mm","5mm", "灭菌程序:"+obj.sterilingType);
-//	setFontSizeBold(8,0);// 设置字体
-//	LODOP.ADD_PRINT_TEXT("10mm","30mm","30mm","5mm", "审核人:"+obj.applicant);
-//	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("15mm","1mm","34mm","5mm", "灭菌:"+obj.sterilizationDate);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("15mm","26mm","30mm","5mm", "失效:"+obj.validDate);
-	setFontSizeBold(8,0);// 设置字体
-	
 	LODOP.ADD_PRINT_BARCODE("19mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	
+	
 }
 var foreignTousseAppliationPrintConfig = {
 		customPrint:printForeignTousseApplication,