From f3b568ef22eb8ed266e00b388d3e32a6fd116d55 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 31 Jul 2018 17:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5=E6=9C=88?=
 =?UTF-8?q?=E9=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyCheckFacade.java        | 28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 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 1a9b8bd..494722d 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
@@ -1685,6 +1685,8 @@ public class BabyCheckFacade {
 //        //查询儿童的基本信息
 //        List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
 
+        String res = "";
+
         List<AwModel> list = null;
         if (dueDate != null)
         {
@@ -1693,6 +1695,28 @@ public class BabyCheckFacade {
             {
                 //查询该月龄的年龄别体重值
                 list = babyCheckService.queryBabyHealthConfigWeek(week, sex, 4);
+
+
+                if (CollectionUtils.isNotEmpty(list)) {
+                    AwModel model = list.get(0);
+
+                    if (model.getPthreeDs() <= value) {
+                        res = "上";
+                    } else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) {
+                        res = "中上";
+                    } else if (model.getPtwoDs() > value && value >= model.getPoneDs()) {
+                        res = "中+";
+                    } else if (model.getPoneDs() > value && value > model.getRoneDs()) {
+                        res = "中";
+                    } else if (model.getRoneDs() >= value && value > model.getRtwoDs()) {
+                        res = "中-";
+                    } else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) {
+                        res = "中下";
+                    } else if (model.getRtwoDs() >= value) {
+                        res = "下";
+                    }
+                }
+                return res;
             }
             else
             {
@@ -1705,7 +1729,6 @@ public class BabyCheckFacade {
                 //查询该月龄的年龄别体重值
                 list = babyCheckService.queryBabyHealthConfig(monthAge, sex, 0);
             }
-
         }
         else
         {
@@ -1715,11 +1738,8 @@ public class BabyCheckFacade {
            list = babyCheckService.queryBabyHealthConfig(monthAge, sex, 0);
         }
 
-
-        String res = "";
         if (CollectionUtils.isNotEmpty(list)) {
             AwModel model = list.get(0);
-
             if (model.getPthreeDs() < value) {
                 res = "上";
             } else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) {
-- 
1.8.3.1