diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java index 4fa5144..59c032e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java @@ -1003,15 +1003,21 @@ public class BabyHealthFacade extends BaseServiceImpl { List babyCheckModelList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class); List babyEyeCheckList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class); + BabyModel babyModel=mongoTemplate.findOne(new Query( Criteria.where("_id").in(id)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); Map rs=new HashMap<>(); Date birthDate=new Date(); + rs.putAll(new BeanMap(babyModel)); if(babyCheckModelList.size()>0){ BabyCheckModel checkModel=babyCheckModelList.get(0); checkModel.getBirth(); rs.putAll(new BeanMap(checkModel)); + rs.put("checkDate",DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + if("1".equals(checkModel.getFaceColor())){ + rs.put("faceColor","红润"); + } } if(babyEyeCheckList.size()>0){//眼检查