jiangjiazhi / regional-platform

Commit a49955a51e31813a85632edafbb5ab26d774d34d

Authored by Administrator over 5 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 176 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FolviteResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java

...	...	@@ -14,6 +14,140 @@
14	14	//生日翻译
15	15	private String birthdayStr;
16	16
	17	+ //婚姻状况翻译
	18	+ private String maritalStatusStr;
	19	+
	20	+ //国籍翻译
	21	+ private String nationalityStr;
	22	+
	23	+ //民族翻译
	24	+ private String nationStr;
	25	+
	26	+ //证件类型
	27	+ private String certificateTypeStr;
	28	+
	29	+ //户籍类型
	30	+ private String censusTypeStr;
	31	+
	32	+
	33	+ //文化程度
	34	+ private String educationStr;
	35	+
	36	+ //职业类别
	37	+ private String occupationStr;
	38	+
	39	+ //居住类型
	40	+ private String liveTypeStr;
	41	+
	42	+ //居住地址Str
	43	+ private String habitationAddressStr;
	44	+
	45	+ //户籍地址
	46	+ private String domicileAddressStr;
	47	+
	48	+ //建档机构
	49	+ private String hospitalIdStr;
	50	+
	51	+ //建档人
	52	+ private String userNameStr;
	53	+
	54	+
	55	+ public String getMaritalStatusStr() {
	56	+ return maritalStatusStr;
	57	+ }
	58	+
	59	+ public void setMaritalStatusStr(String maritalStatusStr) {
	60	+ this.maritalStatusStr = maritalStatusStr;
	61	+ }
	62	+
	63	+ public String getNationalityStr() {
	64	+ return nationalityStr;
	65	+ }
	66	+
	67	+ public void setNationalityStr(String nationalityStr) {
	68	+ this.nationalityStr = nationalityStr;
	69	+ }
	70	+
	71	+ public String getNationStr() {
	72	+ return nationStr;
	73	+ }
	74	+
	75	+ public void setNationStr(String nationStr) {
	76	+ this.nationStr = nationStr;
	77	+ }
	78	+
	79	+ public String getCertificateTypeStr() {
	80	+ return certificateTypeStr;
	81	+ }
	82	+
	83	+ public void setCertificateTypeStr(String certificateTypeStr) {
	84	+ this.certificateTypeStr = certificateTypeStr;
	85	+ }
	86	+
	87	+ public String getCensusTypeStr() {
	88	+ return censusTypeStr;
	89	+ }
	90	+
	91	+ public void setCensusTypeStr(String censusTypeStr) {
	92	+ this.censusTypeStr = censusTypeStr;
	93	+ }
	94	+
	95	+ public String getEducationStr() {
	96	+ return educationStr;
	97	+ }
	98	+
	99	+ public void setEducationStr(String educationStr) {
	100	+ this.educationStr = educationStr;
	101	+ }
	102	+
	103	+ public String getOccupationStr() {
	104	+ return occupationStr;
	105	+ }
	106	+
	107	+ public void setOccupationStr(String occupationStr) {
	108	+ this.occupationStr = occupationStr;
	109	+ }
	110	+
	111	+ public String getLiveTypeStr() {
	112	+ return liveTypeStr;
	113	+ }
	114	+
	115	+ public void setLiveTypeStr(String liveTypeStr) {
	116	+ this.liveTypeStr = liveTypeStr;
	117	+ }
	118	+
	119	+ public String getHabitationAddressStr() {
	120	+ return habitationAddressStr;
	121	+ }
	122	+
	123	+ public void setHabitationAddressStr(String habitationAddressStr) {
	124	+ this.habitationAddressStr = habitationAddressStr;
	125	+ }
	126	+
	127	+ public String getDomicileAddressStr() {
	128	+ return domicileAddressStr;
	129	+ }
	130	+
	131	+ public void setDomicileAddressStr(String domicileAddressStr) {
	132	+ this.domicileAddressStr = domicileAddressStr;
	133	+ }
	134	+
	135	+ public String getHospitalIdStr() {
	136	+ return hospitalIdStr;
	137	+ }
	138	+
	139	+ public void setHospitalIdStr(String hospitalIdStr) {
	140	+ this.hospitalIdStr = hospitalIdStr;
	141	+ }
	142	+
	143	+ public String getUserNameStr() {
	144	+ return userNameStr;
	145	+ }
	146	+
	147	+ public void setUserNameStr(String userNameStr) {
	148	+ this.userNameStr = userNameStr;
	149	+ }
	150	+
