diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index bffebc2..c491b10 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -9,11 +9,13 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest; import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult; +import com.lyms.platform.operate.web.result.ResidentsArchiveResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; @@ -323,22 +325,76 @@ public class ResidentsArchiveFacade{ return objectResponse; } - ResidentsArchiveModel model = new ResidentsArchiveModel(); + ResidentsArchiveResult result = new ResidentsArchiveResult(); ResidentsArchiveQuery query = new ResidentsArchiveQuery(); query.setYn(YnEnums.YES.getId()); query.setId(id); List modelList = residentsArchiveService.queryResident(query); if (CollectionUtils.isNotEmpty(modelList)){ - model = modelList.get(0); + ResidentsArchiveModel model = modelList.get(0); + + result = getResult(model); } - objectResponse.setData(model); + objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; } + public ResidentsArchiveResult getResult(ResidentsArchiveModel model){ + + ResidentsArchiveResult result = new ResidentsArchiveResult(); + result.setId(model.getId()); + result.setUsername(model.getUsername()); + result.setSex(model.getSex()); + result.setBrithDay(model.getBuildDay()); + result.setCountryId(model.getCountryId()); + result.setNationId(model.getNationId()); + result.setMarriageId(model.getMarriageId()); + result.setCertificateTypeId(model.getCertificateTypeId()); + result.setCertificateNum(model.getCertificateNum()); + result.setCensusTypeId(model.getCensusTypeId()); + result.setLiveTypeId(model.getLiveTypeId()); + result.setLevelTypeId(model.getLevelTypeId()); + result.setProfessionTypeId(model.getProfessionTypeId()); + result.setHospitalId(model.getHospitalId()); + + result.setPhone(model.getPhone()); + result.setWorkUnit(model.getWorkUnit()); + result.setProvinceId(model.getProvinceId()); + result.setCityId(model.getCityId()); + result.setAreaId(model.getAreaId()); + result.setStreetId(model.getStreetId()); + result.setAddress(model.getAddress()); + + result.setProvinceRegisterId(model.getProvinceRegisterId()); + result.setCityRegisterId(model.getCityRegisterId()); + result.setAreaRegisterId(model.getAreaRegisterId()); + result.setStreetRegisterId(model.getStreetRegisterId()); + result.setAddressRegister(model.getAddressRegister()); + + result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(),Map.class)); + result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class)); + result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class)); + result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class)); + result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class)); + + result.setVcCardNo(model.getVcCardNo()); + result.setBuildDoctor(model.getBuildDoctor()); + result.setBuildDay(model.getBuildDay()); + + result.setCreated(model.getCreated()); + result.setModified(model.getModified()); + + result.setPublishId(model.getPublishId()); + result.setPublishName(model.getPublishName()); + + return result; + } + + /** * 妇女健康管理 * @param queryRequest diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java index bbdec87..17e14de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.result; import java.util.Date; +import java.util.Map; /** * 居民建档记录详情返回参数 @@ -16,7 +17,7 @@ public class ResidentsArchiveResult { //性别 private String sex; //出生日期 - private Date brithDay; + private String brithDay; //国籍 private String countryId; //民族Id @@ -62,15 +63,15 @@ public class ResidentsArchiveResult { /************病史信息*************/ //既往史 - private String pastHistory; + private Map pastHistory; //家族史 - private String familyHistory; + private Map familyHistory; //个人史 - private String personalHistory; + private Map personalHistory; //药物过敏史 - private String ywgmHistory; + private Map ywgmHistory; //现病史 - private String presentHistory; + private Map presentHistory; /************院内信息*************/ @@ -79,7 +80,7 @@ public class ResidentsArchiveResult { //建档人 private String buildDoctor; //建档日期 - private Date buildDay; + private String buildDay; /* table info */ @@ -114,11 +115,11 @@ public class ResidentsArchiveResult { this.sex = sex; } - public Date getBrithDay() { + public String getBrithDay() { return brithDay; } - public void setBrithDay(Date brithDay) { + public void setBrithDay(String brithDay) { this.brithDay = brithDay; } @@ -298,43 +299,43 @@ public class ResidentsArchiveResult { this.addressRegister = addressRegister; } - public String getPastHistory() { + public Map getPastHistory() { return pastHistory; } - public void setPastHistory(String pastHistory) { + public void setPastHistory(Map pastHistory) { this.pastHistory = pastHistory; } - public String getFamilyHistory() { + public Map getFamilyHistory() { return familyHistory; } - public void setFamilyHistory(String familyHistory) { + public void setFamilyHistory(Map familyHistory) { this.familyHistory = familyHistory; } - public String getPersonalHistory() { + public Map getPersonalHistory() { return personalHistory; } - public void setPersonalHistory(String personalHistory) { + public void setPersonalHistory(Map personalHistory) { this.personalHistory = personalHistory; } - public String getYwgmHistory() { + public Map getYwgmHistory() { return ywgmHistory; } - public void setYwgmHistory(String ywgmHistory) { + public void setYwgmHistory(Map ywgmHistory) { this.ywgmHistory = ywgmHistory; } - public String getPresentHistory() { + public Map getPresentHistory() { return presentHistory; } - public void setPresentHistory(String presentHistory) { + public void setPresentHistory(Map presentHistory) { this.presentHistory = presentHistory; } @@ -354,11 +355,11 @@ public class ResidentsArchiveResult { this.buildDoctor = buildDoctor; } - public Date getBuildDay() { + public String getBuildDay() { return buildDay; } - public void setBuildDay(Date buildDay) { + public void setBuildDay(String buildDay) { this.buildDay = buildDay; }