diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 25dbe3c..0783aa3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -280,6 +280,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("residenceAddress", mongoUtil.findAddressName(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId())); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(patient.getPhone())); temp.put("id", patient.getId()); + temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate())); TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(patient.getId())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); if(trackDown != null) { temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 @@ -290,6 +291,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("trackDownTime", "--"); // 追访时间 temp.put("yyTime", "--"); // 预约时间 } + if(trackType == TrackDownDateEnums.G.getId()) {// 产后复查 + /** 复查次数 */ + temp.put("fcNum", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); + temp.put("fmDate", DateUtil.getyyyy_MM_dd(patient.getFmDate())); + /** 初次复查日期 */ + TrackDown t = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(patient.getId()).and("trackDownDateType").is(7)).with(new Sort(Sort.Direction.ASC, "created")), TrackDown.class); + temp.put("ccfcDate", t == null ? "--" : DateUtil.getyyyy_MM_dd(t.getCreated())); + } restList.add(temp); } Criteria trackDowncCriteria = new Criteria();