Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r12532 -r12599
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 12532)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 12599)
@@ -206,7 +206,6 @@
 		myObj.customPrint(printSummaryObj);
 		return;
 	}
-	
 	// 打印表头的内容
 	if (!isObjEmpty(myObj.headerFooter)){
 		// 设置为页眉页脚模式
@@ -363,7 +362,6 @@
 			addPrintBarcode(item, printSummaryObj[item.dataIndex]);
 		}
 	}
-	
 	if (!isObjEmpty(myObj.goodsTable)){
 		LODOP.SET_PRINT_STYLE("ItemType",4);
 		// 打印物品表格
@@ -416,7 +414,7 @@
 
 			var value = "";
 			var indexName = item.dataIndex;
-			if (indexName == "goodsAmount" || indexName.toLowerCase().indexOf("count") >= 0 ){
+			if (indexName == "goodsAmount" || indexName.toLowerCase().indexOf("count") >= 0  || indexName == "amount"){
 				value = printSummaryObj.totalGoodsAmount;
 			}
 			else if (indexName == "applyAmount"){
@@ -1937,6 +1935,127 @@
 	LODOP.PRINT();
 }
 
+/**
+ * 打印器械包材料清单
+ * @param tousseDefinitionObj 器械包定义数据对象
+ * @param printType 打印类型:0为打印,其它为预览
+ */
+function printTousseDefinitionMaterials(tousseDefinitionObj,printType) {
+	formTypeOfPrinted = "materialLabel";
+	tousseDefinitionObj.printConfigObj_default = materialLabelConfig_default;//
+	print2(tousseDefinitionObj);
+	if(printType == 0){//直接打印
+		LODOP.PRINT();
+	}else{//打印预览
+		LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
+		LODOP.PREVIEW();
+	}
+}
+//材料清单
+var materialLabelConfig_default = {
+	customPrint:printTousseDefinitionSmallLabel_default
+}
+//打印器械包材料清单
+function printTousseDefinitionSmallLabel_default(tousseDefinition){
+	if(isUndefinedOrNullOrEmpty(tousseDefinition)){
+		alert('包定义不能为空!');
+		return;
+	}
+	doGetLodop();
+	var name = tousseDefinition.name;
+	var position = name.indexOf("_");
+	if (position > 0){
+		name = name.substring(0, position);
+	}
+	var tableHtml = "<table border ='0' align='center' cellspacing=0>";
+	/*tableHtml += "<tr>";
+	tableHtml += "<td colspan='6' style='font-size: 17px;' border='0'><center>"+unit+"</center></td>";
+	tableHtml += "</tr>";*/
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='6' style='font-size: 25px;' border='0'><center><B>"+name+"</B></center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "</table>";
+	tableHtml += "<table border ='1' align='center' cellspacing=0>";
+	tableHtml += "<tr>";
+	tableHtml += "<td style='font-size: 15px;' width='100px'><center>器械名称</center></td>";
+	tableHtml += "<td style='font-size: 15px;' width='33px' align='center'>数量</td>";
+	tableHtml += "<td style='font-size: 15px;' width='100px'><center>器械名称</center></td>";
+	tableHtml += "<td style='font-size: 15px;' width='33px' align='center'>数量</td>";
+	tableHtml += "</tr>";
+	
+	var materials = [];
+	if(!isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){
+		materials = tousseDefinition.materialInstances;
+	}
+	var total = materials.length;
+	var isEven = true;  //判断材料的数量是奇数还是偶数
+	if(total%2 != 0){
+		isEven = false;
+		total++;
+	}
+	total /= 2;
+	var amount = 0;
+	//之所以用这种方式是因为用户习惯从上往下清点材料，而不是从左往右
+	for(var i=0;i<total;i++){
+		var materialInstance = materials[i];
+		var materialDefinition = materials[i].materialDefinition;
+		var materialName = materialDefinition.name;
+		var specification = materialDefinition.specification;
+		var type = materialDefinition.type;
+		if(specification && specification != 'null' && specification != ""){
+			materialName += "["+specification+"]";
+		}
+		var count = materialInstance.count;
+		if(type != '一次性物品'){
+			amount += parseInt(count);
+		}
+		
+		tableHtml += "<tr>";
+		tableHtml += "<td style='font-size: 15px;' align='left'>"+materialName;
+		tableHtml += "</td><td style='font-size: 15px;' align='center'><center>"+count+"</center></td>";
+		
+		if(i==total-1 && !isEven){
+			tableHtml += "<td style='font-size: 15px' align='left'></td>";
+			tableHtml += "<td style='font-size: 15px' align='center'><center></center></td>";
+		}else{
+			var record2 = materials[i+total];
+			var materialName2 = record2.materialDefinition.name;
+			var specification2 = record2.materialDefinition.specification;
+			var type2 = record2.materialDefinition.type;
+			if(specification2 && specification2 != 'null' && specification2 != ""){
+				materialName2 += "["+specification2+"]";
+			}
+			var count2 = record2.count;
+			if(type2 != '一次性物品'){
+				amount += parseInt(count2);
+			}
+			tableHtml += "<td style='font-size: 15px;' align='left'>"+materialName2;
+			tableHtml += "</td><td style='font-size: 15px;' align='center'><center>"+count2+"</center>";
+			tableHtml += "</td>";
+		}
+		
+		tableHtml += "</tr>";
+	}
+	
+	tableHtml += "</table>";
+
+	tableHtml += "<table border ='0' align='center' cellspacing=0>";
+	
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='4' style='font-size: 20px;' height='70px' align='center' border='0'>器械总数量:"+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(0,0,"95%","100%","<body leftmargin='8px' topmargin=0>"+tableHtml+"</body>");
+}
+
 //打印器械包退货记录
 function printReturnTousseRecord(title,operator,returnTime,depart,remark,returnTousseItems,printType) {
 	if (returnTousseItems != null && returnTousseItems.length > 0) {