Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r24584 -r24656
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 24584)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 24656)
@@ -117,6 +117,17 @@
     		}
 		}
 	}
+	// 材料种类
+	{
+		var materialCount = 0;
+		var materialsTypesAmount = 0;
+		for(var i = 0; i < jsonObj.result.length;++i){
+			if(jsonObj.result[i].typeName != "器械"){
+				materialsTypesAmount++;
+			}
+		}
+		tousseObj.materialsTypesAmount = materialsTypesAmount;
+	}
 	tousseObj.materials = materials;
 	tousseObj.materialAmount = jsonObj.materialAmount;
 	tousseObj.totalAmount = jsonObj.totalAmount;
@@ -260,22 +271,14 @@
             			barcodePaperType = tousseObj.pageType;
             		}
             		
-            		var materials = [];
-            		for(var i = 0; i < jsonObj.result.length;++i){
-            			if(jsonObj.result[i].typeName != "一次性物品"){
-            				materials.push(jsonObj.result[i]);
-            			}else{
-            				if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods != false){
-            					materials.push(jsonObj.result[i]);
-                    		}
-            			}
-            		}
+            		setMaterialsByMaterialObjForPrint(tousseObj,jsonObj);
+            		
             		var printBarcodeStr = barcodes[j];
             		setTypeInfoForPrint(tousseObj,printBarcodeStr);
             		if(!isTraceable){//不追溯打固定条码
             			printBarcodeStr = fixedBarcode;
             		}
-            		var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
+            		var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
             				'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,
             				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
             		obj.washOperator = tousseObj.washOperator;
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r24242 -r24656
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 24242)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 24656)
@@ -248,6 +248,10 @@
 		displayName: '材料总数',
 		textForPreview: '10'
 	}),new ObjectDataSourceProperty({
+		propName: 'materialsTypesAmount',
+		displayName: '材料种类',
+		textForPreview: '8'
+	}),new ObjectDataSourceProperty({
 		propName: 'includedTousseAmount',
 		displayName: '聚合包总个数',
 		textForPreview: '10'