From 4706b541074457eb79ed658bb898427e3baa9472 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 14 Apr 2022 16:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=BB=BA=E6=A1=A3=E5=B1=85?=
 =?UTF-8?q?=E4=BD=8F=E5=9C=B0=E5=A2=9E=E5=8A=A0=20=E6=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/Patients.java       |  2 +-
 .../lyms/platform/operate/web/facade/BookbuildingFacade.java |  2 ++
 .../com/lyms/platform/operate/web/facade/ViewFacade.java     |  1 +
 .../operate/web/request/YunBookbuildingAddRequest.java       | 12 ++++++++++++
 .../operate/web/result/PatientManagerQueryModel.java         | 12 ++++++++++++
 .../lyms/platform/operate/web/result/PregnantInfoResult.java | 12 ++++++++++++
 6 files changed, 40 insertions(+), 1 deletion(-)

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 6489a7f..cd4e14e 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
@@ -176,7 +176,7 @@ public class Patients extends BaseModel {
     private String areaRegisterId;
     private String streetRegisterId;
     /**
-     * 村
+     * 居住地 村
      */
     private String villageRegister;
 
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 d8f01a6..88bf783 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
@@ -2005,6 +2005,7 @@ public class BookbuildingFacade {
         patient.setPatientVerifName(yunRequest.getPatientVerifName());
         patient.setHusVerifType(yunRequest.getHusVerifType());
         patient.setLiveCardNo(yunRequest.getLiveCardNo());
+        patient.setVillageRegister(yunRequest.getVillageRegister());
 
 
         return patient;
@@ -2198,6 +2199,7 @@ public class BookbuildingFacade {
         result.setHusVerifType(p.getHusVerifType());
         result.setHusbandName(p.getHusbandName());
         result.setLiveCardNo(p.getLiveCardNo());
+        result.setVillageRegister(p.getVillageRegister());
 
         return result;
     }
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 7fe811f..d75840a 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
@@ -560,6 +560,7 @@ public class ViewFacade {
         map.put("husVerifType",  StringUtils.isNotEmpty(data.getHusVerifType())  ? ("1".equals(data.getHusVerifType()) ? "自动核验": "人工核验") : "未验证");
         map.put("husVerifName", data.getHusVerifName());
         map.put("liveCardNo", data.getLiveCardNo());
+        map.put("villageRegister", data.getVillageRegister());
 
         return map;
     }
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 5e071f8..d91a3fb 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,6 +74,18 @@ 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;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
index b5ebb7d..008af4b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
@@ -104,6 +104,18 @@ public class PatientManagerQueryModel {
     private String liveCardNo;
     //预约住院分娩医院(滦平定制)
     private String yyzyfmHospitalName;
+    /**
+     * 村
+     */
+    private String villageRegister;
+
+    public String getVillageRegister() {
+        return villageRegister;
+    }
+
+    public void setVillageRegister(String villageRegister) {
+        this.villageRegister = villageRegister;
+    }
 
     public String getYyzyfmHospitalName() {
         return yyzyfmHospitalName;
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 42eb978..29a253d 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
@@ -448,6 +448,18 @@ public class PregnantInfoResult {
 
     //秦皇岛-有居住证 填写字段
     private String liveCardNo;
+    /**
+     * 村
+     */
+    private String villageRegister;
+
+    public String getVillageRegister() {
+        return villageRegister;
+    }
+
+    public void setVillageRegister(String villageRegister) {
+        this.villageRegister = villageRegister;
+    }
 
     public String getLiveCardNo() {
         return liveCardNo;
-- 
1.8.3.1