diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java index aa9898a..1d8c806 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java @@ -25,6 +25,15 @@ public class DefectiveChildModel extends BaseModel { private String hospitalId; + + /** + * 机构地址 + */ + private String orgProvince; + private String orgCity; + private String orgArea; + private String orgName; + /** * 省市区街道 */ @@ -78,6 +87,39 @@ public class DefectiveChildModel extends BaseModel { */ private Map formData; + + public String getOrgProvince() { + return orgProvince; + } + + public void setOrgProvince(String orgProvince) { + this.orgProvince = orgProvince; + } + + public String getOrgCity() { + return orgCity; + } + + public void setOrgCity(String orgCity) { + this.orgCity = orgCity; + } + + public String getOrgArea() { + return orgArea; + } + + public void setOrgArea(String orgArea) { + this.orgArea = orgArea; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + public String getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java index a3a42c7..1a8f189 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java @@ -24,11 +24,21 @@ public class DefectiveChildModelResult extends DefectiveChildModel { */ private String addressStr; + private String orgAddressStr; + /** * 缺陷儿的生日 */ private String babyBirthStr; + public String getOrgAddressStr() { + return orgAddressStr; + } + + public void setOrgAddressStr(String orgAddressStr) { + this.orgAddressStr = orgAddressStr; + } + public String getCreateUserStr() { return createUserStr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java index b3a7cba..5d85928 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java @@ -246,6 +246,16 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { null, basicConfigService); result.setAddressStr(addressStr); + + + String orgAddressStr = CommonsHelper.getResidence( + result.getOrgProvince(), + result.getOrgCity(), + result.getOrgArea(), + null, + null, + basicConfigService); + result.setOrgAddressStr(orgAddressStr); Date babyBirth = result.getBabyBirth(); if (babyBirth != null) { result.setBabyBirthStr(DateUtil.getyyyy_MM_dd(babyBirth));