Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js
===================================================================
diff -u -r30703 -r30708
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30703)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30708)
@@ -1131,8 +1131,12 @@
 	var barcode = idCardInstance.barcode;
 	var date = idCardInstance.printDate;
 	var name = idCardInstance.tousseDefinition.name;
+	var packageType = idCardInstance.tousseDefinition.packageType;
+	var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod;
 	var userName = idCardInstance.userName;
 	var unit = idCardInstance.unit;
+	var description = idCardInstance.description;
+	var idCardQuestionList = idCardInstance.idCardQuestionList;
 	var tableHtml = "<table border ='0' width='380px' align='center' cellspacing=0>";
 	tableHtml += "<tr>";
 	tableHtml += "<td colspan='6' style='font-size: 25px;' border='0'><center><B>" + name + "</B></center></td>";
@@ -1200,25 +1204,56 @@
 		tableHtml += "</tr>";
 	}
 
+	if (description !== null) {
+		//打印备注
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' height='25px'>" + description + "</td>";
+		tableHtml += "</tr>";
+	}
+
+	if (idCardQuestionList && idCardQuestionList.length > 0) {
+		for (var i = 0; i < idCardQuestionList.length; i++) {
+			var html = idCardQuestionList[i].serialNumber + '.' + idCardQuestionList[i].registTime + ' ' + idCardQuestionList[i].question + ' ' + idCardQuestionList[i].registUser + '/' + idCardQuestionList[i].discoverUser + '\n';
+			tableHtml += "<tr>";
+			tableHtml += "<td colspan='4' style='word-wrap:break-word;word-break:break-all;border-top:0'>" + html + "</td>";
+			tableHtml += "</tr>";
+		}
+	}
+
 	tableHtml += "</table>";
 
 	tableHtml += "<table border ='0' width='380px' align='center' cellspacing=0>";
 	//条码，打印人和时间和器械数量
 	if (barcode != '' && userName != '' && date != '') {
 		tableHtml += "<tr>";
-		tableHtml += "<td colspan='2' style='font-size: 12px;' height='80px' align='center' border='0' >";
-		tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
+		tableHtml += "<td colspan='2' rowspan='3' style='font-size: 12px;' align='center'>";
+		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>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;' height='30px' align='center' border='0'>器械总数量:" + amount + "件";
+		tableHtml += "</tr>";
+		tableHtml += "<tr>";
+		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'>器械总数量:" + amount + "件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
 	} else {
 		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='70px' align='center' border='0'>器械总数量:" + amount + "件";
+		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'>器械总数量：" + amount + "件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
 	}
 
 	//告警语