shiyang / regional-platform

Commit 7dff416a1cfb05f354bd0def3b59b375ccd6a9a5

Authored by landong2015 over 8 years ago

修改建档返回

Showing 3 changed files with 14 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java

...	...	@@ -25,6 +25,7 @@
25	25	import com.lyms.platform.pojo.ResidentsArchiveModel;
26	26	import com.lyms.platform.query.PremaritalCheckupQuery;
27	27	import com.lyms.platform.query.ResidentsArchiveQuery;
	28	+import com.mongodb.util.JSON;
28	29	import net.sf.json.JSONObject;
29	30	import org.apache.commons.collections.CollectionUtils;
30	31	import org.apache.commons.lang.StringUtils;
31	32
...	...	@@ -328,13 +329,13 @@
328	329
329	330	ResidentsArchiveResult result = new ResidentsArchiveResult();
330	331
	332	+
331	333	ResidentsArchiveQuery query = new ResidentsArchiveQuery();
332	334	query.setYn(YnEnums.YES.getId());
333	335	query.setId(id);
334	336	List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
335	337	if (CollectionUtils.isNotEmpty(modelList)){
336	338	ResidentsArchiveModel model = modelList.get(0);
337		-
338	339	result = getResult(model);
339	340	}
340	341
...	...	@@ -350,7 +351,7 @@
350	351	result.setId(model.getId());
351	352	result.setUsername(model.getUsername());
352	353	result.setSex(model.getSex());
353		- result.setBrithDay(model.getBuildDay());
	354	+ result.setBirthDay(model.getBuildDay());
354	355	result.setCountryId(model.getCountryId());
355	356	result.setNationId(model.getNationId());
356	357	result.setMarriageId(model.getMarriageId());
...	...	@@ -376,11 +377,11 @@
376	377	result.setStreetRegisterId(model.getStreetRegisterId());
377	378	result.setAddressRegister(model.getAddressRegister());
378	379
379		- result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(),Map.class));
380		-// result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
381		-// result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
382		-// result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
383		-// result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
	380	+ result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(), Map.class));
	381	+ result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
	382	+ result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
	383	+ result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
	384	+ result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
384	385
385	386	result.setVcCardNo(model.getVcCardNo());
386	387	result.setBuildDoctor(model.getBuildDoctor());

...	...	@@ -121,7 +121,7 @@
121	121	model.setAddress(address);
122	122	model.setProvinceRegisterId(provinceRegisterId);
123	123	model.setCityRegisterId(cityRegisterId);
124		- model.setAddressRegister(areaRegisterId);
	124	+ model.setAreaRegisterId(areaRegisterId);
125	125	model.setStreetRegisterId(streetRegisterId);
126	126	model.setAddressRegister(addressRegister);
127	127

...	...	@@ -17,7 +17,7 @@
17	17	//性别
18	18	private String sex;
19	19	//出生日期
20		- private String brithDay;
	20	+ private String birthDay;
21	21	//国籍
22	22	private String countryId;
23	23	//民族Id
24	24
...	...	@@ -115,12 +115,12 @@
115	115	this.sex = sex;
116	116	}
117	117
118		- public String getBrithDay() {
119		- return brithDay;
	118	+ public String getBirthDay() {
	119	+ return birthDay;
120	120	}
121	121
122		- public void setBrithDay(String brithDay) {
123		- this.brithDay = brithDay;
	122	+ public void setBirthDay(String birthDay) {
	123	+ this.birthDay = birthDay;
124	124	}
125	125
126	126	public String getCountryId() {