diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 658d081..9b2204b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -234,6 +234,17 @@ public class TrackDownFacade { //产前检查次数(初诊+复诊) map.put("checkCount", getChuzhenCount(parentId) ); + //产后复查信息 + PostReviewQuery postReviewQuery = new PostReviewQuery(); + postReviewQuery.setYn(YnEnums.YES.getId()); + postReviewQuery.setParentId(parentId); + List list = postReviewService.findWithList(postReviewQuery); + if (CollectionUtils.isNotEmpty(list)) { + PostReviewModel firstPost = list.get(0); + /** 初次复查日期 */ + map.put("ccfcDate", firstPost.getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(firstPost.getCheckTime())); + } + //复诊 AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class); @@ -253,6 +264,20 @@ public class TrackDownFacade { } } + Criteria criteria = Criteria.where("yn").is(1).and("parentId").is(parentId); + if (TrackDownDateEnums.C.getId() == trackType) { + criteria.and("trackDownDateType").in(3, 9); + } else if (TrackDownDateEnums.D.getId() == trackType) { + criteria.and("trackDownDateType").in(4, 8); + } else { + criteria.and("trackDownDateType").in(trackType); + } + + TrackDown trackDown = mongoTemplate.findOne(Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")),TrackDown.class); + if (trackDown != null) { + map.put("nextSieveTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约预约时间 + } + //如果是产筛追访列表,查询产筛预约时间 if (trackType == TrackDownDateEnums.D.getId() || trackType == TrackDownDateEnums.H.getId()) {//产前筛查 try { @@ -346,9 +371,7 @@ public class TrackDownFacade { //预约复查时间默认用追访时间 temp.put("yyfcDate", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); - PostReviewQuery postReviewQuery = new PostReviewQuery(); - postReviewQuery.setYn(YnEnums.YES.getId()); - postReviewQuery.setParentId(downRecord.getParentId()); + Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); //分娩时间 @@ -375,7 +398,9 @@ public class TrackDownFacade { //预约复查日期 temp.put("yyfcDate ", "--"); - + PostReviewQuery postReviewQuery = new PostReviewQuery(); + postReviewQuery.setYn(YnEnums.YES.getId()); + postReviewQuery.setParentId(downRecord.getParentId()); List list = postReviewService.findWithList(postReviewQuery); /** 复查次数 */ temp.put("fcNum", list.size());