From d19bcbd076d660cdf5d4910434d6ada0b3cd0c72 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Wed, 31 Jul 2019 14:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/common/utils/DateUtil.java    | 8 ++++----
 .../web/service/impl/BabyEvaluationCriterionServiceImpl.java      | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 387970f..108b0f2 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1489,10 +1489,10 @@ public class DateUtil {
     public static Date getDayFirstSecond(Date date) {
         Calendar instance = Calendar.getInstance();
         instance.setTime(date);
-        instance.add(Calendar.HOUR_OF_DAY, 0);
-        instance.add(Calendar.MINUTE, 0);
-        instance.add(Calendar.SECOND, 0);
-        instance.add(Calendar.MILLISECOND, 0);
+        instance.set(Calendar.HOUR_OF_DAY, 0);
+        instance.set(Calendar.MINUTE, 0);
+        instance.set(Calendar.SECOND, 0);
+        instance.set(Calendar.MILLISECOND, 0);
         return instance.getTime();
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
index f0df564..fcb9850 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
@@ -345,9 +345,11 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
             //  更新
             update(userId, configId, id);
         } else {
+            Date dayFirstSecond = DateUtil.getDayFirstSecond(new Date());
+            Date dayLastSecond = DateUtil.getDayLastSecond(new Date());
 
             BabyNeuroPsychologicalModel model = mongoTemplate.findOne(Query.query(Criteria.where("babyId").is(babyId).and("createTime")
-                            .gte(DateUtil.getDayFirstSecond(new Date())).lte(DateUtil.getDayLastSecond(new Date())).and("yn").is(YnEnums.YES.getId())), BabyNeuroPsychologicalModel.class);
+                            .gte(dayFirstSecond).lte(dayLastSecond).and("yn").is(YnEnums.YES.getId())), BabyNeuroPsychologicalModel.class);
             if (model != null) {
                 //  更新
                 update(userId, configId, model.getId());
@@ -484,6 +486,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
                 stringMap.put("checkMonth", DateUtil.getBabyMonthAge(model.getBirth(), model.getCheckTime()));
                 stringMap.put("mcertNo", "1".equals(param.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMcertNo()) : model.getMcertNo());
                 stringMap.put("mphone", "1".equals(param.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMphone()) : model.getMphone());
+                stringMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth()));
                 add(stringMap);
             }
         }};
-- 
1.8.3.1