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 22f646b..6fdc127 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 @@ -228,7 +228,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } - if(trackType == TrackDownDateEnums.B.getId()) { + if(trackType == TrackDownDateEnums.A.getId()) { Criteria c = new Criteria(); if(StringUtils.isNotEmpty(provinceId)) { c.and("provinceId").is(provinceId); @@ -262,7 +262,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("residentsArchiveId").is(residentsArchiveModel.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); temp.put("age", DateUtil.getAge(residentsArchiveModel.getBirthday())); // 婚检追访结果 - temp.put("end", trackDown == null ? "--" : TrackDownTransferEnums.getName(trackDown.getTrackDownType())); + temp.put("result", trackDown == null ? "--" : TrackDownTransferEnums.getName(trackDown.getTrackDownType())); // 婚检追访时间 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 预约时间 @@ -282,11 +282,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("id", patient.getId()); 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("end", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约时间 } else { - temp.put("end", "--"); // 婚检追访结果 + temp.put("result", "--"); // 婚检追访结果 temp.put("trackDownTime", "--"); // 追访时间 temp.put("yyTime", "--"); // 预约时间 }