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 530badc..a296cbb 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
@@ -67,6 +67,29 @@ public class CommunityConfigService {
         return communityConfigDao.queryArea(mongoQuery);
     }
 
+    //查询小区
+    public List<CommunityConfig> queryCommunity(String keyword, Integer page, Integer limit) {
+        MongoCondition mongoCondition  = MongoCondition.newInstance();
+        if(null != keyword) {
+            mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("gxxq", keyword, MongoOper.LIKE)});
+        }
+        mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS));
+
+
+        MongoQuery mongoQuery = mongoCondition.toMongoQuery();
+        BaseQuery baseQuery = new BaseQuery();
+
+        if(null != page && null != limit) {
+            baseQuery.setPage(page);
+            baseQuery.setLimit(limit);
+            baseQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery));
+            mongoQuery.start(baseQuery.getOffset()).end(baseQuery.getLimit());
+        }
+
+        return communityConfigDao.queryArea(mongoQuery);
+    }
+
+
     //查询区域根据PID
     public List<CommunityConfig> queryAreaByParentId(String pid) {
         if(null == pid) return null;
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 2bbccf2..dd43d7c 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
@@ -15,7 +15,15 @@ public class CommunityConfig {
     private Integer type;   //1 地名, 2 小区
     private CommunityConfig parent;
     private List<CommunityConfig> nodes;
+    private String gxxq;    //管辖小区
 
+    public String getGxxq() {
+        return gxxq;
+    }
+
+    public void setGxxq(String gxxq) {
+        this.gxxq = gxxq;
+    }
 
     public List<CommunityConfig> getNodes() {
         return nodes;
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 8006fe1..378eea1 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
@@ -30,21 +30,83 @@ public class CommunityConfigController  extends  RestController {
     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 = "addCommunity", method = RequestMethod.POST)
     @ResponseBody
     public BaseResponse addCommunity(@RequestBody @Valid CommunityConfigRequest communityConfigRequest) {
-        CommunityConfig communityConfig =  null;
+        String names = "";
         for(String tmp : communityConfigRequest.getNames()) {
-            communityConfig = new CommunityConfig(communityConfigRequest.getParentId(), tmp);
-            communityConfigService.appendCommunity(communityConfig);
+            names += ", " + tmp;
         }
+        CommunityConfig communityConfig = new CommunityConfig();
+        communityConfig.setId(communityConfigRequest.getId());
+        communityConfig.setGxxq(names.substring(1, names.length()));
+
+        communityConfigService.updateArea(communityConfig);
+
+        return new BaseResponse()
+                .setErrorcode(ErrorCodeConstants.SUCCESS)
+                .setErrormsg("添加成功!");
+    }
+
+
+    //删除小区
+    @RequestMapping(value = "delCommunity/{id}", method = RequestMethod.DELETE)
+    @ResponseBody
+    public BaseResponse addCommunity(@PathVariable String id) {
+        CommunityConfig communityConfig = new CommunityConfig();
+        communityConfig.setId(id);
+        communityConfig.setGxxq("");
+
+        communityConfigService.updateArea(communityConfig);
+
         return new BaseResponse()
                 .setErrorcode(ErrorCodeConstants.SUCCESS)
                 .setErrormsg("添加成功!");
     }
 
 
+    //查询区域
+    @RequestMapping(value = "queryCommunity", method = RequestMethod.GET)
+    @ResponseBody
+    public BaseListResponse queryCommunity(String keyword, Integer page, Integer limit ) {
+        List<CommunityConfig> communityConfigList = communityConfigService.queryCommunity(keyword, page, limit);
+
+        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("没有数据");
+
+    }
+
+
+
     //新增区域
     @RequestMapping(value = "communityConfig", method = RequestMethod.POST)
     @ResponseBody
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java
index e0caa6d..d84ef8c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java
@@ -13,6 +13,15 @@ public class CommunityConfigRequest {
     private String parentId;
     @NotNull(message = "添加内容不能为空")
     private String[] names;
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 
     public String getParentId() {
         return parentId;