Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r25802 -r25981
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 25802)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 25981)
@@ -2449,16 +2449,21 @@
 		idCardInstance.tousseDefinition.materialInstances = [];
 	}
 	var materialInstances = idCardInstance.tousseDefinition.materialInstances;
-	for(var i=0;i<diposableGoodsItems.length;++i){
-		var disposableGoodsItem = diposableGoodsItems[i];
-		var materialInstance = {
-				materialDefinition: {
-					name: disposableGoodsItem.diposableGoods.name,
-					specification: disposableGoodsItem.diposableGoods.specification
-				},
-				count: disposableGoodsItem.amount
-		}
-		materialInstances.push(materialInstance);
+	if(sstsConfig.tousseLabelPrintDisposableGoods){
+		for(var i=0;i<diposableGoodsItems.length;++i){
+			var disposableGoodsItem = diposableGoodsItems[i];
+			if(disposableGoodsItem.diposableGoods.printInLabel == "是" ){
+				var materialInstance = {
+						materialDefinition: {
+							name: disposableGoodsItem.diposableGoods.name,
+							specification: disposableGoodsItem.diposableGoods.specification,
+							type:disposableGoodsItem.type
+						},
+						count: disposableGoodsItem.amount
+				}
+				materialInstances.push(materialInstance);
+			}
+		} 
 	}
 	// 设置到tousseDefinitionMaterials里面
 	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.tousseDefinitionMaterials)){