diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
index 295d1a6..44f4a67 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
@@ -70,8 +70,8 @@ public class PermissionsController extends BaseController {
 
     @TokenRequired
     @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET)
-    public void getAccessPermission(HttpServletResponse response){
-
+    @ResponseBody
+    public List getAccessPermission(){
         List<Map<String,Object>> list = new ArrayList<>();
         for(PermissionTypeEnums permissionTypeEnums:PermissionTypeEnums.values()){
             Map<String,Object>  data =  new HashMap<String,Object>();
@@ -79,10 +79,10 @@ public class PermissionsController extends BaseController {
             data.put("title",permissionTypeEnums.getTitle());
             list.add(data);
         }
-        ResultUtils.buildSuccessResultAndWrite(response,list);
+        return list;
     }
 
-//    @TokenRequired
+    @TokenRequired
     @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST)
     @ResponseBody
     public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 90cd5da..b3b8007 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.controller;
 
 import javax.validation.Valid;
 
+import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,8 +53,20 @@ public class PuerperaManageController extends RestController{
        //软删除数据
         return  puerperaManagerFacade.deleteOnePuerperaById(id, Boolean.TRUE);
     }
-    
-    
+
+    /**
+     *
+     * 产妇匹配社区
+     *
+     * @param puerperaMatcherCommunityRequest 产妇匹配社区接口
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/matchpuerpera", method = RequestMethod.POST)
+    public  BaseResponse matchCommunity(@Valid PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest){
+        return  puerperaManagerFacade.matchCommunity(puerperaMatcherCommunityRequest);
+    }
     /**
      * 产妇管理修改
      * 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
index dcc187a..7b1c847 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java
@@ -3,6 +3,9 @@ package com.lyms.platform.operate.web.facade;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lyms.platform.common.utils.Assert;
+import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest;
+import com.sun.xml.internal.rngom.parse.host.Base;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,6 +33,22 @@ public class PuerperaManagerFacade {
     private PuerperaService puerperaService;
 
     /**
+     * 修改产妇的社区
+     *
+     * @param puerperaMatcherCommunityRequest 修改产妇社区
+     *
+     * @return
+     */
+    public BaseResponse matchCommunity(PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest){
+        PuerperaModel puerperaModel = puerperaService.findOnePuerperaById(puerperaMatcherCommunityRequest.getParentId());
+        Assert.notNull(puerperaModel,"产妇信息不存在");
+        puerperaModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId());
+        puerperaService.updatePuerpera(puerperaModel);
+        //TODO 产妇分配了社区，需要给对应的社区提示消息
+        return  new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
+    }
+
+    /**
      * 修改产妇信息
      * 
      * @param managerUpdateRequest
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
new file mode 100644
index 0000000..f6b152f
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaMatcherCommunityRequest.java
@@ -0,0 +1,36 @@
+package com.lyms.platform.operate.web.request;
+
+import com.lyms.platform.common.core.annotation.form.Form;
+import com.lyms.platform.common.core.annotation.form.FormParam;
+import org.hibernate.validator.constraints.NotEmpty;
+
+/**
+ * 产妇匹配社区
+ *
+ * Created by Administrator on 2016/3/31 0031.
+ */
+@Form
+public class PuerperaMatcherCommunityRequest {
+    @FormParam("parentid")
+    @NotEmpty(message = "parerntid不能为空")
+    private String parentId;
+    @FormParam("communityid")
+    @NotEmpty(message = "communityId不能为空")
+    private String communityId;
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+}