Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java
===================================================================
diff -u -r24501 -r24502
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java	(.../TousseDefinitionController.java)	(revision 24501)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java	(.../TousseDefinitionController.java)	(revision 24502)
@@ -90,6 +90,8 @@
 			tousse = tousseDefinitionManager
 					.getTousseDefinitionByName(tousseName);
 		}
+		int materialTotalAmount = 0;
+		int diposableGoodsTotalAmount = 0;
 		if (tousse != null) {
 			if (tousse.getMaterialInstances() != null) {
 				List<MaterialInstance> materialInstance = tousse
@@ -108,6 +110,7 @@
 						obj.put("materialDefinitionId", md.getId());
 						obj.put("name", materialName);
 						obj.put("count", instance.getCount());
+						materialTotalAmount += instance.getCount();
 						obj.put("type", "器械");
 						obj.put("cost", cost == null ? 0.00 : cost);
 						obj.put("notice", materialDefinitionManager
@@ -136,6 +139,7 @@
 					obj.put("id", instance.getId());
 					obj.put("name", materialName);
 					obj.put("count", instance.getAmount());
+					diposableGoodsTotalAmount += instance.getAmount();
 					obj.put("type", "一次性物品");
 					obj.put("cost", price == null ? 0.00 : price);
 					array.add(obj);
@@ -144,6 +148,8 @@
 		}
 		JSONObject json = JSONUtil.buildJsonObject(true,"成功");
 		json.put("rows", array);
+		json.put("diposableGoodsTotalAmount", diposableGoodsTotalAmount);
+		json.put("materialTotalAmount", materialTotalAmount);
 		return json.toString();
 	}
 }