From f6bb02c6e7c749192c73fe8841fc62a638e7481a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 5 Sep 2016 10:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
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 ++++++++
 .../java/com/lyms/platform/operate/web/result/QuanChanResult.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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 5c23662..cd48ec9 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
@@ -54,6 +54,14 @@ public class DateUtil {
         Long age = m / 31536000000L;
         return age.intValue();
     }
+    public static Integer getAge(Date birth,Date fmDate) {
+        if (birth == null) {
+            return null;
+        }
+        long m = fmDate.getTime() - birth.getTime();
+        Long age = m / 31536000000L;
+        return age.intValue();
+    }
 
     public static Integer getWeek(Date date) {
         if (date == null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index d4e3c4c..eaa9dcd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -156,7 +156,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     @Override
     public QuanChanResult convertToResult(Patients destModel) {
         setId(destModel.getId());
-        setAge(destModel.getAge());
+        setAge(DateUtil.getAge(destModel.getBirth(),destModel.getFmDate()));
         setName(destModel.getUsername());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
 
-- 
1.8.3.1