diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
new file mode 100644
index 0000000..1826710
--- /dev/null
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
@@ -0,0 +1,74 @@
+package com.zteits.irain.portal.web.parkinglotcloudplatform.areamanage;
+
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import com.clouds.common.utils.ResultUtils;
+import com.clouds.common.web.vo.BizResultVO;
+import com.clouds.common.web.vo.EasyUIDataGridVO;
+import com.zteits.clouds.api.apibase.bean.BaseRequest;
+import com.zteits.clouds.api.apibase.bean.BizResult;
+import com.zteits.clouds.api.apibase.constants.ErrorType;
+import com.zteits.clouds.api.apibase.exception.BizException;
+import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest;
+import com.zteits.clouds.api.dto.sys.param.AreaTreeDTO;
+import com.zteits.clouds.api.service.sys.TbAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Copyright: Copyright (c) 2017  zteits
+ *
+ * @ClassName: com.zteits.irain.portal.web.parkinglotcloudplatform.areamanage
+ * @Description:
+ * @version: v1.0.0
+ * @author: atao
+ * @date: 2017/8/29   下午4:23
+ * Modification History:
+ * Date         Author          Version      Description
+ * ---------------------------------------------------------*
+ * 2017/8/29      atao          v1.0.0          创建
+ */
+@Api(value = "区域管理", description = "区域管理")
+@RestController
+@RequestMapping("/areaManage")
+public class AreaManageController {
+    private Logger logger = LoggerFactory.getLogger(AreaManageController.class);
+    @Autowired
+    private HttpSession session;
+    @Autowired
+    private TbAreaService tbAreaService;
+
+    @ApiOperation("根据归属组织ID查询区域与区块树")
+    @PostMapping("/queryAreaAndBlockTree")
+    public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest){
+
+        BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> resultVO = new BizResultVO<>();
+        EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
+        AreaBlockByOrgIdQueryRequest request = new AreaBlockByOrgIdQueryRequest();
+        request.setSysCode(baseRequest.getSysCode());
+        // TODO 此处orgId 从当前登录操作人中取，现在先不限制
+        request.setOrgId(1L);
+        BizResult<List<AreaTreeDTO>> result= tbAreaService.queryAreaBlockByOrgId(request);
+        if(ResultUtils.isSuccess(result)){
+            easyUIDataGridVO.setRows(result.getData());
+            easyUIDataGridVO.setTotal(result.getData().size());
+            resultVO.setData(easyUIDataGridVO);
+        }else {
+            resultVO.setCode(result.getErrCode().getCode());
+            resultVO.setMsg(result.getErrMsg());
+        }
+
+        return resultVO;
+    }
+
+}
diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java
index 70987fc..4e18f2f 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java
@@ -376,17 +376,17 @@ public class BerthsStatisticController extends BizController {
 				if (!parkLotMap.containsKey(key)) {
 					Map<String, Double> timeAndVal = Maps.newHashMap();
 					if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio) {
-						timeAndVal.put(statisEndTime, statisticDTO.getFreeRatio() * 100);
+						timeAndVal.put(statisEndTime, null==statisticDTO.getFreeRatio()? 0: statisticDTO.getFreeRatio()* 100);
 						parkLotMap.put(key, timeAndVal);
 					} else if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio) {
-						timeAndVal.put(statisEndTime, statisticDTO.getTurnoverRatio() );
+						timeAndVal.put(statisEndTime, null==statisticDTO.getTurnoverRatio()?0:statisticDTO.getTurnoverRatio() );
 						parkLotMap.put(key, timeAndVal);
 					}
 				} else {
 					if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio) {
-						parkLotMap.get(key).put(statisEndTime, statisticDTO.getFreeRatio() * 100);
+						parkLotMap.get(key).put(statisEndTime, null==statisticDTO.getFreeRatio()? 0: statisticDTO.getFreeRatio()* 100);
 					} else if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio) {
-						parkLotMap.get(key).put(statisEndTime, statisticDTO.getTurnoverRatio() );
+						parkLotMap.get(key).put(statisEndTime, null==statisticDTO.getTurnoverRatio()?0:statisticDTO.getTurnoverRatio() );
 					}
 				}