jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 32df3be98f95e31af827de37ce67caeb7868733f

Authored by liquanyu
1 parent cb609f7e42
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 18 additions and 15 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 32df3be
... ... @@ -1606,9 +1606,11 @@
1606 1606 // String end = getyyyy_MM_dd(endDate);
1607 1607 //
1608 1608 // System.out.println(start+"=="+end);
  1609 + Date baby = parseDate("2018-09-26");
1609 1610  
1610   - Date baby = parseDate("2019-07-20");
1611   - System.out.println(baby.getTime());
  1611 + Date d = DateUtil.addDay(baby, 294);
  1612 +
  1613 + System.out.println(getyyyy_MM_dd(d));
1612 1614 }
1613 1615  
1614 1616 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 32df3be
... ... @@ -1464,12 +1464,12 @@
1464 1464  
1465 1465 map.put("kaul", String.format("%.2f", 44 * model.getWeight() / 0.6) + "kacl");
1466 1466  
1467   - int shape = kaupEvaluate.equals("超重") ? 2 : (kaupEvaluate.equals("消瘦") ? 1 : 0);
  1467 + int shape = kaupEvaluate.equals("超重") ? 2 : (kaupEvaluate.equals("消瘦") ? 0 : 1);
1468 1468 List<BabyDietReportModel> babyDietReportList1 = mongoTemplate.find(Query.query(Criteria.where("shape").is(shape).and("type").is(1)), BabyDietReportModel.class);
1469 1469  
1470 1470 for (BabyDietReportModel babyDietReportModel : babyDietReportList1)
1471 1471 {
1472   - if (babyDietReportModel.getStartMonthAge() <= month && month < babyDietReportModel.getEndMonthAge())
  1472 + if (babyDietReportModel.getStartMonthAge() <= month && month <= babyDietReportModel.getEndMonthAge())
1473 1473 {
1474 1474 data.put("feedingGuide", babyDietReportModel.getFeedingGuide());
1475 1475 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 32df3be
... ... @@ -42,24 +42,25 @@
42 42  
43 43 static
44 44 {
45   - // urls.put("area-lc-api.healthbaby.com.cn:55581","聊城");
46   - urls.put("area-dz-api.healthbaby.com.cn:12356","德州");
47   - urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛");
48   - urls.put("area-nc-api.healthbaby.com.cn:12356","南充");
49   - urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵");
  45 +
50 46 // urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘");
51   - urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
52   -// urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封");
53   -// urls.put("area-weixian-api.healthbaby.com.cn:12356","威县");
54   - urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
55   - urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
  47 + // urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封");
  48 + // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县");
56 49 // urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院");
57 50 // urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院");
58   - urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");
59 51 // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑");
60 52 // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统");
  53 + // urls.put("area-lc-api.healthbaby.com.cn:55581","聊城");
  54 + urls.put("area-dz-api.healthbaby.com.cn:12356","德州");
  55 + urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛");
  56 + urls.put("area-nc-api.healthbaby.com.cn:12356","南充");
  57 + urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵");
61 58 urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院");
62 59 urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域");
  60 + urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");
  61 + urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
  62 + urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
  63 + urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
63 64 }
64 65  
65 66 @Autowired