From 97a0bca3b79086d9ffbb3b5c3874d31c49a2afb4 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 10 Jun 2022 10:53:50 +0800
Subject: [PATCH] =?UTF-8?q?2022-6-10=20=E5=87=BA=E7=94=9F=E8=AF=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5D301-=E6=96=B0=E5=8A=A08?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/Patients.java |  1 +
 .../operate/web/facade/BookbuildingFacade.java     | 33 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

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 5e7d55c..550420c 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
@@ -140,6 +140,7 @@ public class Patients extends BaseModel {
     private String hcityId;
     private String hareaId;
     private String hstreetId;
+    //村
     private String hvillage;
     private String haddress;
 
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 c82b684..de39e17 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
@@ -3401,6 +3401,39 @@ public class BookbuildingFacade {
             map.put("FQHJQHDM", organizationService.getAreaCode(FQHJQX));
             //父 亲 住 址 行 政 区 划 代 码
             map.put("FQ_ZZXZQHDM", organizationService.getAreaCode(FQZZQX));
+
+            /**2022-6-10 新加8个字段 **/
+            //母亲户籍所在地-乡镇/街道
+            String MQHJXZ = CommonsHelper.getName1(patient.getStreetId(), basicConfigService);
+            map.put("MQHJXZ", StringUtils.isEmpty(MQHJXZ) ? "/" : MQHJXZ);
+            //母亲户籍所在地-村/居委会
+            map.put("MQHJCUN", "/");
+            //母亲户籍所在地-门牌号
+            map.put("MQHJMPH", StringUtils.isEmpty(patient.getAddress()) ? "/" : patient.getAddress());
+            //父亲户籍所在地-乡镇/街道
+            String FQHJXZ = CommonsHelper.getName1(patient.getHstreetRegisterId(), basicConfigService);
+            map.put("FQHJXZ", StringUtils.isEmpty(FQHJXZ) ? "/" : FQHJXZ);
+            //父亲户籍所在地-村/居委会
+            map.put("FQHJCUN", "/");
+            //父亲户籍所在地-门牌号
+            map.put("FQHJMPH", StringUtils.isEmpty(patient.getHaddressRegister()) ? "/" : patient.getHaddressRegister());
+            //母亲证面地址详情，必填。单亲无母亲信息填“/”(出生证上面取得是户籍地)
+            String MQZMDZXQ="/";
+            if(StringUtils.isNotEmpty(patient.getProvinceId()) && StringUtils.isNotEmpty(patient.getCityId()) &&
+                    StringUtils.isNotEmpty(patient.getAreaId()) && StringUtils.isNotEmpty(patient.getStreetId()) &&
+                    StringUtils.isNotEmpty(patient.getAddress())){
+                MQZMDZXQ= CommonsHelper.getResidence(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId(), patient.getAddress(), basicConfigService);
+            }
+            map.put("MQZMDZXQ",MQZMDZXQ);
+            //父亲证面地址详情，必填，单亲无父亲信息填“/”(出生证上面取得是户籍地)
+            String FQZMDZXQ="/";
+            if(StringUtils.isNotEmpty(patient.getHprovinceRegisterId()) && StringUtils.isNotEmpty(patient.getHcityRegisterId()) &&
+                    StringUtils.isNotEmpty(patient.getHareaRegisterId()) && StringUtils.isNotEmpty(patient.getHstreetRegisterId()) &&
+                    StringUtils.isNotEmpty(patient.getHaddressRegister())){
+                FQZMDZXQ= CommonsHelper.getResidence(patient.getHprovinceRegisterId(), patient.getHcityRegisterId(), patient.getHareaRegisterId(), patient.getHstreetRegisterId(), patient.getHaddressRegister(), basicConfigService);
+            }
+            map.put("FQZMDZXQ",null);
+
         }
         return map;
     }
-- 
1.8.3.1