From b9fe0e22269d5235729c991148f239390cb53f07 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sat, 13 Jul 2019 11:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BabyAfterVisitServiceImpl.java    | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 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 d0680ee..0e05926 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
@@ -358,8 +358,8 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
         String startCheckTime = request.getStartCheckTime();
         String endCheckTime = request.getEndCheckTime();
         if (Objects.nonNull(startCheckTime) && Objects.nonNull(endCheckTime)) {
-            startCheckTime += startCheckTime + "00:00:00";
-            endCheckTime += endCheckTime + "23:59:59";
+            startCheckTime +=  " 00:00:00";
+            endCheckTime +=  " 23:59:59";
             Date startDate = DateUtil.parseYMDHMS(startCheckTime);
             Date endDate = DateUtil.parseYMDHMS(endCheckTime);
             query.addCriteria(Criteria.where("checkTime").gte(startDate).lte(endDate));
@@ -411,7 +411,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
 
             Date date = new Date();
             // 交集
-            boolean a = s2.before(e1) && e1.after(e2) && s1.before(s2) && date.after(s2) && date.before(e1);
+           /* boolean a = s2.before(e1) && e1.after(e2) && s1.before(s2) && date.after(s2) && date.before(e1);
             boolean b = s2.before(e1) && e2.before(e1) && s1.before(s2) && date.after(s2) && date.before(e2);
             boolean c = s2.before(s1) && s1.before(e2) && e2.before(e1) && date.before(e2) && date.after(s1);
             boolean d = s2.before(s1) && s1.before(e1) && e1.before(e2) && date.before(e1) && date.after(s1);
@@ -422,6 +422,17 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
                 query.addCriteria(Criteria.where("appointmentTime").gte(s1).lte(date));
             }else {
                 return new BaseResponse();
+            }*/
+            if (s1.before(s2) && s2.before(e1) && e1.before(e2)) {
+                query.addCriteria(Criteria.where("appointmentTime").gte(s2).lte(e1));
+            } else if (s1.before(s2) && s2.before(e2) && e2.before(s1)) {
+                query.addCriteria(Criteria.where("appointmentTime").gte(s2).lte(e2));
+            } else if (s2.before(s1) && s1.before(e2) && e2.before(e1)) {
+                query.addCriteria(Criteria.where("appointmentTime").gte(s1).lte(e2));
+            } else if (s2.before(s1) && s1.before(e1) && e1.before(e2)) {
+                query.addCriteria(Criteria.where("appointmentTime").gte(s1).lte(e1));
+            } else {
+                return new BaseResponse();
             }
         }
         if (appointmentTimeBoolean && !nonNull) {
@@ -442,10 +453,11 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService {
             if (beyondDay > 0) {
                 end = getEndDate(beyondDay);
                 start = getStartDate(beyondDay);
-                if (date.before(start) || date.after(end)) {
+                /*if (date.before(start) || date.after(end)) {
                     return new BaseResponse();
                 }
-                query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(date));
+                query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(date));*/
+                query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(end));
             } else {
                 //  针对逾期天数为负数
                 beyondDay = new BigInteger(beyondDay.toString()).abs().intValue();
-- 
1.8.3.1