jiangjiazhi / regional-platform

Commit 9b997d1b7880f5f8090f8b9e746810954bd27765

Authored by liquanyu about 5 years ago

Exists in master and in 6 other branches

大同档案增加字段

Showing 5 changed files with 584 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -253,7 +253,7 @@
253	253	private Date husbandBirth;
254	254	private String vcCardNo;
255	255	//丈夫文化程度Id
256		- private String hlevelTypeId;
	256	+ //private String hlevelTypeId;
257	257	//体验类型
258	258	private Integer expType;
259	259	//person表主键
...	...	@@ -332,6 +332,160 @@
332	332	*/
333	333	//空或者1为正常 2为补录
334	334	private String normal;
	335	+
	336	+
	337	+ //结婚年龄
	338	+ private Integer marriageAge;
	339	+ //文化程度
	340	+ private String levelTypeId;
	341	+ //婚姻状态 1初婚 2 再婚 3其他
	342	+ private Integer marriageStatus;
	343	+
	344	+ //是否婚检 1是 2否
	345	+ private Integer marriageCheck;
	346	+
	347	+ //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
	348	+ private Integer contraceptionType;
	349	+ private String contraceptionOther;
	350	+
	351	+ //丈夫婚姻状态 1初婚 2 再婚 3其他
	352	+ private Integer hmarriageStatus;
	353	+
	354	+ //丈夫健康状态
	355	+ private String healthStatus;
	356	+
	357	+ //吸烟 1 否 2是
	358	+ private Integer smoke;
	359	+
	360	+ //吸烟数量
	361	+ private String smokeNum;
	362	+
	363	+ //饮酒 1偶尔 2 经常 3否
	364	+ private Integer drinkWine;
	365	+
	366	+ //丈夫文化程度
	367	+ private String hlevelTypeId;
	368	+
	369	+ //既往病史
	370	+ private String pastHistory;
	371	+
	372	+ //家族遗传史
	373	+ private String familyHistory;
	374	+
	375	+ //其他
	376	+ private String other;
	377	+
	378	+ public Integer getMarriageAge() {
	379	+ return marriageAge;
	380	+ }
	381	+
	382	+ public void setMarriageAge(Integer marriageAge) {
	383	+ this.marriageAge = marriageAge;
	384	+ }
	385	+
	386	+ public String getLevelTypeId() {
	387	+ return levelTypeId;
	388	+ }
	389	+
	390	+ public void setLevelTypeId(String levelTypeId) {
	391	+ this.levelTypeId = levelTypeId;
	392	+ }
	393	+
	394	+ public Integer getMarriageStatus() {
	395	+ return marriageStatus;
	396	+ }
	397	+
	398	+ public void setMarriageStatus(Integer marriageStatus) {
	399	+ this.marriageStatus = marriageStatus;
	400	+ }
	401	+
	402	+ public Integer getMarriageCheck() {
	403	+ return marriageCheck;
	404	+ }
	405	+
	406	+ public void setMarriageCheck(Integer marriageCheck) {
	407	+ this.marriageCheck = marriageCheck;
	408	+ }
	409	+
	410	+ public Integer getContraceptionType() {
	411	+ return contraceptionType;
	412	+ }
	413	+
	414	+ public void setContraceptionType(Integer contraceptionType) {
	415	+ this.contraceptionType = contraceptionType;
	416	+ }
	417	+
	418	+ public String getContraceptionOther() {
	419	+ return contraceptionOther;
	420	+ }
	421	+
	422	+ public void setContraceptionOther(String contraceptionOther) {
	423	+ this.contraceptionOther = contraceptionOther;
	424	+ }
	425	+
	426	+ public Integer getHmarriageStatus() {
	427	+ return hmarriageStatus;
	428	+ }
	429	+
	430	+ public void setHmarriageStatus(Integer hmarriageStatus) {
	431	+ this.hmarriageStatus = hmarriageStatus;
	432	+ }
	433	+
	434	+ public String getHealthStatus() {
	435	+ return healthStatus;
	436	+ }
	437	+
	438	+ public void setHealthStatus(String healthStatus) {
	439	+ this.healthStatus = healthStatus;
	440	+ }
	441	+
	442	+ public Integer getSmoke() {
	443	+ return smoke;
	444	+ }
	445	+
	446	+ public void setSmoke(Integer smoke) {
	447	+ this.smoke = smoke;
	448	+ }
	449	+
	450	+ public String getSmokeNum() {
	451	+ return smokeNum;
	452	+ }
	453	+
	454	+ public void setSmokeNum(String smokeNum) {
	455	+ this.smokeNum = smokeNum;
	456	+ }
	457	+
	458	+ public Integer getDrinkWine() {
	459	+ return drinkWine;
	460	+ }
	461	+
	462	+ public void setDrinkWine(Integer drinkWine) {
	463	+ this.drinkWine = drinkWine;
	464	+ }
	465	+
	466	+ public String getPastHistory() {
	467	+ return pastHistory;
	468	+ }
	469	+
	470	+ public void setPastHistory(String pastHistory) {
	471	+ this.pastHistory = pastHistory;
	472	+ }
	473	+
	474	+ public String getFamilyHistory() {
	475	+ return familyHistory;
	476	+ }
	477	+
	478	+ public void setFamilyHistory(String familyHistory) {
	479	+ this.familyHistory = familyHistory;
	480	+ }
	481	+
	482	+ public String getOther() {
	483	+ return other;
	484	+ }
	485	+
	486	+ public void setOther(String other) {
	487	+ this.other = other;
	488	+ }
