diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 108b0f2..80828cd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1606,9 +1606,11 @@ public class DateUtil { // String end = getyyyy_MM_dd(endDate); // // System.out.println(start+"=="+end); + Date baby = parseDate("2018-09-26"); - Date baby = parseDate("2019-07-20"); - System.out.println(baby.getTime()); + Date d = DateUtil.addDay(baby, 294); + + System.out.println(getyyyy_MM_dd(d)); } } 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 a222550..5643331 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 @@ -1464,12 +1464,12 @@ public class BabyNutritionFacade { map.put("kaul", String.format("%.2f", 44 * model.getWeight() / 0.6) + "kacl"); - int shape = kaupEvaluate.equals("超重") ? 2 : (kaupEvaluate.equals("消瘦") ? 1 : 0); + int shape = kaupEvaluate.equals("超重") ? 2 : (kaupEvaluate.equals("消瘦") ? 0 : 1); List babyDietReportList1 = mongoTemplate.find(Query.query(Criteria.where("shape").is(shape).and("type").is(1)), BabyDietReportModel.class); for (BabyDietReportModel babyDietReportModel : babyDietReportList1) { - if (babyDietReportModel.getStartMonthAge() <= month && month < babyDietReportModel.getEndMonthAge()) + if (babyDietReportModel.getStartMonthAge() <= month && month <= babyDietReportModel.getEndMonthAge()) { data.put("feedingGuide", babyDietReportModel.getFeedingGuide()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 8aba11c..b8a0692 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -42,24 +42,25 @@ public class SyncDataTaskService { static { - // urls.put("area-lc-api.healthbaby.com.cn:55581","聊城"); - urls.put("area-dz-api.healthbaby.com.cn:12356","德州"); - urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛"); - urls.put("area-nc-api.healthbaby.com.cn:12356","南充"); - urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); + // urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘"); - urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); -// urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封"); -// urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); - urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); - urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼"); + // urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封"); + // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); // urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院"); // urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院"); - urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成"); // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑"); // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统"); + // urls.put("area-lc-api.healthbaby.com.cn:55581","聊城"); + urls.put("area-dz-api.healthbaby.com.cn:12356","德州"); + urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛"); + urls.put("area-nc-api.healthbaby.com.cn:12356","南充"); + urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院"); urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域"); + urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成"); + urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); + urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼"); + urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); } @Autowired