Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r15200 -r15245
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15200)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 15245)
@@ -2968,4 +2968,18 @@
 		return true;
 	}
 	return false;
+}
+function childXToParentX(cfg,index,x){
+	var topMargin = cfg.topMargin;
+	var leftMargin = cfg.leftMargin;
+	var innerXMargin = cfg.innerXMargin;
+	var childWidth = cfg.childWidth;
+//	alert(index)
+	var newX = leftMargin+(childWidth+innerXMargin)*index+x;
+	return newX+'mm';
+}
+function childYToParentY(cfg,index,y){
+	var topMargin = cfg.topMargin;
+	var newY = topMargin+y;
+	return newY;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
===================================================================
diff -u -r15203 -r15245
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 15203)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 15245)
@@ -973,20 +973,6 @@
 		columnAmount: 2
 }
 
-function childXToParentX(cfg,index,x){
-	var topMargin = cfg.topMargin;
-	var leftMargin = cfg.leftMargin;
-	var innerXMargin = cfg.innerXMargin;
-	var childWidth = cfg.childWidth;
-//	alert(index)
-	var newX = leftMargin+(childWidth+innerXMargin)*index;
-	return newX+'mm';
-}
-function childYToParentY(cfg,index,y){
-	var topMargin = cfg.topMargin;
-	var newY = topMargin+y;
-	return newY;
-}
 function printSmallLabel2_gdsy(obj){
 	var columnAmount = 2;
 	var indexInColumn = obj.indexInColumn;
Index: ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js
===================================================================
diff -u -r14676 -r15245
--- ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js	(.../printConfig.js)	(revision 14676)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js	(.../printConfig.js)	(revision 15245)
@@ -895,7 +895,8 @@
 
 //小标签2配置，50x30mm
 var smallLabel2Config = {
-		customPrint:printSmallLabel2_fdzl
+		customPrint:printSmallLabel2_hdqrmyy,
+		columnAmount: 2
 }
 function printDisposableGoods_fdzl(obj){
 	doGetLodop();
@@ -974,14 +975,53 @@
 	
 	LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 }
-function printSmallLabel2_fdzl(obj){
-	
-	printSmallLabel_fdzl(obj);
-	if (typeof(obj.idCardDefinitionUseAmount) != 'undefined' ){
-		LODOP.ADD_PRINT_TEXT("1mm","38mm","50mm","10px", obj.idCardDefinitionUseAmount + "次");
-		setFontSizeBold(10,0);// 设置字体
+function printSmallLabel2_hdqrmyy(obj){
+	var columnAmount = 2;
+	var indexInColumn = obj.indexInColumn;
+	if(isUndefinedOrNull(indexInColumn)){
+		indexInColumn = 0;
 	}
+	var topMargin = 0;
+	var leftMargin = 0;
+	var innerMargin = 2;
+	var cfg = {
+			topMargin:0,
+			leftMargin:0,
+			innerXMargin:2,
+			childWidth:50
+	}
+	doGetLodop();
+	// 划线
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('5mm',childXToParentX(cfg,indexInColumn,0),'5mm',childXToParentX(cfg,indexInColumn,cfg.childWidth),0,1);
+		LODOP.ADD_PRINT_LINE('16mm',childXToParentX(cfg,indexInColumn,0),'16mm',childXToParentX(cfg,indexInColumn,cfg.childWidth),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:20,fontSize:6},
+		                                		{maxLen:1000,fontSize:4}
+		                                  		]);
+	LODOP.ADD_PRINT_TEXT("1mm",childXToParentX(cfg,indexInColumn,0),"50mm","5mm", obj.name);
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 对齐
+
+	LODOP.ADD_PRINT_TEXT("6mm",childXToParentX(cfg,indexInColumn,1),"34mm","6mm", "灭菌:"+obj.sterilizationDate);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("6mm",childXToParentX(cfg,indexInColumn,30),"30mm","6mm", "装配:"+obj.operator);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("12mm",childXToParentX(cfg,indexInColumn,1),"34mm","6mm", "失效:"+obj.validDate);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("12mm",childXToParentX(cfg,indexInColumn,30),"30mm","6mm", "审核:"+obj.reviewer);
+	setFontSizeBold(10,0);// 设置字体
+	
+	LODOP.ADD_PRINT_BARCODE("17mm",childXToParentX(cfg,indexInColumn,10),"30mm","10mm","128Auto", obj.barcode);// 条码1
 }
 var foreignProxyDisinfectionLabelConfig = {
 		// 可带表格线的table定义