From becc353127bd8f4480917c51380b1ed6392dbc53 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 29 Apr 2016 10:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/Patients.java | 28 +++++++++ .../operate/web/facade/BabyManagerFacade.java | 6 +- .../platform/operate/web/facade/VisitFacade.java | 59 ++++++++++++------- .../operate/web/request/BabyVisitAddRequest.java | 47 +++++++++++++++ .../operate/web/request/VisitAddRequest.java | 45 ++++++++++++--- .../lyms/platform/operate/web/result/Address.java | 67 ++++++++++++++++++++++ .../operate/web/result/BabyVisitResult.java | 14 ++++- .../operate/web/result/PuerperaResult.java | 6 +- .../platform/operate/web/result/VisitResult.java | 23 ++------ 9 files changed, 241 insertions(+), 54 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 991a7a1..f87eb8c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -32,6 +32,34 @@ public class Patients extends BaseModel { * 地址 */ private String address; + private int provinceId; + private int cityId; + private int areaId; + + public int getAreaId() { + return areaId; + } + + public void setAreaId(int areaId) { + this.areaId = areaId; + } + + public int getCityId() { + return cityId; + } + + public void setCityId(int cityId) { + this.cityId = cityId; + } + + public int getProvinceId() { + return provinceId; + } + + public void setProvinceId(int provinceId) { + this.provinceId = provinceId; + } + /** * 社区id */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index e9a9f7f..2d9d1ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -189,7 +189,7 @@ public class BabyManagerFacade { } public BabyResult buildResult(Patients patients){ BabyResult babyResult = new BabyResult(); - String addr = ""; + /* String addr = ""; if (StringUtils.isNotEmpty(patients.getAddress())) { try { Map map = JsonUtil.str2Obj(patients.getAddress(), Map.class); @@ -197,8 +197,8 @@ public class BabyManagerFacade { } catch (Exception e) { addr = ""; } - } - babyResult.setAddress(addr); + }*/ + babyResult.setAddress(patients.getAddress()); babyResult.setCommunityId(StringUtils.isEmpty(patients.getCommunityId()) ? "" : patients.getCommunityId()); String comm="未分配"; 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 73e2063..90f45df 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 @@ -1,6 +1,9 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.*; +import com.lyms.platform.biz.service.BabyService; +import com.lyms.platform.biz.service.BabyVisitService; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.VisitService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -8,15 +11,16 @@ 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.BabyVisitResult.BabyVisit; import com.lyms.platform.operate.web.result.SimpleVisit; import com.lyms.platform.operate.web.result.VisitResult; +import com.lyms.platform.permission.service.RegionsService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabyVisitModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.VisitModel; -import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.VisitQuery; import org.apache.commons.collections.CollectionUtils; @@ -39,15 +43,14 @@ public class VisitFacade { private VisitService visitService; @Autowired - private PuerperaService puerperaService; - - @Autowired private BabyVisitService babyVisitService; @Autowired private BabyService babyService; @Autowired private PatientsService patientsService; + @Autowired + private RegionsService regionsService; /** * 根据产妇id获取产妇的访视信息 @@ -82,7 +85,7 @@ public class VisitFacade { private BaseObjectResponse doBiz(Patients puerperaModel) { VisitResult data = new VisitResult(); if (null != puerperaModel) { - data.convertToResult1(puerperaModel); + data.convertToResult1(puerperaModel, fullAddress(puerperaModel)); VisitQuery visitQuery = new VisitQuery(); visitQuery.setParentId(puerperaModel.getId()); List visits = visitService.queryVisit(visitQuery); @@ -100,6 +103,24 @@ public class VisitFacade { } /** + * 填充地址信息 + * + * @param puerperaModel + * @return + */ + private Address fullAddress(Patients puerperaModel) { + Address address = new Address(); + address.setAreaId(puerperaModel.getAreaId()); + 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()); + return address; + } + + /** * 根据身份证号码获取产妇信息 * * @param cardNo 身份证号码 @@ -125,9 +146,6 @@ public class VisitFacade { // 获取患者id String parentId = visitRequest.getParentId(); if (StringUtils.isNotEmpty(parentId)) { - /* PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); - puerperaQuery.setId(parentId); - PuerperaModel model;*/ Patients model; PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(parentId); @@ -181,6 +199,7 @@ public class VisitFacade { } else { babyVisitService.updateOneBabyVisit(babyVisitAddRequest.convertToDataModel(), babyVisitAddRequest.getId()); } + patientsService.updatePatient(babyVisitAddRequest.getPatients()); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -209,28 +228,26 @@ public class VisitFacade { } private BaseObjectResponse findBabyVisit(Patients puerperaModel) { - BabyModelQuery babyQuery = new BabyModelQuery(); +/* BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setParentId(puerperaModel.getId()); babyQuery.setYn(YnEnums.YES.getId()); - List babies = babyService.queryBabyWithQuery(babyQuery); + List babies = babyService.queryBabyWithQuery(babyQuery);*/ BabyVisitResult babyVisitResult = new BabyVisitResult(); List data = new ArrayList(); - for (BabyModel bModel : babies) { - // 根据产妇id查询该产妇下的小孩访视 - List babyVisits = babyVisitService.findAllVisitByParentId(bModel.getId()); + // 根据产妇id查询该产妇下的小孩访视 + List babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId()); - // 数据转换 + // 数据转换 - for (BabyVisitModel visit : babyVisits) { - BabyVisit babyVisit = babyVisitResult.new BabyVisit(); - // 转换小孩的访视数据 - data.add(babyVisit.convertToResult(visit)); - } + for (BabyVisitModel visit : babyVisits) { + BabyVisit babyVisit = babyVisitResult.new BabyVisit(); + // 转换小孩的访视数据 + data.add(babyVisit.convertToResult(visit)); } // TODO 需要转换成具体的result对象 // 设置产妇的信息 - babyVisitResult.convertToResult1(puerperaModel); + babyVisitResult.convertToResult1(puerperaModel,fullAddress(puerperaModel)); babyVisitResult.setData(data); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index 63b0b04..3f38d17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -4,6 +4,9 @@ import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.BabyVisitModel; +import com.lyms.platform.pojo.Patients; + +import java.util.Date; @Form public class BabyVisitAddRequest implements IBasicRequestConvert { @@ -12,6 +15,41 @@ public class BabyVisitAddRequest implements IBasicRequestConvert */ private String parentId; + + private String address; + + private int provinceId; + private int cityId; + private int areaId; + + public void setAddress(String address) { + this.address = address; + } + + public int getAreaId() { + return areaId; + } + + public void setAreaId(int areaId) { + this.areaId = areaId; + } + + public int getCityId() { + return cityId; + } + + public void setCityId(int cityId) { + this.cityId = cityId; + } + + public int getProvinceId() { + return provinceId; + } + + public void setProvinceId(int provinceId) { + this.provinceId = provinceId; + } + // 名称 private String name; @@ -697,4 +735,13 @@ public class BabyVisitAddRequest implements IBasicRequestConvert babyVisitModel.setId(id); return babyVisitModel; } + public Patients getPatients(){ + Patients patients = new Patients(); + patients.setId(parentId); + patients.setAddress(address); + patients.setAreaId(areaId); + patients.setCityId(cityId); + patients.setProvinceId(provinceId); + return patients; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java index 5f1bcd2..1822183 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java @@ -74,7 +74,39 @@ public class VisitAddRequest { /** * 地址 */ - private Map address; + private String address; + + private int provinceId; + private int cityId; + private int areaId; + + public void setAddress(String address) { + this.address = address; + } + + public int getAreaId() { + return areaId; + } + + public void setAreaId(int areaId) { + this.areaId = areaId; + } + + public int getCityId() { + return cityId; + } + + public void setCityId(int cityId) { + this.cityId = cityId; + } + + public int getProvinceId() { + return provinceId; + } + + public void setProvinceId(int provinceId) { + this.provinceId = provinceId; + } // 产妇基本信息 end /** @@ -232,13 +264,7 @@ public class VisitAddRequest { this.address = address; }*/ - public Map getAddress() { - return address; - } - public void setAddress(Map address) { - this.address = address; - } public String getNumOfLive() { return numOfLive; @@ -454,7 +480,10 @@ public class VisitAddRequest { patients.setDueDate(new Date()); patients.setDeliverOrg(deliverOrg); patients.setDueType(dueType); - patients.setAddress(JsonUtil.obj2JsonString(address)); + patients.setAddress(address); + patients.setAreaId(areaId); + patients.setCityId(cityId); + patients.setProvinceId(provinceId); return patients; } 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 new file mode 100644 index 0000000..9b445f5 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java @@ -0,0 +1,67 @@ +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 String address; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public Integer getAreaId() { + return areaId; + } + + public void setAreaId(Integer areaId) { + this.areaId = areaId; + } + + public String getCity() { + return city; + } + + public void setCity(String 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() { + return province; + } + + public void setProvince(String 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/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java index 08e7427..7f1811d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java @@ -29,6 +29,8 @@ public class BabyVisitResult implements IBasicResultConvert data; @@ -72,6 +74,14 @@ public class BabyVisitResult implements IBasicResultConvert data; @@ -85,11 +85,11 @@ public class VisitResult { this.deliverOrg = deliverOrg; } - public Map getAddress() { + public Address getAddress() { return address; } - public void setAddress(Map address) { + public void setAddress(Address address) { this.address = address; } @@ -101,21 +101,10 @@ public class VisitResult { this.data = data; } - public void convertToResult(PuerperaModel model) { - try { - setAddress(JsonUtil.str2Obj(model.getAddress(), Map.class)); - } catch (Exception e) { - } - setAge(model.getAge()); - setCardNo(model.getCardNo()); - setDeliverOrg(model.getDeliverOrg()); - setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); - setDueType(model.getDueType()); - setName(model.getName()); - } - public void convertToResult1(Patients model) { + + public void convertToResult1(Patients model,Address address) { try { - setAddress(JsonUtil.str2Obj(model.getAddress(), Map.class)); + setAddress(address); } catch (Exception e) { } -- 1.8.3.1