Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r39043 -r39046
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 39043)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 39046)
@@ -365,6 +365,32 @@
 	}
 	tousseObj.operationTimeHHMM = jsonObj.operationTimeHHMM;
 	tousseObj.reviewTimeHHMM = jsonObj.reviewTimeHHMM;
+	setMaterialsByMaterialObjForPrint(tousseObj,jsonObj);
+	return jsonObj;
+}
+function setMaterialsByMaterialObjForPrint(tousseObj,jsonObj){
+	var materials = [];
+	var materialsTypesAmount = 0;
+	for(var i = 0; i < jsonObj.result.length;++i){
+		if(jsonObj.result[i].typeName != "一次性物品"){
+			if(jsonObj.result[i].printInLabel == "是"){
+				if(jsonObj.result[i].count > 0){
+					materials.push(jsonObj.result[i]);
+				}
+			}
+		}else{
+			if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods){
+				if(jsonObj.result[i].printInLabel == "是"){
+					if(jsonObj.result[i].count > 0){
+						materials.push(jsonObj.result[i]);
+					}
+				}
+    		}
+		}
+		if(jsonObj.result[i].typeName != "器械"){
+			materialsTypesAmount++;
+		}
+	}
 	//GZSZYY-74：器械包明细
 	var tousseInfo = '';
 	if(tousseObj.tousseName){
@@ -373,12 +399,12 @@
 	if(tousseObj.barcode){
 		tousseInfo += '器械包条码：' + tousseObj.barcode + '\r\n';
 	}
-	if(jsonObj.result && jsonObj.result.length > 0){
+	if(materials && materials.length > 0){
 		var sumAmount = 0;
 		tousseInfo += '材料明细：\r\n';
-		for(var k=0;k<jsonObj.result.length;k++){
-			tousseInfo += jsonObj.result[k].name + '：' + jsonObj.result[k].count + '\r\n';
-			sumAmount += jsonObj.result[k].count;
+		for(var k=0;k<materials.length;k++){
+			tousseInfo += materials[k].name + '：' + materials[k].count + '\r\n';
+			sumAmount += materials[k].count;
 		}
 		tousseInfo += '器械总材料数量：' + sumAmount;
 	}
@@ -392,38 +418,8 @@
 			jsonObj.barcodePaperType = jsonObj.sterilizationPaperType;
 		}
 	}
-	setMaterialsByMaterialObjForPrint(tousseObj,jsonObj);
-	return jsonObj;
-}
-function setMaterialsByMaterialObjForPrint(tousseObj,jsonObj){
-	var materials = [];
-	for(var i = 0; i < jsonObj.result.length;++i){
-		if(jsonObj.result[i].typeName != "一次性物品"){
-			if(jsonObj.result[i].count > 0){
-				materials.push(jsonObj.result[i]);
-			}
-		}else{
-			if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods){
-				if(jsonObj.result[i].printInLabel == "是"){
-					if(jsonObj.result[i].count > 0){
-						materials.push(jsonObj.result[i]);
-					}
-				}
-    		}
-		}
-	}
-	// 材料种类
-	{
-		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.materialsTypesAmount = materialsTypesAmount;
 	tousseObj.materialAmount = jsonObj.materialAmount;
 	tousseObj.totalAmount = jsonObj.totalAmount;
 }