Commit 1b4f666d5800625df480ced7ee8d02c2b24f94da
1 parent
8e4f75e167
Exists in
master
and in
6 other branches
0-6岁儿童视觉健康档案--出生日期格式
Showing 1 changed file with 9 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
View file @
1b4f666
| ... | ... | @@ -1024,11 +1024,19 @@ |
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();//耳筛 |
| 1027 | - query.setScreenDate(DateUtil.addMonth(birthDate,1)); | |
| 1027 | + query.setScreenDate(DateUtil.addMonth(birthDate,checkMonthAge)); | |
| 1028 | 1028 | List<BabyPatientExtendEarScreen> babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query); |
| 1029 | 1029 | if(babyPatientExtendEarScreens.size()>0){ |
| 1030 | 1030 | rs.putAll(new BeanMap(babyPatientExtendEarScreens.get(0))); |
| 1031 | 1031 | } |
| 1032 | + | |
| 1033 | +// 新生儿访视模型 | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + BabyVisitModel babyVisitModel=mongoTemplate.findOne(new Query( Criteria.where("parentid").in(id).and("created").is(DateUtil.addMonth(birthDate,checkMonthAge))).with(new Sort(Sort.Direction.DESC, "created")), BabyVisitModel.class); | |
| 1037 | + | |
| 1038 | + rs.put("birth",DateUtil.getyyyy_MM_dd(birthDate)); | |
| 1039 | + rs.putAll(new BeanMap(babyVisitModel)); | |
| 1032 | 1040 | |
| 1033 | 1041 | List<Map> lst=new ArrayList<>(); |
| 1034 | 1042 | lst.add(rs); |