Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15717 -r15751
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15717)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15751)
@@ -241,8 +241,15 @@
 		List<ClassifyBasket> classifyBaskets = washRecord.getClassifyBaskets();
 		JSONObject workloadJson = countTotalWorkload(washRecord.getId(),
 				classifyBaskets, config.getSecondWashCountWorkload());
-		washRecord.setWashMaterialAmount(workloadJson.optInt("washMaterialAmount"));
-		washRecord.setGeneralMaterialAmount(workloadJson.optInt("generalMaterialAmount"));
+		//清洗材料总数量（材料当普通器械处理）
+		int materialAmount = 0;
+		if(washRecord.getWashAndDisinfectMaterials() != null){
+			for (WashAndDisinfectRecordMaterial  wahsMaterial: washRecord.getWashAndDisinfectMaterials()) {
+				materialAmount += wahsMaterial.getAmount();
+			}
+		}
+		washRecord.setWashMaterialAmount(workloadJson.optInt("washMaterialAmount") + materialAmount);
+		washRecord.setGeneralMaterialAmount(workloadJson.optInt("generalMaterialAmount") + materialAmount);
 		washRecord.setOperateMaterialAmount(workloadJson.optInt("operateMaterialAmount"));
 		washRecord.setForeignMaterialAmount(workloadJson.optInt("foreignMaterialAmount"));
 		washRecord.setDisinfectMaterialAmount(workloadJson.optInt("disinfectMaterialAmount"));