17	151	public String getBirthdayStr() {
18	152	return birthdayStr;
19	153	}

...	...	@@ -12,6 +12,7 @@
12	12	import com.lyms.platform.operate.web.service.FolviteService;
13	13	import com.lyms.platform.operate.web.utils.CollectionUtils;
14	14	import com.lyms.platform.operate.web.utils.CommonsHelper;
	15	+import com.lyms.platform.operate.web.utils.FunvCommonUtil;
15	16	import com.lyms.platform.permission.dao.master.FolviteMapper;
16	17	import com.lyms.platform.permission.dao.master.FolviteReceiveMapper;
17	18	import com.lyms.platform.permission.model.FolviteQuery;
18	19
...	...	@@ -19,12 +20,14 @@
19	20	import com.lyms.platform.permission.model.Organization;
20	21	import com.lyms.platform.permission.service.OrganizationService;
21	22	import com.lyms.platform.permission.service.UsersService;
	23	+import com.lyms.platform.pojo.BasicConfig;
22	24	import com.lyms.platform.pojo.FolviteReceiveRecordModel;
23	25	import com.lyms.platform.pojo.FolviteRecordModel;
24	26	import com.lyms.platform.pojo.ResidentsArchiveModel;
25	27	import com.lyms.platform.query.ResidentsArchiveQuery;
26	28	import org.springframework.beans.factory.annotation.Autowired;
27	29	import org.springframework.stereotype.Service;
	30	+import org.springframework.beans.BeanUtils;
28	31
29	32	import java.util.*;
30	33
31	34
32	35
...	...	@@ -162,9 +165,37 @@
162	165	@Override
163	166	public BaseResponse queryFolviteOne(String id) {
164	167	FolviteRecordModel folviteRecordModel = folviteMapper.queryOne(id);
	168	+ FolviteResult folviteResult = new FolviteResult();
	169	+ if (folviteRecordModel != null) {
	170	+ try {
	171	+ BeanUtils.copyProperties(folviteRecordModel, folviteResult);
	172	+ folviteResult.setNationalityStr(getBasicConfig(folviteRecordModel.getNationality()));
	173	+ folviteResult.setNationStr(getBasicConfig(folviteRecordModel.getNation()));
	174	+ folviteResult.setMaritalStatusStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getMaritalStatusStr(), basicConfigService));
	175	+ folviteResult.setCertificateTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCertificateType(), basicConfigService));
	176	+ folviteResult.setCensusTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCensusType(), basicConfigService));
	177	+ folviteResult.setLiveTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getLiveType(), basicConfigService));
	178	+ folviteResult.setEducationStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getEducation(), basicConfigService));
	179	+ folviteResult.setOccupationStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getOccupation(), basicConfigService));
	180	+ folviteResult.setUserNameStr(usersService.getUsers(Integer.valueOf(folviteRecordModel.getOperationDoctor())).getName());
	181	+ folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getHabitationProvince(), folviteRecordModel.getHabitationCity(),
	182	+ folviteRecordModel.getHabitationArea(), folviteRecordModel.getHabitationCountry(), folviteRecordModel.getHabitationAddress(), basicConfigService));
	183	+ folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getDomicileProvince(), folviteRecordModel.getDomicileCity(),
	184	+ folviteRecordModel.getDomicileArea(), folviteRecordModel.getDomicileCountry(), folviteRecordModel.getDomicileAddress(), basicConfigService));
	185	+ String hospital = "";
	186	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(folviteRecordModel.getHospitalId())) {
	187	+ Organization organization = organizationService.getOrganization(Integer.parseInt(folviteRecordModel.getHospitalId()));
	188	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	189	+ hospital = organization.getName();
	190	+ }
	191	+ }
	192	+ folviteResult.setHospitalIdStr(hospital);
165	193
	194	+ } catch (Exception e) {
	195	+ }
	196	+ }
166	197	BaseResponse response = new BaseResponse();
167		- response.setObject(folviteRecordModel);
	198	+ response.setObject(folviteResult);
168	199	return response;
169	200	}
170	201
...	...	@@ -402,6 +433,16 @@
402	433	return folviteResult;
403	434	}
404	435
	436	+ private String getBasicConfig(String id) {
	437	+ if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) {
	438	+ return "";
	439	+ }
	440	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
	441	+ if (null != basicConfig) {
	442	+ return basicConfig.getName();
	443	+ }
	444	+ return "";
	445	+ }
405	446
406	447	}