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 88bf783..ca69ec4 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 @@ -1841,6 +1841,14 @@ public class BookbuildingFacade { //孕妇居住地 patient.setAddressRegister(yunRequest.getPregnantCensusAddr()); + + //增加村villageRegister字段这里为了全局展示拼接到Address详细字段中 + if(StringUtils.isNotEmpty(yunRequest.getVillageRegister())){ + patient.setAddressRegister(yunRequest.getVillageRegister()+yunRequest.getPregnantCensusAddr()); + } + //增加村字段,出生证明需要用必填 + patient.setVillageRegister(yunRequest.getVillageRegister()); + patient.setProvinceRegisterId(yunRequest.getPregnantCensusProvinceId()); patient.setCityRegisterId(yunRequest.getPregnantCensusCityId()); patient.setAreaRegisterId(yunRequest.getPregnantCensusAreaId()); @@ -2005,8 +2013,6 @@ public class BookbuildingFacade { patient.setPatientVerifName(yunRequest.getPatientVerifName()); patient.setHusVerifType(yunRequest.getHusVerifType()); patient.setLiveCardNo(yunRequest.getLiveCardNo()); - patient.setVillageRegister(yunRequest.getVillageRegister()); - return patient; } @@ -2110,6 +2116,12 @@ public class BookbuildingFacade { result.setPregnantCensusAreaId(p.getAreaRegisterId()); result.setPregnantCensusStreetId(p.getStreetRegisterId()); result.setPregnantCensusAddr(p.getAddressRegister()); + //增加村villageRegister字段这里为了全局展示拼接到Address详细字段中 + if(StringUtils.isNotEmpty(p.getVillageRegister())){ + result.setPregnantCensusAddr(p.getVillageRegister()+p.getAddressRegister()); + } + //增加村字段,出生证明需要用必填 + result.setVillageRegister(p.getVillageRegister()); result.setPregnantLiveProvinceId(p.getProvinceId()); result.setPregnantLiveCityId(p.getCityId()); @@ -2118,6 +2130,7 @@ public class BookbuildingFacade { result.setPregnantLiveAddr(p.getAddress()); + result.setChildbirthAddr(p.getAddressPostRest()); result.setChildbirthProvinceId(p.getProvincePostRestId()); result.setChildbirthCityId(p.getCityPostRestId()); @@ -2199,7 +2212,6 @@ public class BookbuildingFacade { result.setHusVerifType(p.getHusVerifType()); result.setHusbandName(p.getHusbandName()); result.setLiveCardNo(p.getLiveCardNo()); - result.setVillageRegister(p.getVillageRegister()); return result; }