Commit 03f5fc721cc32a4dc52dc629237928b8759dba36
1 parent
439a0ceadb
Exists in
master
and in
6 other branches
0-6岁儿童视觉健康档案--添加儿童基本信息
Showing 1 changed file with 6 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
View file @
03f5fc7
... | ... | @@ -1003,15 +1003,21 @@ |
1003 | 1003 | List<BabyCheckModel> babyCheckModelList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class); |
1004 | 1004 | List<BabyEyeCheck> babyEyeCheckList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class); |
1005 | 1005 | |
1006 | + BabyModel babyModel=mongoTemplate.findOne(new Query( Criteria.where("_id").in(id)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); | |
1006 | 1007 | |
1007 | 1008 | Map<String,Object> rs=new HashMap<>(); |
1008 | 1009 | Date birthDate=new Date(); |
1009 | 1010 | |
1011 | + rs.putAll(new BeanMap(babyModel)); | |
1010 | 1012 | if(babyCheckModelList.size()>0){ |
1011 | 1013 | BabyCheckModel checkModel=babyCheckModelList.get(0); |
1012 | 1014 | checkModel.getBirth(); |
1013 | 1015 | |
1014 | 1016 | rs.putAll(new BeanMap(checkModel)); |
1017 | + rs.put("checkDate",DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); | |
1018 | + if("1".equals(checkModel.getFaceColor())){ | |
1019 | + rs.put("faceColor","红润"); | |
1020 | + } | |
1015 | 1021 | } |
1016 | 1022 | |
1017 | 1023 | if(babyEyeCheckList.size()>0){//眼检查 |