diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java
index 89334eb..b5658ec 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java
@@ -20,8 +20,15 @@ public class CommunityConfigService {
     @Autowired
     private CommunityConfigDao communityConfigDao;
 
+    //添加小区
+    public void appendCommunity(CommunityConfig communityConfig) {
+        communityConfig.setType(2);
+        communityConfigDao.addArea(communityConfig);
+    }
+
     //添加区域
     public void appendArea(CommunityConfig communityConfig) {
+        communityConfig.setType(1);
         communityConfigDao.addArea(communityConfig);
     }
 
@@ -40,12 +47,23 @@ public class CommunityConfigService {
     public List<CommunityConfig> queryArea(String keyword) {
         MongoCondition mongoCondition  = MongoCondition.newInstance();
         if(null != keyword) {
-            mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("parentId", keyword, MongoOper.LIKE), new MongoCondition("id", keyword, MongoOper.LIKE)});
+            mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("parentId", keyword, MongoOper.LIKE), new MongoCondition("id", keyword, MongoOper.IS)});
+
         }
-        mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS));
+        mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS));
+
         return communityConfigDao.queryArea(mongoCondition.toMongoQuery());
     }
 
+    //查询区域根据PID
+    public List<CommunityConfig> queryAreaByParentId(String pid) {
+        if(null == pid) return null;
+        MongoCondition mongoCondition  = MongoCondition.newInstance().and("parentId", pid, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS);
+        List<CommunityConfig> communityConfigs = communityConfigDao.queryArea(mongoCondition.toMongoQuery());
+
+        return communityConfigs;
+    }
+
 
     //查询区域根据ID
     public CommunityConfig queryAreaById(String id) {
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
index 6d7870a..2bbccf2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
@@ -2,6 +2,8 @@ package com.lyms.platform.pojo;
 
 import com.lyms.platform.common.enums.YnEnums;
 
+import java.util.List;
+
 /**
  * Created by Zhang.Rui on 2016/3/18.
  */
@@ -10,8 +12,18 @@ public class CommunityConfig {
     private String name;
     private String parentId;
     private Integer yn;
-
+    private Integer type;   //1 地名, 2 小区
     private CommunityConfig parent;
+    private List<CommunityConfig> nodes;
+
+
+    public List<CommunityConfig> getNodes() {
+        return nodes;
+    }
+
+    public void setNodes(List<CommunityConfig> nodes) {
+        this.nodes = nodes;
+    }
 
     public CommunityConfig getParent() {
         return parent;
@@ -21,6 +33,14 @@ public class CommunityConfig {
         this.parent = parent;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public CommunityConfig(String parentId, String tmp) {
         this.parentId = parentId;
         this.yn = YnEnums.YES.getId();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
index 3aedf12..cc134f4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
@@ -29,6 +29,22 @@ public class CommunityConfigController  extends  RestController {
     @Autowired
     private CommunityConfigService communityConfigService;
 
+
+    //新增小区
+    @RequestMapping(value = "addCommunity", method = RequestMethod.POST)
+    @ResponseBody
+    public BaseResponse addCommunity(@RequestBody @Valid CommunityConfigRequest communityConfigRequest) {
+        CommunityConfig communityConfig =  null;
+        for(String tmp : communityConfigRequest.getNames()) {
+            communityConfig = new CommunityConfig(communityConfigRequest.getParentId(), tmp);
+            communityConfigService.appendCommunity(communityConfig);
+        }
+        return new BaseResponse()
+                .setErrorcode(ErrorCodeConstants.SUCCESS)
+                .setErrormsg("添加成功!");
+    }
+
+
     //新增区域
     @RequestMapping(value = "communityConfig", method = RequestMethod.POST)
     @ResponseBody
@@ -75,20 +91,26 @@ public class CommunityConfigController  extends  RestController {
     public BaseListResponse queryArea(String keyword ) {
         List<CommunityConfig> communityConfigList = communityConfigService.queryArea(keyword);
 
-        for(CommunityConfig communityConfig : communityConfigList) {
-            if(null != communityConfig.getParentId()) {
-                communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId()));
-            } else {
-                communityConfig.setParent(new CommunityConfig("0", "root"));
+        if(null != communityConfigList) {
+            for(CommunityConfig communityConfig : communityConfigList) {
+                communityConfig.setNodes(communityConfigService.queryAreaByParentId(communityConfig.getId()));
+                if(null != communityConfig.getParentId()) {
+                    communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId()));
+                } else {
+                    communityConfig.setParent(new CommunityConfig("0", "root"));
+                }
             }
+            return new BaseListResponse().setData(communityConfigList)
+                    .setErrorcode(ErrorCodeConstants.SUCCESS)
+                    .setErrormsg("查询成功!");
         }
+        return new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR)
+                .setErrormsg("没有数据");
 
-        return new BaseListResponse().setData(communityConfigList)
-                .setErrorcode(ErrorCodeConstants.SUCCESS)
-                .setErrormsg("查询成功!");
     }
 
 
+
     //
     @RequestMapping(value = "communityConfigTest", method = RequestMethod.GET)
     @ResponseBody