Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
===================================================================
diff -u -r12735 -r12831
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 12735)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 12831)
@@ -433,14 +433,16 @@
 		String orgUnitCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		OrgUnit orgUnit = new OrgUnit();
 		orgUnit.setOrgUnitCoding(orgUnitCode);
-		WareHouse wareHouse = wareHouseManager.getDefaultWareHouseListByOrgUnit(orgUnit);
-		if(wareHouse != null){
-			GoodsStock stock = new GoodsStock();
-			stock.setWareHouseId(wareHouse.getId());
-			stock.setMaterialDefinitionId(materialDefinition.getId());
-			List<GoodsStock> stockList = goodsStockManager.getGoodsStockList(stock);
-			if(stockList != null && stockList.size() > 0){
-				storage = stockList.get(0).getAmount();
+		List<WareHouse> wareHouses = wareHouseManager.getWareHouseListByOrgUnit(orgUnit);
+		if(wareHouses != null){
+			for (WareHouse wareHouse : wareHouses) {
+				GoodsStock stock = new GoodsStock();
+				stock.setWareHouseId(wareHouse.getId());
+				stock.setMaterialDefinitionId(materialDefinition.getId());
+				List<GoodsStock> stockList = goodsStockManager.getGoodsStockList(stock);
+				if(stockList != null && stockList.size() > 0){
+					storage += stockList.get(0).getAmount();
+				}
 			}
 		}
 		map.put("storage", storage);