From 89dfd406c8508bc90f0d93b4af54d686333cc115 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 21 Sep 2017 10:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/utils/DateUtil.java    | 21 ++++++++++++++++++++-
 .../web/service/impl/PatientWeightServiceImpl.java  |  7 ++++---
 2 files changed, 24 insertions(+), 4 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 3e8b317..dd0e6ac 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
@@ -1071,6 +1071,19 @@ public class DateUtil {
     }
 
     /**
+     * 把传入的时间  格式化为 只有年月日的时间
+     * @param date
+     * @return
+     */
+    public static void formatYmd(Date date){
+        try {
+            date.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(y_m_d.format(date)).getTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
      * 获取当前时间加上多少周的时间
      * @param week
      * @return
@@ -1159,13 +1172,19 @@ public class DateUtil {
 
     /**
      * 获取几年之前的日期
+     * 主要用于年龄查询
+     *   Date start = DateUtil.getBeforeAge(age);
+        Date end = DateUtil.getBeforeAge(age + 1);
+         pCriteria.and("birth").gte(end).lt(start);
      * @param age
      * @return
      */
     public static Date getBeforeAge(Integer age) {
         Calendar c = Calendar.getInstance();
         c.add(Calendar.YEAR, -age);
-        return c.getTime();
+        Date time = c.getTime();
+        formatYmd(time);
+        return time;
     }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
index 8ba36de..c50373c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
@@ -125,9 +125,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
             pCriteria.and("lastMenses").gt(start).lte(end);
         }
         if(age != null) {
-            Date start = DateUtil.getBeforeAge(1);
-            Date end = DateUtil.getBeforeAge(2);
-            pCriteria.and("birth").lte(start).gt(end);
+            Date start = DateUtil.getBeforeAge(age);
+            Date end = DateUtil.getBeforeAge(age + 1);
+            pCriteria.and("birth").gte(end).lt(start);
         }
         List<Patients> patients = mongoTemplate.find(Query.query(pCriteria), Patients.class);
         List<String> ids = new ArrayList<>();
@@ -287,6 +287,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
 
         if(StringUtils.isEmpty(patientWeight.getId()) && patients != null) {
             patientWeight.setCreated(new Date());
+            patientWeight.setHospitalId(patients.getHospitalId());
             if(StringUtils.isNotBlank(patientWeight.getPatientId())) {
                 weights.put(DateUtil.getWeek(patients.getLastMenses(), new Date()), nowWeight);
                 patientWeight.setWeights(weights);
-- 
1.8.3.1