Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r15428 -r15430
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15428)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15430)
@@ -1075,12 +1075,12 @@
 	addPrintTable(tableStr,"17mm","0mm","RightMargin:0mm","34mm");
 	setAlignment('center');// 居中对齐	
 	
-	LODOP.ADD_PRINT_BARCODE("51mm","5mm","45mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("51mm","10mm","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);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("51mm","50mm","45mm","10mm","128Auto", obj.barcode);// 条码2
+	LODOP.ADD_PRINT_BARCODE("51mm","55mm","45mm","10mm","128Auto", obj.barcode);// 条码2
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', true);
 //	LODOP.ADD_PRINT_TEXT("29mm","31mm","30mm","6mm", obj.barcode);
 //	setFontSizeBold(10,0);// 设置字体
@@ -1252,13 +1252,13 @@
 	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);// 设置字体
-	
-	LODOP.ADD_PRINT_BARCODE("21mm","10mm","30mm","6mm","128Auto", obj.barcode);// 条码1
+
+	LODOP.ADD_PRINT_BARCODE("21mm","10mm","30mm","5mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
 	LODOP.ADD_PRINT_TEXT("23mm","40mm","30mm","6mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("27mm","10mm","30mm","6mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("27mm","10mm","30mm","5mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
 	LODOP.ADD_PRINT_TEXT("29mm","40mm","30mm","6mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
@@ -1308,7 +1308,7 @@
 	setFontSizeBold(7,0);// 设置字体
 	
 	var s2 = '清洗/装配/包装/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
-	LODOP.ADD_PRINT_TEXT("16mm","0","RightMargin:0mm","4mm", s2);
+	LODOP.ADD_PRINT_TEXT("16mm","5mm","RightMargin:0mm","4mm", s2);
 	setFontSizeBold(7,0);// 设置字体
 	setAlignment('center');// 对齐
 	
@@ -1319,11 +1319,10 @@
 }
 function printMiddleLable_dgszyy(obj){
 	doGetLodop();
-	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('20mm','0mm','20mm','66mm',0,1);
-		LODOP.ADD_PRINT_LINE('40mm','0mm','40mm','66mm',0,1);
+		LODOP.ADD_PRINT_LINE('13mm','0mm','13mm','66mm',0,1);
+		LODOP.ADD_PRINT_LINE('33mm','0mm','33mm','66mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',12,1);
@@ -1358,24 +1357,24 @@
 //	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("21mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("14mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(11,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("28mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("20mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
 	setFontSizeBold(11,0);// 设置字体
 	
 	var s2 = '清洗/装配/包装/灭菌:'+emptyStringIfUndefinedOrNull(obj.washOperator)+'/'+obj.operator + '/'+obj.reviewer+'/'+emptyStringIfUndefinedOrNull(obj.sterilizationUser);
-	LODOP.ADD_PRINT_TEXT("35mm","0mm","RightMargin:0mm","8mm", s2);
+	LODOP.ADD_PRINT_TEXT("28mm","0mm","RightMargin:0mm","8mm", s2);
 	setFontSizeBold(10,0);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_BARCODE("43mm","10mm","30mm","3mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("35mm","10mm","30mm","4mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
-	LODOP.ADD_PRINT_TEXT("43mm","40mm","30mm","3mm", obj.barcode);
+	LODOP.ADD_PRINT_TEXT("35mm","40mm","30mm","3mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
 	
-	LODOP.ADD_PRINT_BARCODE("46mm","10mm","30mm","3mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("40mm","10mm","30mm","4mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
-	LODOP.ADD_PRINT_TEXT("46mm","40mm","30mm","3mm", obj.barcode);
+	LODOP.ADD_PRINT_TEXT("40mm","40mm","30mm","3mm", obj.barcode);
 	setFontSizeBold(10,0);// 设置字体
 }
 var foreignProxyDisinfectionLabelConfig = {