diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index ebf7a79..d9c652b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -177,10 +177,8 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit Criteria c = new Criteria(); c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); List babyModels = mongoUtil.findField(BabyModel.class, c, "id"); -// if(CollectionUtils.isNotEmpty(babyModels)) { - List babyIds = CollectionUtils.getId(babyModels, "id", String.class); - criteria.and("babyId").in(babyIds); -// } + List babyIds = CollectionUtils.getId(babyModels, "id", String.class); + criteria.and("babyId").in(babyIds); } PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); List newbornVisits = (List) pageResult.getGrid(); @@ -197,7 +195,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit if(person != null) { temp.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(person.getCardNo())); temp.put("name", person.getName()); - temp.put("age", DateUtil.getAge(person.getBirth())); + temp.put("age", DateUtil.getBabyMonthAge(person.getBirth(), visit.getCheckTime())); temp.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(person.getPhone())); } }