From ca64c0e2fdbb49a2789c99dacaa8ba3fa65844b3 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 15 Apr 2022 15:09:48 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/BookbuildingFacade.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

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 e674b18..b4d3a37 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
@@ -2115,9 +2115,22 @@ public class BookbuildingFacade {
         result.setPregnantCensusCityId(p.getCityRegisterId());
         result.setPregnantCensusAreaId(p.getAreaRegisterId());
         result.setPregnantCensusStreetId(p.getStreetRegisterId());
-        result.setPregnantCensusAddr(p.getAddressRegister());
+        String villageRegister="";//村
+        String addressRegister="";//详细地址
+        if(StringUtils.isNotEmpty(p.getAddressRegister())){
+            addressRegister=p.getAddressRegister();
+        }
+        //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。
+        if (StringUtils.isNotEmpty(p.getVillageRegister())) {
+            villageRegister=p.getVillageRegister();
+            if(StringUtils.isNotEmpty(addressRegister) &&
+                    addressRegister.length()>villageRegister.length()){
+                addressRegister=addressRegister.substring(villageRegister.length());
+            }
+        }
         //增加村字段，出生证明需要用必填
-        result.setVillageRegister(p.getVillageRegister());
+        result.setVillageRegister(villageRegister);
+        result.setPregnantCensusAddr(addressRegister);
 
         result.setPregnantLiveProvinceId(p.getProvinceId());
         result.setPregnantLiveCityId(p.getCityId());
-- 
1.8.3.1