Commit ca64c0e2fdbb49a2789c99dacaa8ba3fa65844b3
1 parent
5fde826d6e
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 15 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
ca64c0e
| ... | ... | @@ -2115,9 +2115,22 @@ |
| 2115 | 2115 | result.setPregnantCensusCityId(p.getCityRegisterId()); |
| 2116 | 2116 | result.setPregnantCensusAreaId(p.getAreaRegisterId()); |
| 2117 | 2117 | result.setPregnantCensusStreetId(p.getStreetRegisterId()); |
| 2118 | - result.setPregnantCensusAddr(p.getAddressRegister()); | |
| 2118 | + String villageRegister="";//村 | |
| 2119 | + String addressRegister="";//详细地址 | |
| 2120 | + if(StringUtils.isNotEmpty(p.getAddressRegister())){ | |
| 2121 | + addressRegister=p.getAddressRegister(); | |
| 2122 | + } | |
| 2123 | + //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。 | |
| 2124 | + if (StringUtils.isNotEmpty(p.getVillageRegister())) { | |
| 2125 | + villageRegister=p.getVillageRegister(); | |
| 2126 | + if(StringUtils.isNotEmpty(addressRegister) && | |
| 2127 | + addressRegister.length()>villageRegister.length()){ | |
| 2128 | + addressRegister=addressRegister.substring(villageRegister.length()); | |
| 2129 | + } | |
| 2130 | + } | |
| 2119 | 2131 | //增加村字段，出生证明需要用必填 |
| 2120 | - result.setVillageRegister(p.getVillageRegister()); | |
| 2132 | + result.setVillageRegister(villageRegister); | |
| 2133 | + result.setPregnantCensusAddr(addressRegister); | |
| 2121 | 2134 | |
| 2122 | 2135 | result.setPregnantLiveProvinceId(p.getProvinceId()); |
| 2123 | 2136 | result.setPregnantLiveCityId(p.getCityId()); |