jiangjiazhi / regional-platform

Commit 695d4dba3d638b81d11104e04a2526dc1c05bfbf

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 78 additions and 33 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -56,14 +56,12 @@
56	56	private String husbandAccountNatureStr;
57	57
58	58
59		-
60	59	/**
61	60	* 妻子民族id
62	61	*/
63	62	private String wifeNationStr;
64	63
65	64
66		-
67	65	/**
68	66	* 妻子文化程度id
69	67	*/
...	...	@@ -80,7 +78,6 @@
80	78	private String wifeCareerStr;
81	79
82	80
83		-
84	81	/**
85	82	* 妻子户口性质:
86	83	* 1农业户口 (含界定为农村居民者) 2.非农业
...	...	@@ -88,6 +85,40 @@
88	85	private String wifeAccountNatureStr;
89	86
90	87
	88	+ private String doctorStr;
	89	+
	90	+ public String getHusbandAccountAddressStr() {
	91	+ return husbandAccountAddressStr;
	92	+ }
	93	+
	94	+ public void setHusbandAccountAddressStr(String husbandAccountAddressStr) {
	95	+ this.husbandAccountAddressStr = husbandAccountAddressStr;
	96	+ }
	97	+
	98	+ public String getHusbandCurrentAddressStr() {
	99	+ return husbandCurrentAddressStr;
	100	+ }
	101	+
	102	+ public void setHusbandCurrentAddressStr(String husbandCurrentAddressStr) {
	103	+ this.husbandCurrentAddressStr = husbandCurrentAddressStr;
	104	+ }
	105	+
	106	+ public String getWifeAccountAddressStr() {
	107	+ return wifeAccountAddressStr;
	108	+ }
	109	+
	110	+ public void setWifeAccountAddressStr(String wifeAccountAddressStr) {
	111	+ this.wifeAccountAddressStr = wifeAccountAddressStr;
	112	+ }
	113	+
	114	+ public String getWifeCurrentAddressStr() {
	115	+ return wifeCurrentAddressStr;
	116	+ }
	117	+
	118	+ public void setWifeCurrentAddressStr(String wifeCurrentAddressStr) {
	119	+ this.wifeCurrentAddressStr = wifeCurrentAddressStr;
	120	+ }
	121	+
91	122	public String getHusbandEducationalStr() {
92	123	return husbandEducationalStr;
93	124	}
94	125
...	...	@@ -168,36 +199,12 @@
168	199	this.wifeAccountNatureStr = wifeAccountNatureStr;
169	200	}
170	201
171		- public String getHusbandAccountAddressStr() {
172		- return husbandAccountAddressStr;
	202	+ public String getDoctorStr() {
	203	+ return doctorStr;
173	204	}
174	205
175		- public void setHusbandAccountAddressStr(String husbandAccountAddressStr) {
176		- this.husbandAccountAddressStr = husbandAccountAddressStr;
177		- }
178		-
179		- public String getHusbandCurrentAddressStr() {
180		- return husbandCurrentAddressStr;
181		- }
182		-
183		- public void setHusbandCurrentAddressStr(String husbandCurrentAddressStr) {
184		- this.husbandCurrentAddressStr = husbandCurrentAddressStr;
185		- }
186		-
187		- public String getWifeAccountAddressStr() {
188		- return wifeAccountAddressStr;
189		- }
190		-
191		- public void setWifeAccountAddressStr(String wifeAccountAddressStr) {
192		- this.wifeAccountAddressStr = wifeAccountAddressStr;
193		- }
194		-
195		- public String getWifeCurrentAddressStr() {
196		- return wifeCurrentAddressStr;
197		- }
198		-
199		- public void setWifeCurrentAddressStr(String wifeCurrentAddressStr) {
200		- this.wifeCurrentAddressStr = wifeCurrentAddressStr;
	206	+ public void setDoctorStr(String doctorStr) {
	207	+ this.doctorStr = doctorStr;
201	208	}
202	209	}

...	...	@@ -3,7 +3,9 @@
3	3	import java.util.Date;
4	4	import java.util.LinkedList;
5	5	import java.util.List;
	6	+import java.util.Map;
6	7
	8	+import com.lyms.platform.permission.service.UsersService;
7	9	import org.springframework.beans.BeanUtils;
8	10	import org.springframework.beans.factory.annotation.Autowired;
9	11	import org.springframework.data.domain.Sort;
...	...	@@ -46,6 +48,9 @@
46	48	@Autowired
47	49	private BasicConfigService basicConfigService;
48	50
	51	+ @Autowired
	52	+ private UsersService usersService;
	53	+
49	54	/**
50	55	* 根据身份证号获取对应的孕前优生信息
51	56	*
52	57
...	...	@@ -90,8 +95,16 @@
90	95	one.setWifeAccountCity(model.getCityRegisterId());
91	96	one.setWifeAccountArea(model.getAreaRegisterId());
92	97	one.setWifeAccountStreet(model.getStreetRegisterId());
93		- one.setWifeAccountAddress(model.getStreetRegisterId());
	98	+ one.setWifeAccountAddress(model.getAddressRegister());
94	99
	100	+
	101	+ // 妇女居住地
	102	+ one.setWifeCurrentProvince(model.getProvinceId());
	103	+ one.setWifeCurrentCity(model.getCityId());
	104	+ one.setWifeCurrentArea(model.getAreaId());
	105	+ one.setWifeCurrentStreet(model.getStreetId());
	106	+ one.setWifeCurrentAddress(model.getAddress());
	107	+
95	108	// 丈夫信息
96	109	one.setHusbandName(model.getSpouseName());
97	110	one.setHusbandPhone(model.getSpousePhone());
...	...	@@ -346,7 +359,7 @@
346	359	model.getWifeCurrentStreet(),
347	360	model.getWifeCurrentAddress(), basicConfigService));
348	361
349		- result.setHusbandEducationalStr(CommonsHelper.getName1(model.getHusbandEducational(),basicConfigService));
	362	+ result.setHusbandEducationalStr(CommonsHelper.getName1(model.getHusbandEducational(), basicConfigService));
350	363	result.setHusbandCardTypeStr(CommonsHelper.getName1(model.getHusbandCardType(), basicConfigService));
351	364	result.setHusbandCareerStr(CommonsHelper.getName1(model.getHusbandCareer(), basicConfigService));
352	365	result.setHusbandNationStr(CommonsHelper.getName1(model.getHusbandNation(), basicConfigService));
353	366
354	367
...	...	@@ -356,8 +369,33 @@
356	369	result.setWifeCardTypeStr(CommonsHelper.getName1(model.getWifeCardType(), basicConfigService));
357	370	result.setWifeCareerStr(CommonsHelper.getName1(model.getWifeCareer(), basicConfigService));
358	371	result.setWifeAccountNatureStr(CommonsHelper.getName1(model.getWifeAccountNature(), basicConfigService));
	372	+ result.setDoctorStr(CommonsHelper.getUserName(model.getDoctor(), usersService));
359	373
	374	+ setDoctorName(result.getWifeBaseInfo());
	375	+ setDoctorName(result.getWifePhysiqueCheck());
	376	+ setDoctorName(result.getWifeClinicalCheck());
	377	+ setDoctorName(result.getWifeBCheck());
	378	+ setDoctorName(result.getWifeOtherCheck());
	379	+
	380	+ setDoctorName(result.getHusbandBaseInfo());
	381	+ setDoctorName(result.getHusbandPhysiqueCheck());
	382	+ setDoctorName(result.getHusbandClinicalCheck());
	383	+ setDoctorName(result.getHusbandOtherCheck());
	384	+
	385	+ setDoctorName(result.getResultAdvice());
	386	+
360	387	return result;
	388	+ }
	389	+
	390	+
	391	+ private void setDoctorName(Map<String,Object> map)
	392	+ {
	393	+ if (map != null && map.size() > 0 && map.get("doctor") != null)
	394	+ {
	395	+ String doctor = String.valueOf(map.get("doctor"));
	396	+ String doctorStr = CommonsHelper.getUserName(doctor,usersService);
	397	+ map.put("doctorStr",doctorStr);
	398	+ }
361	399	}
362	400
363	401	/**