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 4f290a8..0cf695a 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
@@ -81,6 +81,21 @@ public class PuerperaManageController extends BaseController {
         return patientFacade.matchCommunity(puerperaMatcherCommunityRequest);
     }
 
+
+    /**
+     * 查询所有包括孕妇和产妇
+     * @param patientsQueryRequest
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/allPats", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, null, loginState.getId(), "true", Boolean.FALSE);
+    }
+
     /**
      * 高危孕妇管理
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 89a1136..54b9658 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -203,7 +203,7 @@ public class PatientFacade {
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
-    private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage, boolean isRegion) {
+    private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
         patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
@@ -393,7 +393,7 @@ public class PatientFacade {
      * @param type                     控制类型 1孕妇  3产妇
      * @return
      */
-    public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage, boolean isRegion) {
+    public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
         //组合请求
         PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);