Commit 5dda826520048787123d0b98d2cbea81b8c67e5b
1 parent
629238f3a8
Exists in
master
and in
6 other branches
滦平-产后复查-导出添加现住址
Showing 1 changed file with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java
View file @
5dda826
| ... | ... | @@ -215,9 +215,9 @@ |
| 215 | 215 | } |
| 216 | 216 | } |
| 217 | 217 | tempMap.put("gcDoctor", gcDoctor); |
| 218 | - //滦平妇幼定制-居住地 | |
| 219 | - String liveAddress = CommonsHelper.getResidence(p.getProvinceId(), p.getCityId(), | |
| 220 | - p.getAreaId(), p.getStreetId(), p.getAddress(), basicConfigService); | |
| 218 | + //滦平妇幼定制-现住址(居住地) | |
| 219 | + String liveAddress = CommonsHelper.getResidence(p.getProvinceRegisterId(), p.getCityRegisterId(), | |
| 220 | + p.getAreaRegisterId(), p.getStreetRegisterId(), p.getAddressRegister(), basicConfigService); | |
| 221 | 221 | tempMap.put("liveAddress", liveAddress); |
| 222 | 222 | |
| 223 | 223 | rest.add(tempMap); |
| ... | ... | @@ -242,6 +242,7 @@ |
| 242 | 242 | cnames.put("reviewHospitalCount", "本院复查次数"); |
| 243 | 243 | cnames.put("doctorName", "检查医生"); |
| 244 | 244 | cnames.put("phone", "联系电话"); |
| 245 | + cnames.put("liveAddress", "现住址"); | |
| 245 | 246 | |
| 246 | 247 | List<Map<String,Object>> results = new ArrayList<>(); |
| 247 | 248 | if(CollectionUtils.isNotEmpty(datas)) { |
| ... | ... | @@ -258,6 +259,7 @@ |
| 258 | 259 | result.put("reviewHospitalCount", data.get("reviewHospitalCount")); |
| 259 | 260 | result.put("doctorName", data.get("doctorName")); |
| 260 | 261 | result.put("phone", data.get("phone")); |
| 262 | + result.put("liveAddress", data.get("liveAddress")); | |
| 261 | 263 | results.add(result); |
| 262 | 264 | } |
| 263 | 265 | } |