From a479f9969e43d1ea618cae36b132a56158f645ad Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sun, 7 Aug 2016 15:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/utils/DateUtil.java   | 24 ++++++++++++++++------
 .../com/lyms/platform/query/BabyModelQuery.java    | 15 +++++++++-----
 2 files changed, 28 insertions(+), 11 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 c0666ff..4e154c8 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
@@ -406,11 +406,17 @@ public class DateUtil {
             int day = daysBetween(birth,checkDate);
             return day+"天";
         }
+//        rightNow = Calendar.getInstance();
+//        rightNow.setTime(checkDate);
+//        rightNow.add(Calendar.MONTH,1);
+//        rightNow.add(Calendar.YEAR,-1);
+
         rightNow = Calendar.getInstance();
         rightNow.setTime(checkDate);
-        rightNow.add(Calendar.MONTH,1);
+//        rightNow.add(Calendar.MONTH,1);
         rightNow.add(Calendar.YEAR,-1);
 
+
         if (birth.getTime() > rightNow.getTime().getTime())
         {
             int month = getMonthSpace(birth,checkDate);
@@ -468,6 +474,7 @@ public class DateUtil {
 
 
     public static int getMonthSpace(Date date1, Date date2) {
+
         int result = 0;
 
         Calendar c1 = Calendar.getInstance();
@@ -478,7 +485,13 @@ public class DateUtil {
 
         result = c2.get(Calendar.MONDAY) - c1.get(Calendar.MONTH);
 
-        return result == 0 ? 1 : Math.abs(result);
+        result = result == 0 ? 1 : Math.abs(result);
+        if (Integer.parseInt(getDD(date1)) > Integer.parseInt(getDD(date2)))
+        {
+            result = result -1;
+        }
+
+        return result;
 
     }
 
@@ -593,7 +606,7 @@ public class DateUtil {
         System.out.println(new DateTime().minusDays(77));*/
 //        System.out.println(getDaySeconds());
 
-          String s =   getBabyMonthAge(parseYMD("2016-08-01"), new Date());
+          String s =   getBabyMonthAge(parseYMD("2015-06-07"), new Date());
         System.out.println(s);
 //            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd ");
 //          System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date()));
@@ -614,8 +627,8 @@ public class DateUtil {
 //            System.out.println(y_m_d_h_m_s.format(startDate));
 //            System.out.println(y_m_d_h_m_s.format(endtDate));
 
-            Date d  = parseD("7");
-            System.out.print(getDD(d));
+//            Date d  = parseD("7");
+//            System.out.print(getDD(d));
 
 //            Date sendDate = dd.parse("02");
 //            String md = DateUtil.getMMdd(new Date());
@@ -624,7 +637,6 @@ public class DateUtil {
 //
 //            Date actualSendDate = DateUtil.addDay(d, -2);
 //            String sendDateStr = DateUtil.getDD(actualSendDate);
-//            System.out.println(sendDateStr);
         } catch (Exception e)
         {
 
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 755ba2e..137192d 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
@@ -345,9 +345,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         }
 
         if (null != orServiceStatus && orServiceStatus.length > 1) {
-            MongoCondition con1 = MongoCondition.newInstance("serviceStatus", orServiceStatus[0], MongoOper.IS);
-            MongoCondition con = MongoCondition.newInstance("serviceStatus", orServiceStatus[1], MongoOper.IS);
-            condition = condition.orCondition(new MongoCondition[]{con1, con});
+            Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0],orServiceStatus[1]);
+            condition.andCondition( new MongoCondition(c));
         }
 
         if (null != keyword) {
@@ -394,8 +393,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         }
 
         if (null != nextDateStart && nextDateEnd  != null) {
-            c = Criteria.where("nextDate").gte(nextDateStart);
-            c =  c.lte(nextDateEnd);
+            if (c != null)
+            {
+                Criteria nc = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
+                c.andOperator(nc);
+            }
+            else {
+               c = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
+            }
         }
 
         if (null != birthEnd) {
-- 
1.8.3.1