From 87b0e61ab10166d8c7e1bf29c14dadb8044863db Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Wed, 31 Jul 2019 17:21:21 +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

---
 .../operate/web/service/impl/BabyAfterVisitServiceImpl.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
index cfcd59d..03c7783 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
@@ -336,6 +336,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
                 calendar.setTime(new Date());
                 calendar.add(Calendar.MONTH, -startMonthsAge);
                 start = calendar.getTime();
+                start = DateUtil.getDayLastSecond(start);
             }
 
             //  当月第一天
@@ -345,6 +346,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
             }
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
             Date end = calendar.getTime();
+            end = DateUtil.getDayFirstSecond(end);
             query.addCriteria(Criteria.where("birth").gte(end).lte(start));
         }
 
@@ -916,14 +918,18 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
         model.setCreateTime(new Date());
         model.setAfterVisitTime(new Date(afterVisitTime.getTime()));
         if (appointmentTime != null) {
-            model.setAppointmentTime(new Date(appointmentTime.getTime()));
+            if (!"1".equals(type)) {
+                model.setAppointmentTime(new Date(appointmentTime.getTime()));
+            }
         }
         model.setYn(1);
         mongoTemplate.insert(model);
         BabyAfterVisitInfoModel visitInfoModel = mongoTemplate.findOne(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is(type)), BabyAfterVisitInfoModel.class);
         visitInfoModel.setAfterVisitResult(afterVisitResult);
         if (Objects.equals(isAppointment, "1")) {
-            visitInfoModel.setAppointmentTime(appointmentTime);
+            if (!"1".equals(type)) {
+                visitInfoModel.setAppointmentTime(appointmentTime);
+            }
         }
         visitInfoModel.setAfterVisitTime(afterVisitTime);
         visitInfoModel.setAfterVisitUser(afterVisitUser);
@@ -945,8 +951,6 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
         if (afterVisitWorkflow.equals(TrackDownTransferEnums.B.getId().toString())) {
             mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is(type)), Update.update("afterVisitWorkflow", "2").set("yn", 2), BabyAfterVisitInfoModel.class);
         }
-
-
         return new BaseResponse();
     }
 
-- 
1.8.3.1