From ee5ba3660221bf485fa5c99d87c15b200f48d93d Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Sat, 19 Mar 2022 18:37:49 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/query/BabyModelQuery.java |  4 ++--
 .../java/com/lyms/platform/query/BabyOralCheckQuery.java  | 15 ++++++++++-----
 .../platform/operate/web/facade/BabyOralCheckFacade.java  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

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 32a469e..25002cd 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
@@ -2338,14 +2338,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         }
         if (null != oralCheckTimeStart && oralCheckTimeEnd != null) {
             if (null != c) {
-                c = c.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd);
+                c = c.and("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd);
             } else {
                 c = Criteria.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd);
             }
         }
         if (null != nextOralCheckTimeStrat && nextOralCheckTimeEnd != null) {
             if (null != c) {
-                c = c.where("nextOralCheckTime").gte(nextOralCheckTimeStrat).lte(nextOralCheckTimeEnd);
+                c = c.and("nextOralCheckTime").gte(nextOralCheckTimeStrat).lte(nextOralCheckTimeEnd);
             } else {
                 c = Criteria.where("nextOralCheckTime").gte(nextOralCheckTimeStrat).lte(nextOralCheckTimeEnd);
             }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java
index b717b24..33e637a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
 import com.lyms.platform.common.utils.StringUtils;
+import jdk.nashorn.internal.objects.annotations.Where;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.mongodb.core.query.Criteria;
 
@@ -243,35 +244,39 @@ public class BabyOralCheckQuery extends BaseQuery implements IConvertToNativeQue
 
         if (null != createdStart && createdEnd != null) {
             if (null != c) {
-                c = c.where("created").gte(createdStart).lte(createdEnd);
+                c = c.and("created").gte(createdStart).lte(createdEnd);
             } else {
                 c = Criteria.where("created").gte(createdStart).lte(createdEnd);
             }
         }
         if(null!=birthStart){
             if(null != c){
-                c = c.where("birth").gte(birthStart);
+                c = c.and("birth").gte(birthStart);
             }else{
                 c = Criteria.where("birth").gte(birthStart);
             }
         }
         if(null!=birthEnd){
             if(null != c){
-                c = c.where("birth").lte(birthEnd);
+                if (c.getCriteriaObject().containsField("birth")){
+                    c = c.lte(birthEnd);
+                }else {
+                    c = c.and("birth").lte(birthEnd);
+                }
             }else{
                 c = Criteria.where("birth").lte(birthEnd);
             }
         }
         if (null != oralCheckTimeStart && oralCheckTimeEnd != null) {
             if (null != c) {
-                c = c.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd);
+                c = c.and("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd);
             } else {
                 c = Criteria.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd);
             }
         }
         if (null != nextOralCheckTimeStrat && nextOralCheckTimeEnd != null) {
             if (null != c) {
-                c = c.where("nextOralCheckTime").gte(nextOralCheckTimeStrat).lte(nextOralCheckTimeEnd);
+                c = c.and("nextOralCheckTime").gte(nextOralCheckTimeStrat).lte(nextOralCheckTimeEnd);
             } else {
                 c = Criteria.where("nextOralCheckTime").gte(nextOralCheckTimeStrat).lte(nextOralCheckTimeEnd);
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java
index 93aac1d..a1d93f9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java
@@ -223,8 +223,8 @@ public class BabyOralCheckFacade {
             request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd()));
             request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart()));
         }
-        System.out.println(request.convertToQuery().convertToMongoQuery().toString());
         List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"created");
+        System.out.println(request.convertToQuery().convertToMongoQuery().toString());
         List<Map> result=new ArrayList<>();
         for (BabyOralCheck babyOralCheck : babyOralChecks) {
             Map<String,Object> map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map
-- 
1.8.3.1