diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index 762885c..63d223f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -194,8 +194,8 @@ public class BabyManagerFacade { addr = ""; } }*/ - babyResult.setAddress(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService)); - + babyResult.setAddress(patients.getAddress()); + babyResult.setFullAddr(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService)); babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId); String comm = "未分配"; if(StringUtils.isNotEmpty(patients.getCommunityId())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java index 5136230..8d4a6e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java @@ -35,6 +35,16 @@ public class BabyResult { private String address; + public String getFullAddr() { + return fullAddr; + } + + public void setFullAddr(String fullAddr) { + this.fullAddr = fullAddr; + } + + private String fullAddr; + private String community; private String communityId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java index a643df0..2b49714 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java @@ -28,6 +28,16 @@ public class PuerperaResult { private String communityId; + public String getFullAddr() { + return fullAddr; + } + + public void setFullAddr(String fullAddr) { + this.fullAddr = fullAddr; + } + + private String fullAddr; + public String getCommunityId() { return communityId; } @@ -137,7 +147,8 @@ public class PuerperaResult { addr = ""; } }*/ - setAddress(addr); + setFullAddr(addr); + setAddress(model.getAddress()); setId(model.getId()); setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); setVisit(tips);