jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 14 additions and 11 deletions

...	...	@@ -6,18 +6,18 @@
6	6	* 检查月龄
7	7	*/
8	8	public enum CheckMonthEnums {
9		- ONE(1, "0月龄"),
10		- TWO(2, "30-42天"),
	9	+ ONE(0, "0月龄"),
	10	+ TWO(1, "30-42天"),
11	11	THREE(3, "3个月"),
12		- FOUR(4, "6个月"),
13		- FIVE(5, "9个月"),
14		- SIX(6, "1岁"),
15		- SEVEN(7, "1岁半"),
16		- EIGHT(8, "2岁"),
17		- NIGHT(9, "3岁"),
18		- TEN(10, "4岁"),
19		- ELEVEN(11, "5岁"),
20		- TWELVE(12, "6岁");
	12	+ FOUR(6, "6个月"),
	13	+ FIVE(9, "9个月"),
	14	+ SIX(12, "1岁"),
	15	+ SEVEN(18, "1岁半"),
	16	+ EIGHT(24, "2岁"),
	17	+ NIGHT(36, "3岁"),
	18	+ TEN(48, "4岁"),
	19	+ ELEVEN(60, "5岁"),
	20	+ TWELVE(72, "6岁");
21	21
22	22	private Integer id;
23	23	private String name;

...	...	@@ -151,6 +151,9 @@
151	151	BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class);
152	152	Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
153	153	map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
	154	+ if(StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) {
	155	+ map.put("checkMonthId", babyEyeCheck.getCheckMonthId() + "");
	156	+ }
154	157	map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime()));
155	158	if(babyEyeCheck.getRiskFactorId() != null) {
156	159	List<String> riskFactorId = babyEyeCheck.getRiskFactorId();