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 f6d1732..a7725d9 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
@@ -1828,9 +1828,9 @@ public class BasicConfigServiceTest {
 //        zcet("D:\\doc\\高血压报告20180813模板.xls");
 //        zcet("D:\\doc\\1.xls",false);
 
-//        addBabyBmiHealthConfig("F:\\儿童营养报告\\婴幼儿bmi.xls");
+        addBabyBmiHealthConfig("F:\\儿童营养报告\\婴幼儿bmi.xls");
 
-        babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls");
+//        babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls");
     }
 
 }
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 015825b..5db5591 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
@@ -2174,31 +2174,44 @@ public class BabyCheckFacade {
         if (StringUtils.isNotEmpty(kaupEvaluate))
         {
             BabyConfigModel babyConfigModel = mongoTemplate.findOne(Query.query(Criteria.where("monthAge").is(month).and("status").is(kaupEvaluate).and("type").is(0)), BabyConfigModel.class);
-            if (month < 6)
+            if (month < 12)
             {
-                //喂养方式
-                data.put("wyfs",babyConfigModel.getContentOne());
+                if (month < 6)
+                {
+                    //喂养方式
+                    data.put("wyfs",babyConfigModel.getContentOne());
+                }
+                else if (month < 12)
+                {
+                    //指导意见
+                    data.put("zdyj",babyConfigModel.getContentOne());
+                    //辅食添加
+                    data.put("fstj",babyConfigModel.getContentTwo());
+                    //辅食制作
+                    data.put("fszz",babyConfigModel.getContentThree());
+                }
                 //营养需求
                 data.put("yyxq",babyConfigModel.getContentFour());
-            }
-            else if (month < 12)
-            {
-                //指导意见
-                data.put("zdyj",babyConfigModel.getContentOne());
-                //辅食添加
-                data.put("fstj",babyConfigModel.getContentTwo());
-                //辅食制作
-                data.put("fszz",babyConfigModel.getContentThree());
-
-                if (StringUtils.isNotEmpty(checkModel.getWeight()))
+                if (StringUtils.isNotEmpty(checkModel.getWeight()) && month > 5 )
                 {
-                    Double kaul = Double.parseDouble(checkModel.getWeight()) * 100;
+                    Double kaul = null;
+                    //规则：6月龄：体重*120kcal/kg     7-11月龄：体重*100kcal/kg
+                    kaul = month == 6 ?  Double.parseDouble(checkModel.getWeight()) * 120 :   Double.parseDouble(checkModel.getWeight()) * 100;
+                    kaul = getKaul(kaul);
+
+                    if (kaul < 800)
+                    {
+                        kaul = 800D;
+                    }
+                    else if (kaul > 2000)
+                    {
+                        kaul = 2000D;
+                    }
+
                     BabyConfigModel babyConfigModel1 = mongoTemplate.findOne(Query.query(Criteria.where("kcal").is(kaul).and("monthAge").is(month).and("type").is(1)), BabyConfigModel.class);
                     //6-11月热量
                     data.put("rl",babyConfigModel1.getContentOne());
                 }
-                //营养需求
-                data.put("yyxq",babyConfigModel.getContentFour());
             }
             else if (month < 37)
             {
@@ -2311,7 +2324,7 @@ public class BabyCheckFacade {
 
                 BabyConfigModel wyconfig = mongoTemplate.findOne(Query.query(Criteria.where("monthAge").is(month).and("status").is(kaupEvaluate).and("type").is(4)), BabyConfigModel.class);
                 //喂养指南
-                data.put("yszl",wyconfig.getContentOne());
+                data.put("wyzl",wyconfig.getContentOne());
 
                 //每日所需营养素
                 data.put("yys",getYys(month));