Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r14788 -r14789
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 14788)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 14789)
@@ -984,13 +984,36 @@
 	setFontSizeBold(10,0);// 设置字体
 }
 function printSmallLabel2_fdzl(obj){
+	doGetLodop();
 	
-	printSmallLabel_dgszyy(obj);
-	if (typeof(obj.idCardDefinitionUseAmount) != 'undefined' ){
-		LODOP.ADD_PRINT_TEXT("1mm","38mm","50mm","10px", obj.idCardDefinitionUseAmount + "次");
-		setFontSizeBold(10,0);// 设置字体
+	// 划线
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('7mm','0mm','7mm','47mm',0,1);
+		LODOP.ADD_PRINT_LINE('16mm','0mm','16mm','47mm',0,1);
 	}
+	// 设置默认字体
+	setDefaultFontNameSizeBold('宋体',12,1);
+	// 默认条码属性
+	LODOP.SET_PRINT_STYLE('ShowBarText', true);
+	LODOP.SET_PRINT_STYLE('FontSize', 6);
+	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+	var departAndName = obj.department+'-'+obj.name
+	var fontSize = getFontSizeByStr(departAndName,[
+		                                        {maxLen:10,fontSize:8},
+		                                  		{maxLen:20,fontSize:6},
+		                                		{maxLen:1000,fontSize:4}
+		                                  		]);
+	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","6mm", departAndName);
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 对齐
 	
+	LODOP.ADD_PRINT_TEXT("8mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("12mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
+	setFontSizeBold(8,0);// 设置字体
+	
+	
+	LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 }
 var foreignProxyDisinfectionLabelConfig = {
 		// 可带表格线的table定义