Index: ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js
===================================================================
diff -u -r29215 -r31885
--- ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js	(.../printConfig.js)	(revision 29215)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js	(.../printConfig.js)	(revision 31885)
@@ -1501,7 +1501,14 @@
     //打印器械包明细单
     tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy,
     //待回收申请单，是否打印回收汇总单
-    recyclingInvoiceTotal:recyclingInvoiceTotalConfig_bjdxzlyy,
+	recyclingInvoiceTotal:recyclingInvoiceTotalConfig_bjdxzlyy,
+	//标识牌打印配置
+	idcardPrintConfig: {
+	   //隐藏包装类型
+		"hidePackageType": true,
+		//隐藏灭菌程序
+		"hideSterilingMethod": true
+	},
 	//打印回收清单
     recyclingItems : recyclingItemsPrintConfig
 };
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r31738 -r31885
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 31738)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 31885)
@@ -2950,17 +2950,33 @@
 	var tableHeight = "100%";
 	//设置idcard的自定义打印格式，包括打印的logo图片。logo图片的宽和高要事先调整好，打印函数不能对图片进行大小的控制
 	var idCardPrintConfig = printConfig["idcardPrintConfig"];
+	var hidePackageType = false;
+	var hideSterilingMethod = false;
 	if(!isUndefinedOrNullOrEmpty(idCardPrintConfig)){
 		// 设置纸张类型为连续纸，纸张宽度为100mm，打印完毕后的下边距为20mm
-	    LODOP.SET_PRINT_PAGESIZE(idCardPrintConfig.pageSize[0],idCardPrintConfig.pageSize[1],idCardPrintConfig.pageSize[2],idCardPrintConfig.pageSize[3]);
+		if(idCardPrintConfig.pageSize){
+			LODOP.SET_PRINT_PAGESIZE(idCardPrintConfig.pageSize[0],idCardPrintConfig.pageSize[1],idCardPrintConfig.pageSize[2],idCardPrintConfig.pageSize[3]);
+		}
 		// 打印图片logo，前面4个参数控制图片的位置，分别为上边距，左边距，图片宽度，图片高度
-		var url = WWWROOT+"/disinfectsystem/config/"+ projectName + "/img/" + idCardPrintConfig.logoFileName;
-		LODOP.ADD_PRINT_IMAGE(idCardPrintConfig.logoPosition[0],idCardPrintConfig.logoPosition[1],idCardPrintConfig.logoPosition[2],idCardPrintConfig.logoPosition[3],"<img src='" +url + "'/>")
-		
-		tableTop = idCardPrintConfig.tablePosition[0];
-		tableLeft = idCardPrintConfig.tablePosition[1];
-		tableWidth = idCardPrintConfig.tablePosition[2];
-		tableHeight = idCardPrintConfig.tablePosition[3];
+		if(idCardPrintConfig.logoFileName && idCardPrintConfig.logoPosition){
+			var url = WWWROOT+"/disinfectsystem/config/"+ projectName + "/img/" + idCardPrintConfig.logoFileName;
+			LODOP.ADD_PRINT_IMAGE(idCardPrintConfig.logoPosition[0],idCardPrintConfig.logoPosition[1],idCardPrintConfig.logoPosition[2],idCardPrintConfig.logoPosition[3],"<img src='" +url + "'/>")
+		}
+		//材料明细表格的位置
+		if(idCardPrintConfig.tablePosition){
+			tableTop = idCardPrintConfig.tablePosition[0];
+			tableLeft = idCardPrintConfig.tablePosition[1];
+			tableWidth = idCardPrintConfig.tablePosition[2];
+			tableHeight = idCardPrintConfig.tablePosition[3];
+		}
+		//隐藏包装类型
+		if(idCardPrintConfig.hidePackageType !== undefined){
+			hidePackageType = idCardPrintConfig.hidePackageType;
+		}
+		//隐藏灭菌程序
+		if(idCardPrintConfig.hideSterilingMethod !== undefined){
+			hideSterilingMethod = idCardPrintConfig.hideSterilingMethod;
+		}
 	}
 	var barcode = idCardInstance.barcode;
 	var date = idCardInstance.printDate;
@@ -2983,27 +2999,35 @@
 		tableHtml += "<img src='" + getPrintBarcodeURL({barcode:barcode}) + "'/>";
 		tableHtml += "</br><center>"+barcode;
 		tableHtml += "</center></td>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: bottom;' align='left' border='0'>包装类型："+packageType;
-		tableHtml += "</td>";
+		if(!hidePackageType){
+			tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: bottom;' align='left' border='0'>包装类型："+packageType;
+			tableHtml += "</td>";
+		}
 		tableHtml += "</tr>";
 		tableHtml += "<tr>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;' align='left' border='0'>灭菌程序："+sterilingMethod;
-		tableHtml += "</td>";
+		if(!hideSterilingMethod){
+			tableHtml += "<td colspan='2' style='font-size: 15px;' align='left' border='0'>灭菌程序："+sterilingMethod;
+			tableHtml += "</td>";
+		}
 		tableHtml += "</tr>";
 		tableHtml += "<tr>";
 		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: top;' align='center' border='0'>器械总数量:"+ret.amount+"件";
 		tableHtml += "</td>";
 		tableHtml += "</tr>";
 	}else{
+		if(!hidePackageType){
+			tableHtml += "<tr>";
+			tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>包装类型："+packageType;
+			tableHtml += "</td>";
+			tableHtml += "</tr>";
+		}
+		if(!hideSterilingMethod){
+			tableHtml += "<tr>";
+			tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>灭菌程序："+sterilingMethod;
+			tableHtml += "</td>";
+			tableHtml += "</tr>";
+		}
 		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>包装类型："+packageType;
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>灭菌程序："+sterilingMethod;
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "<tr>";
 		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>器械总数量："+ret.amount+"件";
 		tableHtml += "</td>";
 		tableHtml += "</tr>";