jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 33 additions and 2 deletions

...	...	@@ -120,8 +120,9 @@
120	120	private AreaCountFacade areaCountFacade;
121	121	@Autowired
122	122	private MeasureDataInfoService measureDataInfoService;
123		-
124	123	@Autowired
	124	+ private BabyNutritionService babyNutritionService;
	125	+ @Autowired
125	126	private BabyAfterVisitService babyAfterVisitService;
126	127
127	128	@Autowired
...	...	@@ -1420,6 +1421,20 @@
1420	1421	if (null != measureBabyInfoModel) {
1421	1422	base.setBabyHeight(measureBabyInfoModel.getValueTwo());
1422	1423	base.setBabyWeight(measureBabyInfoModel.getValueOne());
	1424	+ }
	1425	+ else
	1426	+ {
	1427	+ BabyNutritionQuery babyQuery1 = new BabyNutritionQuery();
	1428	+ babyQuery1.setBabyId(model.getId());
	1429	+ Date date = DateUtil.getYmdDate(new Date());
	1430	+ babyQuery1.setNutritiTimeStart(date);
	1431	+ babyQuery1.setNutritiTimeEnd(new Date(date.getTime() + 24 * 60 * 60 * 1000 - 1));
	1432	+ List<BabyNutritionModel> nutritionModels = babyNutritionService.queryBabyNutritions(babyQuery1);
	1433	+ if (CollectionUtils.isNotEmpty(nutritionModels))
	1434	+ {
	1435	+ base.setBabyHeight(String.valueOf(nutritionModels.get(0).getWeight()));
	1436	+ base.setBabyWeight(String.valueOf(nutritionModels.get(0).getHeight()));
	1437	+ }
1423	1438	}
1424	1439	}
1425	1440

...	...	@@ -136,6 +136,22 @@
136	136	map.put("hegiht", model.getValueTwo());
137	137	map.put("lastTime", DateUtil.getyyyy_MM_dd(model.getModified()));
138	138	}
	139	+ else
	140	+ {
	141	+ BabyCheckModelQuery babyCheckQuery = new BabyCheckModelQuery();
	142	+ babyCheckQuery.setYn(YnEnums.YES.getId());
	143	+ Date date = DateUtil.getYmdDate(new Date());
	144	+ babyCheckQuery.setCheckDateStart(date);
	145	+ babyCheckQuery.setCheckDateEnd(new Date(date.getTime() + 24 * 60 * 60 * 1000 - 1));
	146	+ List<BabyCheckModel> babyChecks = babyCheckService.queryBabyCheckRecord(babyCheckQuery);
	147	+ if (CollectionUtils.isNotEmpty(babyChecks))
	148	+ {
	149	+ map.put("weight", babyChecks.get(0).getWeight());
	150	+ map.put("hegiht", babyChecks.get(0).getHeight());
	151	+ map.put("lastTime", DateUtil.getyyyy_MM_dd(babyChecks.get(0).getCheckDate()));
	152	+ }
	153	+
	154	+ }
139	155	return map;
140	156	}
141	157
...	...	@@ -2029,7 +2045,7 @@
2029	2045
2030	2046	int items = 0;
2031	2047	switch (month) {
2032		- case 6: items = 8;break;
	2048	+ case 6: items = 7;break;
2033	2049	case 7: items = 15;break;
2034	2050	case 8: items = 20;break;
2035	2051	case 9: items = 20;break;