jiangjiazhi / regional-platform

Authored by litao@lymsh.com almost 8 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 3 additions and 5 deletions

...	...	@@ -177,10 +177,8 @@
177	177	Criteria c = new Criteria();
178	178	c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);
179	179	List<BabyModel> babyModels = mongoUtil.findField(BabyModel.class, c, "id");
180		-// if(CollectionUtils.isNotEmpty(babyModels)) {
181		- List<String> babyIds = CollectionUtils.getId(babyModels, "id", String.class);
182		- criteria.and("babyId").in(babyIds);
183		-// }
	180	+ List<String> babyIds = CollectionUtils.getId(babyModels, "id", String.class);
	181	+ criteria.and("babyId").in(babyIds);
184	182	}
185	183	PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit);
186	184	List<NewbornVisit> newbornVisits = (List<NewbornVisit>) pageResult.getGrid();
...	...	@@ -197,7 +195,7 @@
197	195	if(person != null) {
198	196	temp.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(person.getCardNo()));
199	197	temp.put("name", person.getName());
200		- temp.put("age", DateUtil.getAge(person.getBirth()));
	198	+ temp.put("age", DateUtil.getBabyMonthAge(person.getBirth(), visit.getCheckTime()));
201	199	temp.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(person.getPhone()));
202	200	}
203	201	}