From df0ccbd05f86716cda8e6c22974c2101d6da8702 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 14 May 2018 16:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=BA=AB=E9=AB=98=E6=9B=B2?=
 =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E8=BF=98=E5=8E=9F=E5=88=B0=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyCheckFacade.java        | 41 +++++++---------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index b2fd5bb..56ab4e9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -1678,22 +1678,19 @@ public class BabyCheckFacade {
 
         Map<String,Object> map = new HashMap<>();
 
-        List<Integer> weightTitles = new LinkedList<>();
+        List<String> weightTitles = new LinkedList<>();
         List<String> weightValues = new LinkedList<>();
 
-        List<Integer> heightTitles = new LinkedList<>();
+        List<String> heightTitles = new LinkedList<>();
         List<String> heightValues = new LinkedList<>();
 
-        List<Map<String,Object>> tables = new LinkedList<>();
-
-        BabyModel babyModel = babyService.getOneBabyById(babyId);
+        List<Map<String,String>> tables = new LinkedList<>();
 
         BabyCheckModelQuery query = new BabyCheckModelQuery();
         query.setYn(YnEnums.YES.getId());
         query.setBuildId(babyId);
         //查询儿童的检查记录
         List<BabyCheckModel>  checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.ASC);
-
         if (CollectionUtils.isNotEmpty(checkModels))
         {
             for (BabyCheckModel checkModel : checkModels)
@@ -1702,21 +1699,15 @@ public class BabyCheckFacade {
                 {
                     if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight()) || org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight()))
                     {
-                        int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),checkModel.getCheckDate());
-                        Map<String,Object> heightMap = new HashMap<>();
-                        heightMap.put("time",month);
+                        Map<String,String> heightMap = new HashMap<>();
                         if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight()))
                         {
                             if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getHeight()).matches())
                             {
-                                if(heightTitles.contains(month)){
-                                    int index = heightTitles.indexOf(month);
-                                    heightValues.set(index,checkModel.getHeight());
-                                }else {
-                                    heightTitles.add(month);
-                                    heightValues.add(checkModel.getHeight());
-                                }
+                                heightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
+                                heightValues.add(checkModel.getHeight());
                             }
+                            heightMap.put("time",DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
                             heightMap.put("height", checkModel.getHeight());
                         }
                         else
@@ -1728,21 +1719,17 @@ public class BabyCheckFacade {
                         {
                             if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(checkModel.getWeight()).matches())
                             {
-
-                                if(weightTitles.contains(month)){//如果存在月的数据则更新对应索引的值
-                                    int index = weightTitles.indexOf(month);
-                                    weightValues.set(index,checkModel.getWeight());
-                                }else {
-                                    weightTitles.add(month);
-                                    weightValues.add(checkModel.getWeight());
-                                }
+                                weightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
+                                weightValues.add(checkModel.getWeight());
                             }
+                            heightMap.put("time", DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
                             heightMap.put("weight",checkModel.getWeight());
                         }
                         else
                         {
                             heightMap.put("weight", "--");
                         }
+
                         tables.add(heightMap);
                     }
                 }
@@ -1755,9 +1742,7 @@ public class BabyCheckFacade {
         map.put("heightValues",heightValues);
 
         map.put("tables",tables);
-        if(babyModel!=null){
-            map.put("sex",babyModel.getSex());
-        }
+
         return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
-}
+}
\ No newline at end of file
-- 
1.8.3.1