diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index e82d935..bc01af7 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -1039,7 +1039,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
                 c1 = Criteria.where("dueDate").lte(dueDateEnd);
             }
         }
+        boolean isBirthStart = false;
         if (null != birthStart) {
+            isBirthStart =  true;
             if (null != c1) {
                 c1 = c1.and("birth").gte(birthStart);
             } else {
@@ -1049,7 +1051,15 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (null != birthEnd) {
             if (null != c1) {
-                c1 = c1.lte(birthEnd);
+                if (isBirthStart)
+                {
+                    c1 = c1.lte(birthEnd);
+                }
+                else
+                {
+                    c1 = c1.and("birth").lte(birthEnd);
+                }
+
             } else {
                 c1 = Criteria.where("birth").lte(birthEnd);
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
index 68ea338..fb1ab9c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
@@ -40,33 +40,51 @@ public class Test {
 //
 //
 //
-//        patientsQuery1.setBookbuildingDateStart(DateUtil.parseYMD("1999-11-11"));
-//            patientsQuery1.setBookbuildingDateEnd(DateUtil.parseYMD("2016-12-08"));
-
-
-//        Date yuYueDate = DateUtil.addDay(new Date(), 2);
-//        if (yuYueDate != null) {
-//            //把时间格式化成 yyyy_MM_dd 的日期
-//            yuYueDate = DateUtil.formatDate(yuYueDate);
-//        }
-//        AntExChuQuery antExChuQuery = new AntExChuQuery();
-//        antExChuQuery.setYn(YnEnums.YES.getId());
-//        antExChuQuery.setNextCheckTimeStart(yuYueDate);
-//        antExChuQuery.setNextCheckTimeEnd(yuYueDate);
-//        antExChuQuery.setHospitalId("242");
-
-        patientsQuery1.setHospitalId("242");
-        patientsQuery1.setNorFactor(true);
-        patientsQuery1.setrLevel("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2");
+//         PatientsQuery patientsQuery = new PatientsQuery();
+//        patientsQuery1.setYn(YnEnums.YES.getId());
+//
+//        List buildType = new ArrayList();
+//        buildType.add(0);
+//        buildType.add(2);
+//        patientsQuery1.setBuildTypeList(buildType);
+//
+//        //1孕妇
+////        patientsQuery.setType(1);
+//        // 0未终止妊娠 1终止妊娠
+//        patientsQuery1.setDueStatus(0);
+//
+//
+//
+//
+//        patientsQuery1.setHospitalId("242");
+//        patientsQuery1.setNorFactor(true);
+//        patientsQuery1.setrLevel("315107bd-91fe-42a1-9237-752f3c046a40");
 //        patientsQuery1.setType(1);
 //
-//        Date yuYueDate = DateUtil.addDay(new Date(), 2);
-//        if (yuYueDate != null) {
-//            //把时间格式化成 yyyy_MM_dd 的日期
-//            yuYueDate = DateUtil.formatDate(yuYueDate);
-//        }
-//        patientsQuery1.setDueDateStart(yuYueDate);
-//        patientsQuery1.setDueDateEnd(yuYueDate);
+
+        patientsQuery1.setYn(YnEnums.YES.getId());
+        patientsQuery1.setType(1);
+
+//        Date end = DateUtil.addDay(new Date(), 0);
+
+        Date start = DateUtil.addDay(new Date(), -100);
+
+
+        patientsQuery1.setLastMensesStart(start);
+//        patientsQuery1.setLastMensesEnd(end);
+
+
+        Date date1 = DateUtil.addYear(new Date(), -18);
+//        patientsQuery1.setBirthEnd(date1);
+            Date date2 = DateUtil.addYear(new Date(), -30);
+        date2 = DateUtil.addYear(date2, -1);
+
+        patientsQuery1.setBirthStart(DateUtil.addDay(date2, 1));
+        List buildType = new ArrayList();
+        buildType.add(0);
+        buildType.add(2);
+        patientsQuery1.setBuildTypeList(buildType);
+
 
         System.out.println(patientsQuery1.convertToQuery().convertToMongoQuery());