diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index 1aac997..9f88d13 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -251,23 +251,35 @@ public class BabyBuildController extends BaseController {
     @RequestMapping(value = "/exportChilds", method = RequestMethod.GET)
     @TokenRequired
     public void exportChilds(HttpServletRequest httpServletRequest,HttpServletResponse httpServletResponse,
-                                          @RequestParam(value = "mcardNo", required = false) String mcardNo,
-                                          @RequestParam(value = "bcardNo", required = false) String bcardNo,
-                                          @RequestParam(value = "mphone", required = false) String mphone,
-                                          @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge,
-                                          @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge,
-                                          @RequestParam(value = "birth", required = false) String birth,
-                                          @RequestParam(value = "nextDate", required = false) String nextDate,
-                                          @RequestParam(value = "expVip", required = false) Integer expVip,
-                                          @RequestParam(value = "serviceType", required = false) Integer serviceType,
-                                          @RequestParam(value = "name", required = false) String name,
-                                          @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
-                                          @RequestParam(value = "diagnose", required = false) String diagnose,
-                                          @RequestParam(value = "dateRange", required = false) String dateRange,
-                                          @RequestParam("page") Integer page,
-                                          @RequestParam("limit") Integer limit){
+                             @RequestParam(value = "queryNo", required = false) String queryNo,
+                             @RequestParam(value = "mcardNo", required = false) String mcardNo,
+                             @RequestParam(value = "bcardNo", required = false) String bcardNo,
+                             @RequestParam(value = "mphone", required = false) String mphone,
+                             @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge,
+                             @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge,
+                             @RequestParam(value = "birth", required = false) String birth,
+                             @RequestParam(value = "nextDate", required = false) String nextDate,
+                             @RequestParam(value = "expVip", required = false) Integer expVip,
+                             @RequestParam(value = "serviceType", required = false) Integer serviceType,
+                             @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
+                             @RequestParam(value = "name", required = false) String name,
+                             @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
+                             @RequestParam(value = "diagnose", required = false) String diagnose,
+                             @RequestParam(value = "dateRange", required = false) String dateRange,
+                             @RequestParam("page") Integer page,
+                             @RequestParam("limit") Integer limit,
+
+                             @RequestParam(value = "provinceId",required = false) String provinceId,
+                             @RequestParam(value = "cityId",required = false) String cityId,
+                             @RequestParam(value = "areaId",required = false) String areaId,
+                             @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId,
+                             @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId,
+                             @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
+                             @RequestParam(value = "hospitalId",required = false) String hospitalId,
+                             @RequestParam(value = "isArea",required = false) String isArea){
         LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
         BabyManageRequest request = new BabyManageRequest();
+        request.setQueryNo(queryNo);
         request.setBcardNo(bcardNo);
         request.setMcardNo(mcardNo);
         request.setMphone(mphone);
@@ -282,8 +294,23 @@ public class BabyBuildController extends BaseController {
         request.setName(name);
         request.setLimit(limit);
         request.setPage(page);
+        request.setServiceStatus(serviceStatus);
         request.setDateRange(dateRange);
 
+        // 省
+        request.setProvinceId(provinceId);
+        // 市
+        request.setCityId(cityId);
+        // 区/县
+        request.setAreaId(areaId);
+        // 建档医院
+        request.setHospitalProvinceId(hospitalProvinceId);
+        request.setHospitalCityId(hospitalCityId);
+        request.setHospitalAreaId(hospitalAreaId);
+        request.setHospitalId(hospitalId);
+        // 是否区域
+        request.setIsArea(isArea);
+
         babyBookbuildingFacade.exportChilds(request,loginState.getId(),httpServletResponse);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index daca063..e33be6a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -2029,7 +2029,7 @@ public class BabyBookbuildingFacade {
 //        }
 
 
-        if (request.getServiceType() != null && request.getServiceType() != 100) {
+        if (request.getServiceType() != null && request.getServiceType() != ServiceTypeEnums.ALL_SERVICE.getId()) {
             babyQuery.setServiceType(request.getServiceType());
         }
 
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 ed7819d..a1a5ac4 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
@@ -424,6 +424,19 @@ public class PatientFacade {
         }
         patientsQuery.setNeed(needPage);
 
+        //服务类型
+        if (riskPatientsQueryRequest.getServiceType() != null && riskPatientsQueryRequest.getServiceType() != ServiceTypeEnums.ALL_SERVICE.getId()) {
+            patientsQuery.setServiceType(riskPatientsQueryRequest.getServiceType());
+        }
+
+        //服务状态
+        if (riskPatientsQueryRequest.getServiceStatus() != null) {
+            if (!(riskPatientsQueryRequest.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId() || riskPatientsQueryRequest.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())) {
+                patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
+            }
+        }
+
+
         patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo());
 
         return patientsQuery;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
index 2762339..ab51a08 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
@@ -23,7 +23,7 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     private String cardNo;
     //服务类型
     @FormParam
-    private String serviceType;
+    private Integer serviceType;
     //孕周
     @FormParam
     private String startDueWeek;
@@ -463,11 +463,11 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
         this.rLevel = rLevel;
     }
 
-    public String getServiceType() {
+    public Integer getServiceType() {
         return serviceType;
     }
 
-    public void setServiceType(String serviceType) {
+    public void setServiceType(Integer serviceType) {
         this.serviceType = serviceType;
     }
 }