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 c34a653..b3d6b0e 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 @@ -11,11 +11,8 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.request.BabyVisitAddRequest; import com.lyms.platform.operate.web.request.VisitAddRequest; import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera; -import com.lyms.platform.operate.web.result.Address; -import com.lyms.platform.operate.web.result.BabyVisitResult; +import com.lyms.platform.operate.web.result.*; 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; @@ -111,22 +108,21 @@ public class VisitFacade { */ private Address fullAddress(Patients puerperaModel) { Address address = new Address(); - address.setAreaId(puerperaModel.getAreaId()); - address.setCityId(puerperaModel.getCityId()); - address.setProvinceId(puerperaModel.getProvinceId()); - address.setArea(getName(puerperaModel.getAreaId())); address.setCity(getName(puerperaModel.getCityId())); address.setProvince(getName(puerperaModel.getProvinceId())); return address; } - private String getName(int id) { + private AddressInner getName(int id) { + AddressInner addressInner= new AddressInner(); + addressInner.setId(id); Regions regions = regionsService.getRegions(id); if (null == regions) { - return ""; + return addressInner; } - return regions.getRegionName(); + addressInner.setName(regions.getRegionName()); + return addressInner; } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java index 9b445f5..c200576 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java @@ -1,67 +1,41 @@ package com.lyms.platform.operate.web.result; public class Address { - private Integer provinceId; - private Integer cityId; - private Integer areaId; - private String province; - private String city; - private String area; + + private AddressInner province; + private AddressInner city; + private AddressInner area; private String address; - public String getArea() { - return area; + public String getAddress() { + return address; } - public void setArea(String area) { - this.area = area; + public void setAddress(String address) { + this.address = address; } - public Integer getAreaId() { - return areaId; + public AddressInner getArea() { + return area; } - public void setAreaId(Integer areaId) { - this.areaId = areaId; + public void setArea(AddressInner area) { + this.area = area; } - public String getCity() { + public AddressInner getCity() { return city; } - public void setCity(String city) { + public void setCity(AddressInner city) { this.city = city; } - public Integer getCityId() { - return cityId; - } - - public void setCityId(Integer cityId) { - this.cityId = cityId; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getProvince() { + public AddressInner getProvince() { return province; } - public void setProvince(String province) { + public void setProvince(AddressInner province) { this.province = province; } - - public Integer getProvinceId() { - return provinceId; - } - - public void setProvinceId(Integer provinceId) { - this.provinceId = provinceId; - } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java new file mode 100644 index 0000000..5b0a87d --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java @@ -0,0 +1,25 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2016/4/29 0029. + */ +public class AddressInner { + private int id; + private String name; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}