diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java index 7e6b451..fcc2ac8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java @@ -40,6 +40,8 @@ public class TrackDownRecord extends BaseModel{ private String streetRegisterId; private String parentId; + //妇女建档id + private String residentsArchiveId; private String pid; private Date modified; private String hospitalId; @@ -49,6 +51,14 @@ public class TrackDownRecord extends BaseModel{ //数据所在的列表 private Integer trackType; + public String getResidentsArchiveId() { + return residentsArchiveId; + } + + public void setResidentsArchiveId(String residentsArchiveId) { + this.residentsArchiveId = residentsArchiveId; + } + public String getSource() { return source; } 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 53484c4..9549593 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 @@ -332,12 +332,12 @@ public class TrackDownFacade { Map temp = new HashMap<>(); temp.put("id", downRecord.getId()); temp.put("pid", downRecord.getPid()); - temp.put("parentId", downRecord.getParentId()); + temp.put("parentId", downRecord.getResidentsArchiveId()); temp.put("username", downRecord.getUsername()); temp.put("cardNo", downRecord.getCardNo()); temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); temp.put("age", DateUtil.getAge(downRecord.getBirth())); // 婚检追访结果 temp.put("result", trackDown == null ? "--" : trackDown.getResult()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java index 01447a5..0bec10f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java @@ -331,7 +331,7 @@ public class TrackDownJobFacade { if (null == resid) { return null; } - record.setParentId(resid.getId()); + record.setResidentsArchiveId(resid.getId()); record.setSource(model.getId()); record.setAddressRegister(resid.getAddressRegister()); record.setAreaRegisterId(resid.getAreaRegisterId()); @@ -409,7 +409,7 @@ public class TrackDownJobFacade { */ public TrackDownRecord build(ResidentsArchiveModel model) { TrackDownRecord record = new TrackDownRecord(); - record.setParentId(model.getId()); + record.setResidentsArchiveId(model.getId()); record.setAddressRegister(model.getAddressRegister()); record.setAreaRegisterId(model.getAreaRegisterId()); record.setBirth(model.getBirthday());