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 e50c495..ad3e429 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 @@ -1024,12 +1024,20 @@ public class BabyHealthFacade extends BaseServiceImpl { } BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();//耳筛 - query.setScreenDate(DateUtil.addMonth(birthDate,1)); + query.setScreenDate(DateUtil.addMonth(birthDate,checkMonthAge)); List babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query); if(babyPatientExtendEarScreens.size()>0){ rs.putAll(new BeanMap(babyPatientExtendEarScreens.get(0))); } +// 新生儿访视模型 + + + 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); + + rs.put("birth",DateUtil.getyyyy_MM_dd(birthDate)); + rs.putAll(new BeanMap(babyVisitModel)); + List lst=new ArrayList<>(); lst.add(rs); return RespBuilder.buildSuccess(lst);