Commit cb61a07cfbde4cde66c60edb6eb441e8a9cfbfed
1 parent
c68123018a
Exists in
master
and in
1 other branch
增加权限
Showing 1 changed file with 13 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
View file @
cb61a07
| ... | ... | @@ -16,6 +16,7 @@ |
| 16 | 16 | import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; |
| 17 | 17 | import com.lyms.platform.operate.web.result.SimpleVisit; |
| 18 | 18 | import com.lyms.platform.operate.web.result.VisitResult; |
| 19 | +import com.lyms.platform.permission.model.Regions; | |
| 19 | 20 | import com.lyms.platform.permission.service.RegionsService; |
| 20 | 21 | import com.lyms.platform.pojo.BabyModel; |
| 21 | 22 | import com.lyms.platform.pojo.BabyVisitModel; |
| 22 | 23 | |
| ... | ... | @@ -114,12 +115,20 @@ |
| 114 | 115 | address.setCityId(puerperaModel.getCityId()); |
| 115 | 116 | address.setProvinceId(puerperaModel.getProvinceId()); |
| 116 | 117 | |
| 117 | - address.setArea(regionsService.getRegions(puerperaModel.getAreaId()).getRegionName()); | |
| 118 | - address.setCity(regionsService.getRegions(puerperaModel.getCityId()).getRegionName()); | |
| 119 | - address.setProvince(regionsService.getRegions(puerperaModel.getProvinceId()).getRegionName()); | |
| 118 | + address.setArea(getName(puerperaModel.getAreaId())); | |
| 119 | + address.setCity(getName(puerperaModel.getCityId())); | |
| 120 | + address.setProvince(getName(puerperaModel.getProvinceId())); | |
| 120 | 121 | return address; |
| 121 | 122 | } |
| 122 | 123 | |
| 124 | + private String getName(int id) { | |
| 125 | + Regions regions = regionsService.getRegions(id); | |
| 126 | + if (null == regions) { | |
| 127 | + return ""; | |
| 128 | + } | |
| 129 | + return regions.getRegionName(); | |
| 130 | + } | |
| 131 | + | |
| 123 | 132 | /** |
| 124 | 133 | * 根据身份证号码获取产妇信息 |
| 125 | 134 | * |
| ... | ... | @@ -247,7 +256,7 @@ |
| 247 | 256 | |
| 248 | 257 | // TODO 需要转换成具体的result对象 |
| 249 | 258 | // 设置产妇的信息 |
| 250 | - babyVisitResult.convertToResult1(puerperaModel,fullAddress(puerperaModel)); | |
| 259 | + babyVisitResult.convertToResult1(puerperaModel, fullAddress(puerperaModel)); | |
| 251 | 260 | babyVisitResult.setData(data); |
| 252 | 261 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult); |
| 253 | 262 | } |