diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 90f45df..c34a653 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -16,6 +16,7 @@ import com.lyms.platform.operate.web.result.BabyVisitResult; import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; import com.lyms.platform.operate.web.result.SimpleVisit; import com.lyms.platform.operate.web.result.VisitResult; +import com.lyms.platform.permission.model.Regions; import com.lyms.platform.permission.service.RegionsService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabyVisitModel; @@ -114,12 +115,20 @@ public class VisitFacade { address.setCityId(puerperaModel.getCityId()); address.setProvinceId(puerperaModel.getProvinceId()); - address.setArea(regionsService.getRegions(puerperaModel.getAreaId()).getRegionName()); - address.setCity(regionsService.getRegions(puerperaModel.getCityId()).getRegionName()); - address.setProvince(regionsService.getRegions(puerperaModel.getProvinceId()).getRegionName()); + address.setArea(getName(puerperaModel.getAreaId())); + address.setCity(getName(puerperaModel.getCityId())); + address.setProvince(getName(puerperaModel.getProvinceId())); return address; } + private String getName(int id) { + Regions regions = regionsService.getRegions(id); + if (null == regions) { + return ""; + } + return regions.getRegionName(); + } + /** * 根据身份证号码获取产妇信息 * @@ -247,7 +256,7 @@ public class VisitFacade { // TODO 需要转换成具体的result对象 // 设置产妇的信息 - babyVisitResult.convertToResult1(puerperaModel,fullAddress(puerperaModel)); + babyVisitResult.convertToResult1(puerperaModel, fullAddress(puerperaModel)); babyVisitResult.setData(data); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult); }