From a49955a51e31813a85632edafbb5ab26d774d34d Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Fri, 1 Nov 2019 16:01:53 +0800 Subject: [PATCH] update --- .../platform/operate/web/result/FolviteResult.java | 134 +++++++++++++++++++++ .../web/service/impl/FolviteServiceImpl.java | 43 ++++++- 2 files changed, 176 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FolviteResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FolviteResult.java index a30f3ba..cfe0cda 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FolviteResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FolviteResult.java @@ -14,6 +14,140 @@ public class FolviteResult extends FolviteRecordModel { //生日翻译 private String birthdayStr; + //婚姻状况 翻译 + private String maritalStatusStr; + + //国籍 翻译 + private String nationalityStr; + + //民族 翻译 + private String nationStr; + + //证件类型 + private String certificateTypeStr; + + //户籍类型 + private String censusTypeStr; + + + //文化程度 + private String educationStr; + + //职业类别 + private String occupationStr; + + //居住类型 + private String liveTypeStr; + + //居住地址Str + private String habitationAddressStr; + + //户籍地址 + private String domicileAddressStr; + + //建档机构 + private String hospitalIdStr; + + //建档人 + private String userNameStr; + + + public String getMaritalStatusStr() { + return maritalStatusStr; + } + + public void setMaritalStatusStr(String maritalStatusStr) { + this.maritalStatusStr = maritalStatusStr; + } + + public String getNationalityStr() { + return nationalityStr; + } + + public void setNationalityStr(String nationalityStr) { + this.nationalityStr = nationalityStr; + } + + public String getNationStr() { + return nationStr; + } + + public void setNationStr(String nationStr) { + this.nationStr = nationStr; + } + + public String getCertificateTypeStr() { + return certificateTypeStr; + } + + public void setCertificateTypeStr(String certificateTypeStr) { + this.certificateTypeStr = certificateTypeStr; + } + + public String getCensusTypeStr() { + return censusTypeStr; + } + + public void setCensusTypeStr(String censusTypeStr) { + this.censusTypeStr = censusTypeStr; + } + + public String getEducationStr() { + return educationStr; + } + + public void setEducationStr(String educationStr) { + this.educationStr = educationStr; + } + + public String getOccupationStr() { + return occupationStr; + } + + public void setOccupationStr(String occupationStr) { + this.occupationStr = occupationStr; + } + + public String getLiveTypeStr() { + return liveTypeStr; + } + + public void setLiveTypeStr(String liveTypeStr) { + this.liveTypeStr = liveTypeStr; + } + + public String getHabitationAddressStr() { + return habitationAddressStr; + } + + public void setHabitationAddressStr(String habitationAddressStr) { + this.habitationAddressStr = habitationAddressStr; + } + + public String getDomicileAddressStr() { + return domicileAddressStr; + } + + public void setDomicileAddressStr(String domicileAddressStr) { + this.domicileAddressStr = domicileAddressStr; + } + + public String getHospitalIdStr() { + return hospitalIdStr; + } + + public void setHospitalIdStr(String hospitalIdStr) { + this.hospitalIdStr = hospitalIdStr; + } + + public String getUserNameStr() { + return userNameStr; + } + + public void setUserNameStr(String userNameStr) { + this.userNameStr = userNameStr; + } + public String getBirthdayStr() { return birthdayStr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java index 82746aa..b91b819 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java @@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.result.FolviteResult; import com.lyms.platform.operate.web.service.FolviteService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.permission.dao.master.FolviteMapper; import com.lyms.platform.permission.dao.master.FolviteReceiveMapper; import com.lyms.platform.permission.model.FolviteQuery; @@ -19,12 +20,14 @@ import com.lyms.platform.permission.model.FolviteRecordQuery; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.FolviteReceiveRecordModel; import com.lyms.platform.pojo.FolviteRecordModel; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.ResidentsArchiveQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.beans.BeanUtils; import java.util.*; @@ -162,9 +165,37 @@ public class FolviteServiceImpl implements FolviteService { @Override public BaseResponse queryFolviteOne(String id) { FolviteRecordModel folviteRecordModel = folviteMapper.queryOne(id); + FolviteResult folviteResult = new FolviteResult(); + if (folviteRecordModel != null) { + try { + BeanUtils.copyProperties(folviteRecordModel, folviteResult); + folviteResult.setNationalityStr(getBasicConfig(folviteRecordModel.getNationality())); + folviteResult.setNationStr(getBasicConfig(folviteRecordModel.getNation())); + folviteResult.setMaritalStatusStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getMaritalStatusStr(), basicConfigService)); + folviteResult.setCertificateTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCertificateType(), basicConfigService)); + folviteResult.setCensusTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCensusType(), basicConfigService)); + folviteResult.setLiveTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getLiveType(), basicConfigService)); + folviteResult.setEducationStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getEducation(), basicConfigService)); + folviteResult.setOccupationStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getOccupation(), basicConfigService)); + folviteResult.setUserNameStr(usersService.getUsers(Integer.valueOf(folviteRecordModel.getOperationDoctor())).getName()); + folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getHabitationProvince(), folviteRecordModel.getHabitationCity(), + folviteRecordModel.getHabitationArea(), folviteRecordModel.getHabitationCountry(), folviteRecordModel.getHabitationAddress(), basicConfigService)); + folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getDomicileProvince(), folviteRecordModel.getDomicileCity(), + folviteRecordModel.getDomicileArea(), folviteRecordModel.getDomicileCountry(), folviteRecordModel.getDomicileAddress(), basicConfigService)); + String hospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(folviteRecordModel.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(folviteRecordModel.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + hospital = organization.getName(); + } + } + folviteResult.setHospitalIdStr(hospital); + } catch (Exception e) { + } + } BaseResponse response = new BaseResponse(); - response.setObject(folviteRecordModel); + response.setObject(folviteResult); return response; } @@ -402,5 +433,15 @@ public class FolviteServiceImpl implements FolviteService { return folviteResult; } + private String getBasicConfig(String id) { + if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) { + return ""; + } + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); + if (null != basicConfig) { + return basicConfig.getName(); + } + return ""; + } } \ No newline at end of file -- 1.8.3.1