diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 829c2d3..c5efc64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1398,6 +1398,11 @@ public class BookbuildingFacade { patientResult.setPregnantLiveAreaId(result.getPregnantLiveAreaId()); patientResult.setPregnantLiveStreetId(result.getPregnantLiveStreetId()); + + patientResult.setPregnantLiveProvince(getBasicConfig(result.getPregnantLiveProvinceId())); + patientResult.setPregnantLiveCity(getBasicConfig(result.getPregnantLiveAreaId())); + patientResult.setPregnantLiveArea(getBasicConfig(result.getPregnantLiveAreaId())); + patientResult.setPregnantLiveStreet(getBasicConfig(result.getPregnantLiveStreetId())); patientResult.setHusbandName(result.getHusbandName()); //丈夫证件号 if(StringUtils.isNotEmpty(result.getHusbandCertificateNum()) &&result.getHusbandCertificateNum().length()==18){ @@ -1428,4 +1433,14 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + private String getBasicConfig(String id){ + if(StringUtils.isEmpty(id)){ + return ""; + } + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); + if(null!=basicConfig){ + return basicConfig.getName(); + } + return ""; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimplePregnantResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimplePregnantResult.java index b109dfa..6249ab8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimplePregnantResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimplePregnantResult.java @@ -6,9 +6,11 @@ package com.lyms.platform.operate.web.result; public class SimplePregnantResult { private String id; private String pid; - + //孕妇名字 private String pregnantName; + //孕妇年龄 private String pregnantAge; + //孕妇手机号码 private String pregnantPhone; //居住地 @@ -18,6 +20,11 @@ public class SimplePregnantResult { private String pregnantLiveAreaId; private String pregnantLiveStreetId; + private String pregnantLiveProvince; + private String pregnantLiveCity; + private String pregnantLiveArea; + private String pregnantLiveStreet; + //丈夫姓名 private String husbandName; @@ -42,6 +49,38 @@ public class SimplePregnantResult { return pid; } + public String getPregnantLiveProvince() { + return pregnantLiveProvince; + } + + public void setPregnantLiveProvince(String pregnantLiveProvince) { + this.pregnantLiveProvince = pregnantLiveProvince; + } + + public String getPregnantLiveCity() { + return pregnantLiveCity; + } + + public void setPregnantLiveCity(String pregnantLiveCity) { + this.pregnantLiveCity = pregnantLiveCity; + } + + public String getPregnantLiveArea() { + return pregnantLiveArea; + } + + public void setPregnantLiveArea(String pregnantLiveArea) { + this.pregnantLiveArea = pregnantLiveArea; + } + + public String getPregnantLiveStreet() { + return pregnantLiveStreet; + } + + public void setPregnantLiveStreet(String pregnantLiveStreet) { + this.pregnantLiveStreet = pregnantLiveStreet; + } + public void setPid(String pid) { this.pid = pid; }