Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r29900 -r29971
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 29900)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 29971)
@@ -2971,32 +2971,40 @@
 	var idNumber = idCardInstance.idNumber;
 	var idCardQuestionList = idCardInstance.idCardQuestionList || [];
 	var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod;
+	var packageType = idCardInstance.tousseDefinition.packageType;
 	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' rowspan='2' style='font-size: 12px;' height='80px' align='center'>";
+		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;vertical-align: bottom;' align='center'>灭菌程序:"+sterilingMethod;
+		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'>器械总数量:"+ret.amount+"件";
+		tableHtml += "<td colspan='2' style='font-size: 15px;vertical-align: top;' align='center' border='0'>器械总数量:"+ret.amount+"件";
 		tableHtml += "</td>";
 		tableHtml += "</tr>";
 	}else{
 		tableHtml += "<tr>";
-		tableHtml += "<td colspan='4' style='font-size: 20px;' height='35px' align='center' border='0'>灭菌程序:"+sterilingMethod;
+		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'>器械总数量:"+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)