From 3d793bcd7e91f4cc0d8be532ee5a374ba7bc6677 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 11 Aug 2016 16:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9C=88=E9=BE=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/utils/DateUtil.java   | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 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 dcfc8dc..85310c7 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,22 +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.YEAR,-1);
+        Calendar rightNow1 = Calendar.getInstance();
+        rightNow1.setTime(checkDate);
+        rightNow1.add(Calendar.YEAR,-1);
 
 
-        if (birth.getTime() > rightNow.getTime().getTime())
+        if (birth.getTime() > rightNow1.getTime().getTime())
         {
-            int month = getMonthSpace(birth,checkDate);
 
+            int year = getYearSpace(birth, checkDate);
 
+            int month = getMonthSpace(birth,checkDate);
             Calendar yearNow = Calendar.getInstance();
             yearNow.setTime(birth);
             yearNow.add(Calendar.MONTH,month);
@@ -484,8 +479,12 @@ public class DateUtil {
         c2.setTime(date2);
 
         result = c2.get(Calendar.MONDAY) - c1.get(Calendar.MONTH);
+        if (result < 0)
+        {
+            result = 12 - Math.abs(result);
+        }
 
-        result = 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;
@@ -616,7 +615,7 @@ public class DateUtil {
         System.out.println(new DateTime().minusDays(77));*/
 //        System.out.println(getDaySeconds());
 
-//          String s =   getBabyMonthAge(parseYMD("2015-06-07"), new Date());
+//          String s =   getBabyMonthAge(parseYMD("2015-08-12"), new Date());
 //        System.out.println(s);
 //            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd ");
 //          System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date()));
@@ -651,6 +650,9 @@ public class DateUtil {
 //            SimpleDateFormat md = new SimpleDateFormat("M-d");
 //            String  st = md.format(new Date());
 //            System.out.print(st);
+
+            String s =   getBabyMonthAge(parseYMD("2014-07-9"), new Date());
+            System.out.println(s);
         } catch (Exception e)
         {
 
-- 
1.8.3.1