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 cd4e14e..c4880a9 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 @@ -133,6 +133,16 @@ public class Patients extends BaseModel { private String hcityRegisterId; private String hareaRegisterId; private String hstreetRegisterId; + /** + * 丈夫居住地 + */ + private String hprovinceId; + private String hcityId; + private String hareaId; + private String hstreetId; + private String hvillage; + private String haddress; + /******add by lqy end *********/ /** * 孕妇户籍地址 @@ -428,6 +438,54 @@ public class Patients extends BaseModel { //秦皇岛-有居住证 填写字段 private String liveCardNo; + public String getHprovinceId() { + return hprovinceId; + } + + public void setHprovinceId(String hprovinceId) { + this.hprovinceId = hprovinceId; + } + + public String getHcityId() { + return hcityId; + } + + public void setHcityId(String hcityId) { + this.hcityId = hcityId; + } + + public String getHareaId() { + return hareaId; + } + + public void setHareaId(String hareaId) { + this.hareaId = hareaId; + } + + public String getHstreetId() { + return hstreetId; + } + + public void setHstreetId(String hstreetId) { + this.hstreetId = hstreetId; + } + + public String getHvillage() { + return hvillage; + } + + public void setHvillage(String hvillage) { + this.hvillage = hvillage; + } + + public String getHaddress() { + return haddress; + } + + public void setHaddress(String haddress) { + this.haddress = haddress; + } + public String getLiveCardNo() { return liveCardNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index b4d3a37..7ab30ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1886,6 +1886,14 @@ public class BookbuildingFacade { patient.setHcityRegisterId(""); patient.setHareaRegisterId(""); patient.setHstreetRegisterId(""); + //丈夫居住地 + patient.setHprovinceId(""); + patient.setHcityId(""); + patient.setHareaId(""); + patient.setHstreetId(""); + patient.setHvillage(""); + patient.setHaddress(""); + patient.setHlevelTypeId(""); patient.setHusbandBirth(null); if (StringUtils.isNotEmpty(yunRequest.getId())) @@ -1929,6 +1937,19 @@ public class BookbuildingFacade { patient.setHcityRegisterId(yunRequest.getHusbandCityRegisterId()); patient.setHareaRegisterId(yunRequest.getHusbandAreaRegisterId()); patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId()); + //丈夫居住地 + patient.setHprovinceId(yunRequest.getHprovinceId()); + patient.setHcityId(yunRequest.getHcityId()); + patient.setHareaId(yunRequest.getHareaId()); + patient.setHstreetId(yunRequest.getHstreetId()); + patient.setHaddress(yunRequest.getHaddress()); + //增加村字段这里为了全局展示拼接到Address详细字段中 + if(StringUtils.isNotEmpty(yunRequest.getHvillage())){ + patient.setHaddress(yunRequest.getHvillage()+yunRequest.getHaddress()); + } + //村字段，出生证明需要用必填 + patient.setHvillage(yunRequest.getHvillage()); + patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); } @@ -2164,6 +2185,28 @@ public class BookbuildingFacade { result.setHusbandAreaRegisterId(p.getHareaRegisterId()); result.setHusbandStreetRegisterId(p.getHstreetRegisterId()); + //丈夫居住地 + result.setHprovinceId(p.getHprovinceId()); + result.setHcityId(p.getHcityId()); + result.setHareaId(p.getHareaId()); + result.setHstreetId(p.getHstreetId()); + String hvillage="";//村 + String haddress="";//详细地址 + if(StringUtils.isNotEmpty(p.getHaddress())){ + haddress=p.getHaddress(); + } + //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。 + if (StringUtils.isNotEmpty(p.getHvillage())) { + hvillage=p.getHvillage(); + if(StringUtils.isNotEmpty(haddress) && + haddress.length()>hvillage.length()){ + haddress=haddress.substring(hvillage.length()); + } + } + result.setHvillage(hvillage); + result.setHaddress(haddress); + + result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus())); result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime())); result.setExpVip(p.getExpVip()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 762b816..3994f7c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -468,6 +468,10 @@ public class ViewFacade { map.put("hregister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(), data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(), basicConfigService)); + //丈夫居住地 + map.put("hresidence", CommonsHelper.getResidence(data.getHprovinceId(), data.getHcityId(), + data.getHareaId(), data.getHstreetId(), data.getHaddress(), + basicConfigService)); /* 院内信息 */ map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index d91a3fb..ef3c798 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -74,18 +74,7 @@ public class YunBookbuildingAddRequest { //秦皇岛-有居住证 填写字段 private String liveCardNo; - /** - * 村 - */ - private String villageRegister; - - public String getVillageRegister() { - return villageRegister; - } - public void setVillageRegister(String villageRegister) { - this.villageRegister = villageRegister; - } public String getLiveCardNo() { return liveCardNo; @@ -340,6 +329,10 @@ public class YunBookbuildingAddRequest { private String pregnantCensusCityId; private String pregnantCensusAreaId; private String pregnantCensusStreetId; + /** + * 母亲居住地-村 + */ + private String villageRegister; //户籍地址 @@ -390,6 +383,15 @@ public class YunBookbuildingAddRequest { private String husbandAreaRegisterId; private String husbandStreetRegisterId; + /** + * 丈夫居住地 + */ + private String hprovinceId; + private String hcityId; + private String hareaId; + private String hstreetId; + private String hvillage; + private String haddress; /***********丈夫信息***********/ /***********院内信息***********/ @@ -520,6 +522,62 @@ public class YunBookbuildingAddRequest { //丈夫年龄 private Integer hmarriageAge; + public String getVillageRegister() { + return villageRegister; + } + + public void setVillageRegister(String villageRegister) { + this.villageRegister = villageRegister; + } + + public String getHprovinceId() { + return hprovinceId; + } + + public void setHprovinceId(String hprovinceId) { + this.hprovinceId = hprovinceId; + } + + public String getHcityId() { + return hcityId; + } + + public void setHcityId(String hcityId) { + this.hcityId = hcityId; + } + + public String getHareaId() { + return hareaId; + } + + public void setHareaId(String hareaId) { + this.hareaId = hareaId; + } + + public String getHstreetId() { + return hstreetId; + } + + public void setHstreetId(String hstreetId) { + this.hstreetId = hstreetId; + } + + public String getHvillage() { + return hvillage; + } + + public void setHvillage(String hvillage) { + this.hvillage = hvillage; + } + + public String getHaddress() { + return haddress; + } + + public void setHaddress(String haddress) { + this.haddress = haddress; + } + public String getIsYyzyfmHospital() { return isYyzyfmHospital; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 29a253d..b674b58 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -341,6 +341,14 @@ public class PregnantInfoResult { private String husbandAreaRegisterId; private String husbandStreetRegisterId; + //居住地 + private String hprovinceId; + private String hcityId; + private String hareaId; + private String hstreetId; + private String hvillage; + private String haddress; + /***********丈夫信息***********/ /***********院内信息***********/ @@ -461,6 +469,54 @@ public class PregnantInfoResult { this.villageRegister = villageRegister; } + public String getHprovinceId() { + return hprovinceId; + } + + public void setHprovinceId(String hprovinceId) { + this.hprovinceId = hprovinceId; + } + + public String getHcityId() { + return hcityId; + } + + public void setHcityId(String hcityId) { + this.hcityId = hcityId; + } + + public String getHareaId() { + return hareaId; + } + + public void setHareaId(String hareaId) { + this.hareaId = hareaId; + } + + public String getHstreetId() { + return hstreetId; + } + + public void setHstreetId(String hstreetId) { + this.hstreetId = hstreetId; + } + + public String getHvillage() { + return hvillage; + } + + public void setHvillage(String hvillage) { + this.hvillage = hvillage; + } + + public String getHaddress() { + return haddress; + } + + public void setHaddress(String haddress) { + this.haddress = haddress; + } + public String getLiveCardNo() { return liveCardNo; }