From 4884fdb3aba9cb80408a580ec44e9015cd7b3d24 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Sun, 2 Jun 2019 21:23:28 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/biz/BasicConfigServiceTest.java  |  8 ++++----
 .../platform/operate/web/facade/BabyNutritionFacade.java    |  9 +++++++--
 .../lyms/platform/operate/web/facade/BasicConfigFacade.java | 13 ++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
index 71cd1da..393f72f 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
@@ -4347,7 +4347,7 @@ public class BasicConfigServiceTest {
             }
 
 
-            Sheet s4 = wb.getSheet(4);
+            /*Sheet s4 = wb.getSheet(4);
             System.out.println(s4.getName() + " : ");
             int rows4 = s4.getRows();
             if (rows4 > 0) {
@@ -4388,9 +4388,9 @@ public class BasicConfigServiceTest {
                     }
                     mongoTemplate.save(babyDiet);
                 }
-            }
+            }*/
 
-            Sheet s5 = wb.getSheet(5);
+            Sheet s5 = wb.getSheet(4);
             System.out.println(s5.getName() + " : ");
             int rows5 = s5.getRows();
             if (rows5 > 0) {
@@ -4422,7 +4422,7 @@ public class BasicConfigServiceTest {
                 }
             }
 
-            Sheet s6 = wb.getSheet(6);
+            Sheet s6 = wb.getSheet(5);
             System.out.println(s6.getName() + " : ");
             int rows6 = s6.getRows();
             if (rows6 > 0) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
index 5ccc343..f41f110 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
@@ -1377,9 +1377,14 @@ public class BabyNutritionFacade {
                             }
                         }
                     } else {
-                        if (CollectionUtils.isNotEmpty(babyDiet.getFeedingGuide())) {
-                            data.put("feedingGuide", babyDiet.getFeedingGuide());
+                        if (null != babyDiet.getShape()) {
+                            if (CollectionUtils.isNotEmpty(babyDiet.getFeedingGuide()) && kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) {
+                                data.put("feedingGuide", babyDiet.getFeedingGuide());
+                            } else if (CollectionUtils.isNotEmpty(babyDiet.getFeedingGuide()) && kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) {
+                                data.put("feedingGuide", babyDiet.getFeedingGuide());
+                            }
                         }
+
                     }
                     if (null != babyDiet.getKcal() && null != babyDiet.getWeightType()) {
                         if (babyDiet.getWeightType() == 1 && babyDiet.getKcal() == kaul) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
index 64e93eb..ea9a326 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
@@ -293,13 +293,16 @@ public class BasicConfigFacade {
             BasicConfig basicConfig = ba.convertToDataModel();
             if (null != basicConfig) {
                 basicConfig.setCreateDate(System.currentTimeMillis());
-                if (StringUtils.isEmpty(basicConfig.getTypeId())) {
+                if(StringUtils.isEmpty(basicConfig.getTypeId())){
                     BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
-                    if (basicConfig1 != null) {
-                        //高危儿因素配置暂时这么开发
-                        if ("高危儿因素".equals(basicConfig1.getName()) || "体弱儿因素".equals(basicConfig1.getName())) {
+                    if(basicConfig1!=null){
+                        //高危儿配置
+                        if ("高危儿因素".equals(basicConfig1.getName()) || "体弱儿因素".equals(basicConfig1.getName()))
+                        {
                             basicConfig.setTypeId("5b18f8a7422b03d4ad2bf913");
-                        } else {
+                        }
+                        else
+                        {
                             basicConfig.setTypeId(basicConfig1.getTypeId());
                         }
                         basicConfig.setpId(basicConfig.getParentId());
-- 
1.8.3.1