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 a7b70df..30570e7 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 @@ -2110,6 +2110,10 @@ public class BasicConfigServiceTest { //遍历每行 for(int i = 1 ;i < rows6 ; i++){ System.out.println("rows="+i); + if (i == 43) + { + System.out.println("rows="+i); + } BabyNutritionConfigModel model = new BabyNutritionConfigModel(); // 0 0-11月龄喂养 1 0-11月每月营养素需求 2 12-36各月龄饮食指南 3 12-36月龄热量计算 4 12-36喂养指南 5 0-36营养元素参考摄入量 6 6-11辅食添加 model.setType(6); @@ -2118,6 +2122,7 @@ public class BasicConfigServiceTest { //遍历每行中的每列 for (int j = 0 ; j < cells.length ; j ++) { + String str = cells[j].getContents().trim(); switch (j) { @@ -2209,7 +2214,7 @@ public class BasicConfigServiceTest { // babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls"); - babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2.xls"); + babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2019-2-15.xls"); } } 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 94187f4..0aa1a41 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 @@ -321,7 +321,7 @@ public class BabyNutritionFacade { int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime()); - if (month == 0 || month > 36) + if (month > 36) { return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); } @@ -901,7 +901,7 @@ public class BabyNutritionFacade { { kcal+=50; } - return kcal; + return kcal > 1000 ? 1000 : (kcal < 400 ? 400 : kcal); }