Commit cb592d89faa9b3565a3060d3b42cd15e7abe4669
1 parent
469326f4c8
Exists in
master
and in
8 other branches
增加addr字段
Showing 3 changed files with 24 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java
View file @
cb592d8
| ... | ... | @@ -194,8 +194,8 @@ |
| 194 | 194 | addr = ""; |
| 195 | 195 | } |
| 196 | 196 | }*/ |
| 197 | - babyResult.setAddress(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService)); | |
| 198 | - | |
| 197 | + babyResult.setAddress(patients.getAddress()); | |
| 198 | + babyResult.setFullAddr(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService)); | |
| 199 | 199 | babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId); |
| 200 | 200 | String comm = "未分配"; |
| 201 | 201 | if(StringUtils.isNotEmpty(patients.getCommunityId())){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java
View file @
cb592d8
| ... | ... | @@ -35,6 +35,16 @@ |
| 35 | 35 | |
| 36 | 36 | private String address; |
| 37 | 37 | |
| 38 | + public String getFullAddr() { | |
| 39 | + return fullAddr; | |
| 40 | + } | |
| 41 | + | |
| 42 | + public void setFullAddr(String fullAddr) { | |
| 43 | + this.fullAddr = fullAddr; | |
| 44 | + } | |
| 45 | + | |
| 46 | + private String fullAddr; | |
| 47 | + | |
| 38 | 48 | private String community; |
| 39 | 49 | private String |
| 40 | 50 | communityId; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
View file @
cb592d8
| ... | ... | @@ -28,6 +28,16 @@ |
| 28 | 28 | |
| 29 | 29 | private String communityId; |
| 30 | 30 | |
| 31 | + public String getFullAddr() { | |
| 32 | + return fullAddr; | |
| 33 | + } | |
| 34 | + | |
| 35 | + public void setFullAddr(String fullAddr) { | |
| 36 | + this.fullAddr = fullAddr; | |
| 37 | + } | |
| 38 | + | |
| 39 | + private String fullAddr; | |
| 40 | + | |
| 31 | 41 | public String getCommunityId() { |
| 32 | 42 | return communityId; |
| 33 | 43 | } |
| ... | ... | @@ -137,7 +147,8 @@ |
| 137 | 147 | addr = ""; |
| 138 | 148 | } |
| 139 | 149 | }*/ |
| 140 | - setAddress(addr); | |
| 150 | + setFullAddr(addr); | |
| 151 | + setAddress(model.getAddress()); | |
| 141 | 152 | setId(model.getId()); |
| 142 | 153 | setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); |
| 143 | 154 | setVisit(tips); |