diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
index b9a045e..a8409c8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
@@ -466,7 +466,7 @@ public class PremaritalCheckup  extends BaseModel {
 
     /**隆化-增加 X线摄影报告
      */
-    //X摄影（1：正常，2：异常-需要写内容）
+    //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
     private Integer xRay;
     //异常情况填写内容
     private String abnormalTxt;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java
index ba64ff4..3287fd8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHealthController.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Date;
 
 
 /**
@@ -73,9 +74,16 @@ public class BabyHealthController extends BaseController {
             @RequestParam(value = "waskSon", required = false) Integer waskSon,
             @RequestParam(value = "checkDoctorId", required = false) String checkDoctorId,
             @RequestParam(value = "level", required = false) String level,
+            @RequestParam(value = "queryStartBirth", required = false) Date queryStartBirth,
+            @RequestParam(value = "queryEndBirth", required = false) Date queryEndBirth,
+            @RequestParam(value = "provinceId", required = false) String provinceId,
+            @RequestParam(value = "provinceId", required = false) String cityId,
+            @RequestParam(value = "provinceId", required = false) String areaId,
+            @RequestParam(value = "provinceId", required = false) String streetId,
             Integer page, Integer limit, HttpServletRequest request) {
         return babyHealthFacade.babystatList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge,
-                nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request), level);
+                nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request), level,queryStartBirth,
+                queryEndBirth,provinceId,cityId,areaId,streetId);
     }
 
     @RequestMapping(value = "/queryBabyHealthStatPrint", method = RequestMethod.GET)
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
index f9101c9..582856d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
@@ -161,12 +161,29 @@ public class BabyHealthFacade extends BaseServiceImpl {
 
 
     public BaseResponse babystatList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate,
-                                     Integer highRisk, Integer waskSon, String checkDoctorId, Integer page, Integer limit, Integer userId, String level) {
+                                     Integer highRisk, Integer waskSon, String checkDoctorId, Integer page, Integer limit, Integer userId,
+                                     String level,Date queryStartBirth,Date queryEndtBirth,String provinceId,String cityId,
+                                     String areaId,String streetId) {
         boolean flag = false;
         // List<String> hospital = groupsFacade.findGroupHospital(userId, false);
         int[] monthArr = {0, 3, 4, 8, 12, 18, 24, 30, 36, 48, 60, 72};//月龄
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId);
+        if(StringUtils.isNotEmpty(provinceId)){
+            criteria.and("provinceId").is(provinceId);
+        }
+        if(StringUtils.isNotEmpty(provinceId)){
+            criteria.and("cityId").is(cityId);
+        }
+        if(StringUtils.isNotEmpty(provinceId)){
+            criteria.and("areaId").is(areaId);
+        }
+        if(StringUtils.isNotEmpty(provinceId)){
+            criteria.and("streetId").is(streetId);
+        }
+        if(null!=queryStartBirth&&null!=queryEndtBirth){
+            criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth);
+        }
         Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId);
         if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
             pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index e239d20..792f8d9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -496,7 +496,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode()));
         /**隆化-增加 X线摄影报告
          */
-        //X摄影（1：正常，2：异常-需要写内容）
+        //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
         checkupResult.setxRay(result.getxRay());
         //异常情况填写内容
         checkupResult.setAbnormalTxt(result.getAbnormalTxt());
@@ -957,7 +957,7 @@ public class PremaritalCheckupFacade {
 
         /**隆化-增加 X线摄影报告
          */
-        //X摄影（1：正常，2：异常-需要写内容）
+        //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
         checkup.setxRay(addRequest.getxRay());
         //异常情况填写内容
         checkup.setAbnormalTxt(addRequest.getAbnormalTxt());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
index e020dd5..0b50902 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
@@ -455,7 +455,7 @@ public class PremaritalCheckupAddRequest {
 
     /**隆化-增加 X线摄影报告
      */
-    //X摄影（1：正常，2：异常-需要写内容）
+    //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
     private Integer xRay;
     //异常情况填写内容
     private String abnormalTxt;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
index 6034879..f7b1113 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
@@ -419,7 +419,7 @@ public class PremaritalCheckupPageResult {
     private String cxNum;
     /**隆化-增加 X线摄影报告
      */
-    //X摄影（1：正常，2：异常-需要写内容）
+    //X摄影（1：正常，2：异常-需要写内容 3:怀孕未检查）
     private Integer xRay;
     //异常情况填写内容
     private String abnormalTxt;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
index fd0fda0..a46aac1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
@@ -430,7 +430,7 @@ public class PremaritalCheckupResult {
 
     /**隆化-增加 X线摄影报告
      */
-    //X摄影（1：正常，2：异常-需要写内容）
+    //X摄影（1：正常，2：异常-需要写内容3:怀孕未检查）
     private Integer xRay;
     //异常情况填写内容
     private String abnormalTxt;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java
index b853936..eb3f9db 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java
@@ -341,13 +341,6 @@ public class TeamServiceImpl implements TeamService {
         }
         if(null!=recordUpdateModel.getStartTime()&&null!=recordUpdateModel.getEndTime()){
             criteria.and("created").gte(recordUpdateModel.getStartTime()).lte(recordUpdateModel.getEndTime());
-        }else{
-            if(null!=recordUpdateModel.getStartTime()){
-                criteria.and("created").gte(recordUpdateModel.getStartTime());
-            }
-            if(null!=recordUpdateModel.getEndTime()){
-                criteria.and("created").lte(recordUpdateModel.getEndTime());
-            }
         }
 
         PageResult pageResult = findMongoPage(TeamRecordUpdateModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);