335	489
336	490	public String getNormal() {
337	491	return normal;

1	1	package com.lyms.platform.operate.web.controller;
2	2
3		-import com.lyms.platform.biz.service.ApplyOrderService;
4		-import com.lyms.platform.biz.service.SieveService;
5		-import com.lyms.platform.biz.service.SyncDataService;
	3	+import com.lyms.platform.biz.service.*;
6	4	import com.lyms.platform.common.base.BaseController;
7	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
8	6	import com.lyms.platform.common.enums.YnEnums;
9	7	import com.lyms.platform.common.pojo.SyncDataModel;
	8	+import com.lyms.platform.common.result.BaseObjectResponse;
10	9	import com.lyms.platform.common.result.BaseResponse;
11	10	import com.lyms.platform.common.utils.Config;
12	11	import com.lyms.platform.common.utils.ExceptionUtils;
...	...	@@ -16,13 +15,8 @@
16	15	import com.lyms.platform.operate.web.facade.SysBaseFacade;
17	16	import com.lyms.platform.operate.web.request.SqlRequest;
18	17	import com.lyms.platform.permission.service.OrganizationService;
19		-import com.lyms.platform.pojo.SieveApplyOrderModel;
20		-import com.lyms.platform.pojo.SieveModel;
21		-import com.lyms.platform.pojo.SieveResultModel;
22		-import com.lyms.platform.query.SieveApplyOrderQuery;
23		-import com.lyms.platform.query.SieveQuery;
24		-import com.lyms.platform.query.SieveResultQuery;
25		-import com.lyms.platform.query.SyncDataQuery;
	18	+import com.lyms.platform.pojo.*;
	19	+import com.lyms.platform.query.*;
26	20	import org.apache.commons.codec.binary.Base64;
27	21	import org.apache.commons.collections.CollectionUtils;
28	22	import org.apache.commons.lang.StringUtils;
...	...	@@ -37,6 +31,7 @@
37	31	import javax.servlet.http.HttpServletRequest;
38	32	import javax.servlet.http.HttpServletResponse;
39	33	import java.lang.reflect.Method;
	34	+import java.util.Date;
40	35	import java.util.List;
41	36
42	37	/**
...	...	@@ -58,6 +53,12 @@
58	53	@Autowired
59	54	private PatientServiceSysFacade patientServiceSysFacade;
60	55
	56	+ @Autowired
	57	+ private PersonService personService;
	58	+
	59	+ @Autowired
	60	+ private PatientsService patientsService;
	61	+
61	62	public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0");
62	63
63	64	/**
...	...	@@ -284,6 +285,54 @@
284	285	@RequestParam(required = false) String patientId) {
285	286	try {
286	287	return patientServiceSysFacade.setStopService(patientId);
	288	+ } catch (Exception e) {
	289	+ BaseResponse baseResponse = new BaseResponse();
	290	+ baseResponse.setObject(e.getMessage());
	291	+ baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
	292	+ baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
	293	+ return baseResponse;
	294	+ }
	295	+ }
	296	+
	297	+
	298	+ @ResponseBody
	299	+ @RequestMapping(value = "/syncPatientInfo", method = RequestMethod.GET)
	300	+ public BaseResponse syncPatientInfo(@RequestParam(required = true) String cardNos) {
	301	+ try {
	302	+ String[] arrays = cardNos.split(",");
	303	+ for (String cardNo : arrays)
	304	+ {
	305	+ PatientsQuery patientsQuery = new PatientsQuery();
	306	+ patientsQuery.setCardNo(cardNo);
	307	+ String pid = "";
	308	+ List<Patients> patientses = patientsService.queryPatient(patientsQuery);
	309	+ if (CollectionUtils.isNotEmpty(patientses))
	310	+ {
	311	+ for(Patients pat : patientses)
	312	+ {
	313	+ pid = pat.getPid();
	314	+ pat.setModified(new Date());
	315	+ patientsService.updatePatient(pat);
	316	+ }
	317	+ }
	318	+
	319	+ if (StringUtils.isNotEmpty(pid))
	320	+ {
	321	+ PersonModelQuery personModelQuery = new PersonModelQuery();
	322	+ personModelQuery.setId(pid);
	323	+ List<PersonModel> personModels = personService.queryPersons(personModelQuery);
	324	+ if (CollectionUtils.isNotEmpty(personModels))
	325	+ {
	326	+ for(PersonModel personModel : personModels)
	327	+ {
	328	+ personModel.setModified(new Date());
	329	+ personService.updatePerson(personModel,personModel.getId());
	330	+ }
	331	+ }
	332	+ }
	333	+
	334	+ }
	335	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
287	336	} catch (Exception e) {
288	337	BaseResponse baseResponse = new BaseResponse();
289	338	baseResponse.setObject(e.getMessage());

...	...	@@ -1578,6 +1578,12 @@
1578	1578	List<BasicConfigResult> liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
1579	1579	typeMap.put("liveType", liveType);
1580	1580
	1581	+
	1582	+ //文化程度
	1583	+ List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
	1584	+ typeMap.put("levelType", levelType);
	1585	+
	1586	+
1581	1587	//服务类型
1582	1588	List serviceType = ServiceTypeEnums.getServiceTypeList();
1583	1589	typeMap.put("serviceType", serviceType);
...	...	@@ -1865,6 +1871,24 @@
1865	1871	patient.setTownOrgId(yunRequest.getTownOrgId());
1866	1872	//乐陵是妇幼下发医院id
1867	1873	patient.setLowerHairOgrId(yunRequest.getLowerHairOgrId());
	1874	+
	1875	+ patient.setMarriageAge(yunRequest.getMarriageAge());
	1876	+ patient.setLevelTypeId(yunRequest.getLevelTypeId());
	1877	+ patient.setMarriageStatus(yunRequest.getMarriageStatus());
	1878	+ patient.setMarriageCheck(yunRequest.getMarriageCheck());
	1879	+ patient.setContraceptionType(yunRequest.getContraceptionType());
	1880	+ patient.setContraceptionOther(yunRequest.getContraceptionOther());
	1881	+
	1882	+ patient.setHmarriageStatus(yunRequest.getHmarriageStatus());
	1883	+ patient.setHealthStatus(yunRequest.getHealthStatus());
	1884	+ patient.setSmoke(yunRequest.getSmoke());
	1885	+ patient.setSmokeNum(yunRequest.getSmokeNum());
	1886	+ patient.setDrinkWine(yunRequest.getDrinkWine());
	1887	+ patient.setHlevelTypeId(yunRequest.getHlevelTypeId());
	1888	+ patient.setPastHistory(yunRequest.getPastHistory());
	1889	+ patient.setFamilyHistory(yunRequest.getFamilyHistory());
	1890	+ patient.setOther(yunRequest.getOther());
	1891	+
1868	1892	return patient;
1869	1893	}
1870	1894
...	...	@@ -2021,6 +2045,26 @@
2021	2045
2022	2046	result.setTownOrgId(p.getTownOrgId());
2023	2047	result.setNormal(p.getNormal() == null ? "1" : p.getNormal());
	2048	+
	2049	+
	2050	+
	2051	+ result.setMarriageAge(p.getMarriageAge());
	2052	+ result.setLevelTypeId(p.getLevelTypeId());
	2053	+ result.setMarriageStatus(p.getMarriageStatus());
	2054	+ result.setMarriageCheck(p.getMarriageCheck());
	2055	+ result.setContraceptionType(p.getContraceptionType());
	2056	+ result.setContraceptionOther(p.getContraceptionOther());
	2057	+
	2058	+ result.setHmarriageStatus(p.getHmarriageStatus());
	2059	+ result.setHealthStatus(p.getHealthStatus());
	2060	+ result.setSmoke(p.getSmoke());
	2061	+ result.setSmokeNum(p.getSmokeNum());
	2062	+ result.setDrinkWine(p.getDrinkWine());
	2063	+ result.setHlevelTypeId(p.getHlevelTypeId());
	2064	+ result.setPastHistory(p.getPastHistory());
	2065	+ result.setFamilyHistory(p.getFamilyHistory());
	2066	+ result.setOther(p.getOther());
	2067	+
2024	2068	return result;
2025	2069	}
2026	2070

...	...	@@ -383,6 +383,169 @@
383	383	//空或者1为正常 2为补录
384	384	private String normal;
385	385
	386	+
	387	+ //结婚年龄
	388	+ private Integer marriageAge;
	389	+ //文化程度
	390	+ private String levelTypeId;
	391	+ //婚姻状态 1初婚 2 再婚 3其他
	392	+ private Integer marriageStatus;
	393	+
	394	+ //是否婚检 1是 2否
	395	+ private Integer marriageCheck;
	396	+
	397	+ //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
	398	+ private Integer contraceptionType;
	399	+ private String contraceptionOther;
	400	+
	401	+ //丈夫婚姻状态 1初婚 2 再婚 3其他
	402	+ private Integer hmarriageStatus;
	403	+
	404	+ //丈夫健康状态
	405	+ private String healthStatus;
	406	+
	407	+ //吸烟 1 否 2是
	408	+ private Integer smoke;
	409	+
	410	+ //吸烟数量
	411	+ private String smokeNum;
	412	+
	413	+ //饮酒 1偶尔 2 经常 3否
	414	+ private Integer drinkWine;
	415	+
	416	+ //丈夫文化程度
	417	+ private String hlevelTypeId;
	418	+
	419	+ //既往病史
	420	+ private String pastHistory;
	421	+
	422	+ //家族遗传史
	423	+ private String familyHistory;
	424	+
	425	+ //其他
	426	+ private String other;
	427	+
	428	+
	429	+ public Integer getMarriageAge() {
	430	+ return marriageAge;
	431	+ }
	432	+
	433	+ public void setMarriageAge(Integer marriageAge) {
	434	+ this.marriageAge = marriageAge;
	435	+ }
	436	+
	437	+ public String getLevelTypeId() {
	438	+ return levelTypeId;
	439	+ }
	440	+
	441	+ public void setLevelTypeId(String levelTypeId) {
	442	+ this.levelTypeId = levelTypeId;
	443	+ }
	444	+
	445	+ public Integer getMarriageStatus() {
	446	+ return marriageStatus;
	447	+ }
	448	+
	449	+ public void setMarriageStatus(Integer marriageStatus) {
	450	+ this.marriageStatus = marriageStatus;
	451	+ }
	452	+
	453	+ public Integer getMarriageCheck() {
	454	+ return marriageCheck;
	455	+ }
	456	+
	457	+ public void setMarriageCheck(Integer marriageCheck) {
	458	+ this.marriageCheck = marriageCheck;
	459	+ }
	460	+
	461	+ public Integer getContraceptionType() {
	462	+ return contraceptionType;
	463	+ }
	464	+
	465	+ public void setContraceptionType(Integer contraceptionType) {
	466	+ this.contraceptionType = contraceptionType;
	467	+ }
	468	+
	469	+ public String getContraceptionOther() {
	470	+ return contraceptionOther;
	471	+ }
	472	+
	473	+ public void setContraceptionOther(String contraceptionOther) {
	474	+ this.contraceptionOther = contraceptionOther;
	475	+ }
	476	+
	477	+ public Integer getHmarriageStatus() {
	478	+ return hmarriageStatus;
	479	+ }
	480	+
	481	+ public void setHmarriageStatus(Integer hmarriageStatus) {
	482	+ this.hmarriageStatus = hmarriageStatus;
	483	+ }
	484	+
	485	+ public String getHealthStatus() {
	486	+ return healthStatus;
	487	+ }
	488	+
	489	+ public void setHealthStatus(String healthStatus) {
	490	+ this.healthStatus = healthStatus;
	491	+ }
	492	+
	493	+ public Integer getSmoke() {
	494	+ return smoke;
	495	+ }
	496	+
	497	+ public void setSmoke(Integer smoke) {
	498	+ this.smoke = smoke;
	499	+ }
	500	+
	501	+ public String getSmokeNum() {
	502	+ return smokeNum;
	503	+ }
	504	+
	505	+ public void setSmokeNum(String smokeNum) {
	506	+ this.smokeNum = smokeNum;
	507	+ }
	508	+
	509	+ public Integer getDrinkWine() {
	510	+ return drinkWine;
	511	+ }
	512	+
	513	+ public void setDrinkWine(Integer drinkWine) {
	514	+ this.drinkWine = drinkWine;
	515	+ }
	516	+
	517	+ public String getHlevelTypeId() {
	518	+ return hlevelTypeId;
	519	+ }
	520	+
	521	+ public void setHlevelTypeId(String hlevelTypeId) {
	522	+ this.hlevelTypeId = hlevelTypeId;
	523	+ }
	524	+
	525	+ public String getPastHistory() {
	526	+ return pastHistory;
	527	+ }
	528	+
	529	+ public void setPastHistory(String pastHistory) {
	530	+ this.pastHistory = pastHistory;
	531	+ }
	532	+
	533	+ public String getFamilyHistory() {
	534	+ return familyHistory;
	535	+ }
	536	+
	537	+ public void setFamilyHistory(String familyHistory) {
	538	+ this.familyHistory = familyHistory;
	539	+ }
	540	+
	541	+ public String getOther() {
	542	+ return other;
	543	+ }
	544	+
	545	+ public void setOther(String other) {
	546	+ this.other = other;
	547	+ }
	548	+
386	549	public String getNormal() {
387	550	return normal;
388	551	}

...	...	@@ -344,6 +344,169 @@
344	344	//分娩状态 0未终止妊娠 1终止妊娠
345	345	private Integer dueStatus;
346	346
	347	+
	348	+
	349	+ //结婚年龄
	350	+ private Integer marriageAge;
	351	+ //文化程度
	352	+ private String levelTypeId;
	353	+ //婚姻状态 1初婚 2 再婚 3其他
	354	+ private Integer marriageStatus;
	355	+
	356	+ //是否婚检 1是 2否
	357	+ private Integer marriageCheck;
	358	+
	359	+ //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
	360	+ private Integer contraceptionType;
	361	+ private String contraceptionOther;
	362	+
	363	+ //丈夫婚姻状态 1初婚 2 再婚 3其他
	364	+ private Integer hmarriageStatus;
	365	+
	366	+ //丈夫健康状态
	367	+ private String healthStatus;
	368	+
	369	+ //吸烟 1 否 2是
	370	+ private Integer smoke;
	371	+
	372	+ //吸烟数量
	373	+ private String smokeNum;
	374	+
	375	+ //饮酒 1偶尔 2 经常 3否
	376	+ private Integer drinkWine;
	377	+
	378	+ //丈夫文化程度
	379	+ private String hlevelTypeId;
	380	+
	381	+ //既往病史
	382	+ private String pastHistory;
	383	+
	384	+ //家族遗传史
	385	+ private String familyHistory;
	386	+
	387	+ //其他
	388	+ private String other;
	389	+
	390	+ public Integer getMarriageAge() {
	391	+ return marriageAge;
	392	+ }
	393	+
	394	+ public void setMarriageAge(Integer marriageAge) {
	395	+ this.marriageAge = marriageAge;
	396	+ }
	397	+
	398	+ public String getLevelTypeId() {
	399	+ return levelTypeId;
	400	+ }
	401	+
	402	+ public void setLevelTypeId(String levelTypeId) {
	403	+ this.levelTypeId = levelTypeId;
	404	+ }
	405	+
	406	+ public Integer getMarriageStatus() {
	407	+ return marriageStatus;
	408	+ }
	409	+
	410	+ public void setMarriageStatus(Integer marriageStatus) {
	411	+ this.marriageStatus = marriageStatus;
	412	+ }
	413	+
	414	+ public Integer getMarriageCheck() {
	415	+ return marriageCheck;
	416	+ }
	417	+
	418	+ public void setMarriageCheck(Integer marriageCheck) {
	419	+ this.marriageCheck = marriageCheck;
	420	+ }
	421	+
	422	+ public Integer getContraceptionType() {
	423	+ return contraceptionType;
	424	+ }
	425	+
	426	+ public void setContraceptionType(Integer contraceptionType) {
	427	+ this.contraceptionType = contraceptionType;
	428	+ }
	429	+
	430	+ public String getContraceptionOther() {
	431	+ return contraceptionOther;
	432	+ }
	433	+
	434	+ public void setContraceptionOther(String contraceptionOther) {
	435	+ this.contraceptionOther = contraceptionOther;
	436	+ }
	437	+
	438	+ public Integer getHmarriageStatus() {
	439	+ return hmarriageStatus;
	440	+ }
	441	+
	442	+ public void setHmarriageStatus(Integer hmarriageStatus) {
	443	+ this.hmarriageStatus = hmarriageStatus;
	444	+ }
	445	+
	446	+ public String getHealthStatus() {
	447	+ return healthStatus;
	448	+ }
	449	+
	450	+ public void setHealthStatus(String healthStatus) {
	451	+ this.healthStatus = healthStatus;
	452	+ }
	453	+
	454	+ public Integer getSmoke() {
	455	+ return smoke;
	456	+ }
	457	+
	458	+ public void setSmoke(Integer smoke) {
	459	+ this.smoke = smoke;
	460	+ }
	461	+
	462	+ public String getSmokeNum() {
	463	+ return smokeNum;
	464	+ }
	465	+
	466	+ public void setSmokeNum(String smokeNum) {
	467	+ this.smokeNum = smokeNum;
	468	+ }
	469	+
	470	+ public Integer getDrinkWine() {
	471	+ return drinkWine;
	472	+ }
	473	+
	474	+ public void setDrinkWine(Integer drinkWine) {
	475	+ this.drinkWine = drinkWine;
	476	+ }
	477	+
	478	+ public String getHlevelTypeId() {
	479	+ return hlevelTypeId;
	480	+ }
	481	+
	482	+ public void setHlevelTypeId(String hlevelTypeId) {
	483	+ this.hlevelTypeId = hlevelTypeId;
	484	+ }
	485	+
	486	+ public String getPastHistory() {
	487	+ return pastHistory;
	488	+ }
	489	+
	490	+ public void setPastHistory(String pastHistory) {
	491	+ this.pastHistory = pastHistory;
	492	+ }
	493	+
	494	+ public String getFamilyHistory() {
	495	+ return familyHistory;
	496	+ }
	497	+
	498	+ public void setFamilyHistory(String familyHistory) {
	499	+ this.familyHistory = familyHistory;
	500	+ }
	501	+
	502	+ public String getOther() {
	503	+ return other;
	504	+ }
	505	+
	506	+ public void setOther(String other) {
	507	+ this.other = other;
	508	+ }
	509	+
347	510	public List<String> getChildExtAddrs() {
348	511	return childExtAddrs;
349	512	}