jiangjiazhi / regional-platform

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 14 additions and 4 deletions

...	...	@@ -40,6 +40,8 @@
40	40	private String streetRegisterId;
41	41
42	42	private String parentId;
	43	+ //妇女建档id
	44	+ private String residentsArchiveId;
43	45	private String pid;
44	46	private Date modified;
45	47	private String hospitalId;
...	...	@@ -48,6 +50,14 @@
48	50	private Integer status;
49	51	//数据所在的列表
50	52	private Integer trackType;
	53	+
	54	+ public String getResidentsArchiveId() {
	55	+ return residentsArchiveId;
	56	+ }
	57	+
	58	+ public void setResidentsArchiveId(String residentsArchiveId) {
	59	+ this.residentsArchiveId = residentsArchiveId;
	60	+ }
51	61
52	62	public String getSource() {
53	63	return source;

...	...	@@ -332,12 +332,12 @@
332	332	Map<String, Object> temp = new HashMap<>();
333	333	temp.put("id", downRecord.getId());
334	334	temp.put("pid", downRecord.getPid());
335		- temp.put("parentId", downRecord.getParentId());
	335	+ temp.put("parentId", downRecord.getResidentsArchiveId());
336	336	temp.put("username", downRecord.getUsername());
337	337	temp.put("cardNo", downRecord.getCardNo());
338	338	temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
339	339	temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
340		- 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);
	340	+ 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);
341	341	temp.put("age", DateUtil.getAge(downRecord.getBirth()));
342	342	// 婚检追访结果
343	343	temp.put("result", trackDown == null ? "--" : trackDown.getResult());

...	...	@@ -331,7 +331,7 @@
331	331	if (null == resid) {
332	332	return null;
333	333	}
334		- record.setParentId(resid.getId());
	334	+ record.setResidentsArchiveId(resid.getId());
335	335	record.setSource(model.getId());
336	336	record.setAddressRegister(resid.getAddressRegister());
337	337	record.setAreaRegisterId(resid.getAreaRegisterId());
...	...	@@ -409,7 +409,7 @@
409	409	*/
410	410	public TrackDownRecord build(ResidentsArchiveModel model) {
411	411	TrackDownRecord record = new TrackDownRecord();
412		- record.setParentId(model.getId());
	412	+ record.setResidentsArchiveId(model.getId());
413	413	record.setAddressRegister(model.getAddressRegister());
414	414	record.setAreaRegisterId(model.getAreaRegisterId());
415	415	record.setBirth(model.getBirthday());