Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js
===================================================================
diff -u -r30721 -r30882
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30721)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30882)
@@ -849,9 +849,26 @@
 	tableHtml += "<td style='font-size: 15px;' width='40px' align='center'>数量</td>";
 	tableHtml += "</tr>";
 
+	var tousseDefinition = idCardInstance.tousseDefinition;
 	var materials = [];
-	if (!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.materialInstances)) {
-		materials = idCardInstance.tousseDefinition.materialInstances;
+	if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){
+		materials = materials.concat(tousseDefinition.materialInstances);
+		/* 新增打印一次性物品 */
+		if(sstsConfig.tousseLabelPrintDisposableGoods){
+			for(var i=0;i<tousseDefinition.diposableGoodsItems.length;i++){
+				if(tousseDefinition.diposableGoodsItems[i].diposableGoods.printInLabel == "是"){
+					var diposableGoods = {
+						"count":tousseDefinition.diposableGoodsItems[i].amount,
+						"materialDefinition":{
+							"name":tousseDefinition.diposableGoodsItems[i].diposableGoods.name,
+							"type":tousseDefinition.diposableGoodsItems[i].type,
+							"specification":tousseDefinition.diposableGoodsItems[i].diposableGoods.specification
+						}
+					};
+					materials.push(diposableGoods);
+				}
+			}
+		}
 	}
 	var total = materials.length;
 	var isEven = true;  //判断材料的数量是奇数还是偶数
@@ -872,9 +889,7 @@
 			materialName += "[" + specification + "]";
 		}
 		var count = materialInstance.count;
-		if (type != '一次性物品') {
-			amount += parseInt(count);
-		}
+		amount += parseInt(count);
 
 		tableHtml += "<tr>";
 		tableHtml += "<td style='font-size: 15px;' align='left'>" + materialName;
@@ -892,9 +907,7 @@
 				materialName2 += "[" + specification2 + "]";
 			}
 			var count2 = record2.count;
-			if (type2 != '一次性物品') {
-				amount += parseInt(count2);
-			}
+			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>";