Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r29872 -r29885
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 29872)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 29885)
@@ -2742,11 +2742,13 @@
 						var question = res.data[i].question;
 						var registUser = res.data[i].registUser;
 						var discoverUser = res.data[i].discoverUser;
+						var serialNumber = res.data[i].serialNumber;
 						idCardQuestionList[i] = {
 							registTime:registTime,
 							question:question,
 							registUser:registUser,
-							discoverUser:discoverUser
+							discoverUser:discoverUser,
+							serialNumber:serialNumber
 						}
 					}
 					idCardInstance.idCardQuestionList = idCardQuestionList;
@@ -2918,11 +2920,8 @@
 	}
 
 	if(idCardQuestionList && idCardQuestionList.length > 0){
-		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='border-bottom:0'>标识牌信息：</td>";
-		tableHtml += "</tr>";
 		for(var i=0;i<idCardQuestionList.length;i++){
-			var html = idCardQuestionList[i].registTime+' '+idCardQuestionList[i].question+' '+idCardQuestionList[i].registUser+'/'+idCardQuestionList[i].discoverUser+'\n';
+			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>";
@@ -2962,7 +2961,6 @@
 		tableLeft = idCardPrintConfig.tablePosition[1];
 		tableWidth = idCardPrintConfig.tablePosition[2];
 		tableHeight = idCardPrintConfig.tablePosition[3];
-		
 	}
 	var barcode = idCardInstance.barcode;
 	var date = idCardInstance.printDate;
@@ -2972,32 +2970,40 @@
 	var idCardPaperType = idCardInstance.idCardPaperType;
 	var idNumber = idCardInstance.idNumber;
 	var idCardQuestionList = idCardInstance.idCardQuestionList || [];
+	var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod;
 	var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit,idCardPaperType,description,idNumber,idCardQuestionList);
 	var tableHtml = ret.tableHtml + "<table border ='0' 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 += "<td colspan='2' rowspan='2' style='font-size: 12px;' height='80px' align='center'>";
 		tableHtml += "<img src='" + getPrintBarcodeURL({barcode:barcode}) + "'/>";
 		tableHtml += "</br><center>"+barcode;
 		tableHtml += "</center></td>";
 		tableHtml += "</td>";
-		tableHtml += "<td colspan='2' style='font-size: 15px;' height='30px' align='center' border='0'>器械总数量:"+ret.amount+"件";
+		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: bottom;' align='center'>灭菌程序:"+sterilingMethod+"件";
 		tableHtml += "</td>";
 		tableHtml += "</tr>";
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: top;' align='center'>器械总数量:"+ret.amount+"件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
 	}else{
 		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='70px' align='center' border='0'>器械总数量:"+ret.amount+"件";
+		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>";
 	}
 	
 	//告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF)
 	tableHtml += "<tr>";
 	tableHtml += "<td colspan='4' style='font-size: 20px;' border='0'><center>***需要回收，切勿丢失***</center></td>";
 	tableHtml += "</tr>";
 	tableHtml += "</table>";
-
 	LODOP.ADD_PRINT_HTM(tableTop,tableLeft,tableWidth,tableHeight,"<body leftmargin='8px' topmargin=0>"+tableHtml+"</body>");
 	LODOP.PRINT();
 }