diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 5619a83..9877aa8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -1515,16 +1515,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
-        if (null != buildDateNoybjStart && null != buildDateNoybjEnd ) {
-            MongoCondition c1 = MongoCondition.newInstance();
-            MongoCondition con1 = MongoCondition.newInstance("buildDateNoybj", buildDateNoybjStart, MongoOper.GTE).and("buildDateNoybj",buildDateNoybjEnd,MongoOper.LTE);
-            MongoCondition con2 = MongoCondition.newInstance("buildDate", buildDateStart, MongoOper.GTE).and("buildDate",buildDateEnd,MongoOper.LTE);
-            if (c != null) {
-                c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
-            } else {
-                c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
-            }
-        }
+
 
         if (null != checkTimeStart) {
             if (null != c) {
@@ -1541,6 +1532,23 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
                 c = Criteria.where("checkTime").lte(checkTimeEnd);
             }
         }
+
+        if (null != buildDateNoybjStart && null != buildDateNoybjEnd ) {
+
+            if (null != c) {
+                c.orOperator(
+                        Criteria.where("buildDateNoybj").gte(buildDateNoybjStart).lt(buildDateNoybjEnd),
+                        Criteria.where("buildDate").gte(buildDateNoybjStart).lt(buildDateNoybjEnd)
+                );
+            } else {
+                c = new Criteria();
+                c.orOperator(
+                        Criteria.where("buildDateNoybj").gte(buildDateNoybjStart).lt(buildDateNoybjEnd),
+                        Criteria.where("buildDate").gte(buildDateNoybjStart).lt(buildDateNoybjEnd)
+                );
+            }
+        }
+
         if (null != nextCheckTimeStart) {
             if (null != c) {
                 c = c.and("nextCheckTime").gte(nextCheckTimeStart);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
index 50e6376..40c43bf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
@@ -270,16 +270,16 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl {
             babyQuery.setHospitalId(hospitalId);
             babyQuery.setSort(null);
             if(babyQuery.getBuildDateEnd()!=null){
-                babyQuery.setBuildDateEnd(DateUtil.addDay(babyQuery.getBuildDateEnd(), 1));
+                babyQuery.setBuildDateEnd(DateUtil.getDayLastSecond(babyQuery.getBuildDateEnd()));
             }
             if(babyQuery.getCheckDateEnd()!=null){
-                babyQuery.setCheckDateEnd(DateUtil.addDay(babyQuery.getCheckDateEnd(), 1));
+                babyQuery.setCheckDateEnd(DateUtil.getDayLastSecond(babyQuery.getCheckDateEnd()));
             }
             if(babyQuery.getNextDateEnd()!=null){
-                babyQuery.setNextDateEnd(DateUtil.addDay(babyQuery.getNextDateEnd(), 1));
+                babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd()));
             }
             if(babyQuery.getBirthEnd()!=null){
-                babyQuery.setBirthEnd(DateUtil.addDay(babyQuery.getBirthEnd(), 1));
+                babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd()));
             }
             babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery);
         }