From 63eceabebf859a1dffc45f203a85df23da9f345e Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 9 Sep 2022 10:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8D=AB2.0-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=95=E4=BA=A7=E7=99=BB=E8=AE=B0(=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=95=E4=BA=A7=E5=A6=87=E6=A1=A3=E6=A1=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/Patients.java | 44 +++++++++++++++++++++
 .../operate/web/facade/BookbuildingFacade.java     |  5 +++
 .../platform/operate/web/facade/ViewFacade.java    |  4 ++
 .../web/request/YunBookbuildingAddRequest.java     | 45 ++++++++++++++++++++++
 4 files changed, 98 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 f920dfe..777e4e6 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
@@ -472,6 +472,50 @@ public class Patients extends BaseModel {
     //归属地id
     private String addressId;
 
+    /**
+     * 公卫2.0-新增孕产登记
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //手工结案原因
+    private String closeCaseReason;
+    //手工结案代码 0否 1是
+    private String closeCaseCode;
+    //是否建册
+    private String buildingManualCode;
+
+    public Integer getIsAppCreate() {
+        return isAppCreate;
+    }
+
+    public void setIsAppCreate(Integer isAppCreate) {
+        this.isAppCreate = isAppCreate;
+    }
+
+    public String getCloseCaseReason() {
+        return closeCaseReason;
+    }
+
+    public void setCloseCaseReason(String closeCaseReason) {
+        this.closeCaseReason = closeCaseReason;
+    }
+
+    public String getCloseCaseCode() {
+        return closeCaseCode;
+    }
+
+    public void setCloseCaseCode(String closeCaseCode) {
+        this.closeCaseCode = closeCaseCode;
+    }
+
+    public String getBuildingManualCode() {
+        return buildingManualCode;
+    }
+
+    public void setBuildingManualCode(String buildingManualCode) {
+        this.buildingManualCode = buildingManualCode;
+    }
+
     public String getOrgName() {
         return orgName;
     }
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 9eacdfa..f04f016 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
@@ -2088,6 +2088,11 @@ public class BookbuildingFacade {
         patient.setContactCertTypeId(yunRequest.getContactCertTypeId());
         patient.setContactName(yunRequest.getContactName());
         patient.setContactPhone(yunRequest.getContactPhone());
+        patient.setIsAppCreate(yunRequest.getIsAppCreate());
+        patient.setCloseCaseReason(yunRequest.getCloseCaseReason());
+        patient.setCloseCaseCode(yunRequest.getCloseCaseCode());
+        patient.setBuildingManualCode(yunRequest.getBuildingManualCode());
+
         return patient;
     }
 
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 aaae5f3..de9e13a 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
@@ -584,6 +584,10 @@ public class ViewFacade {
         map.put("contactCertType", getBasicConfig(data.getContactCertTypeId()));
         map.put("contactCertNo", data.getContactCertNo());
         map.put("contactPhone", data.getContactPhone());
+        map.put("isAppCreate", data.getIsAppCreate());
+        map.put("closeCaseReason", data.getCloseCaseReason());
+        map.put("closeCaseCode", data.getCloseCaseCode());
+        map.put("buildingManualCode", data.getBuildingManualCode());
 
         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 3623b23..d4f7676 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
@@ -573,6 +573,51 @@ public class YunBookbuildingAddRequest {
     //联系人证件号码
     private String contactCertNo;
 
+
+    /**
+     * 公卫2.0-新增孕产登记
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //手工结案原因
+    private String closeCaseReason;
+    //手工结案代码 0否 1是
+    private String closeCaseCode;
+    //是否建册
+    private String buildingManualCode;
+
+    public Integer getIsAppCreate() {
+        return isAppCreate;
+    }
+
+    public void setIsAppCreate(Integer isAppCreate) {
+        this.isAppCreate = isAppCreate;
+    }
+
+    public String getCloseCaseReason() {
+        return closeCaseReason;
+    }
+
+    public void setCloseCaseReason(String closeCaseReason) {
+        this.closeCaseReason = closeCaseReason;
+    }
+
+    public String getCloseCaseCode() {
+        return closeCaseCode;
+    }
+
+    public void setCloseCaseCode(String closeCaseCode) {
+        this.closeCaseCode = closeCaseCode;
+    }
+
+    public String getBuildingManualCode() {
+        return buildingManualCode;
+    }
+
+    public void setBuildingManualCode(String buildingManualCode) {
+        this.buildingManualCode = buildingManualCode;
+    }
+
     public String getContactName() {
         return contactName;
     }
-- 
1.8.3.1