From 3edbc1640e9875254056ba5c981f9df75ff4f54f Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 8 Sep 2022 15:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8D=AB2.0-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E5=AE=B6=E5=BA=AD=E8=AE=BF=E8=A7=86?=
 =?UTF-8?q?=EF=BC=88=E6=96=B0=E7=94=9F=E5=84=BF=E8=AE=BF=E8=A7=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/NewbornVisit.java  | 94 ++++++++++++++++++++++
 .../web/service/impl/NewbornServiceImpl.java       | 11 +++
 2 files changed, 105 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
index 9fe3b5d..4246b1f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
@@ -173,6 +173,100 @@ public class NewbornVisit {
     private String newZx; //新生儿窒息
     private Integer malformation; //畸形
 
+    /**
+     *公卫2.0-新增新生儿家庭访视
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //国家规范版本号
+    private String standard;
+    //新生儿性别代码
+    private String newbornSexCode;
+    //新生儿身份证号码
+    private String newbornIdNo;
+    //新生儿出生日期
+    private String newbornBirthDate;
+    //母亲姓名
+    private String motherName;
+    //母亲职业类别名称
+    private String motherOccupName;
+    //母亲电话号码
+    private String motherTelNo;
+    //母亲出生日期
+    private String motherBirthDate;
+
+    public Integer getIsAppCreate() {
+        return isAppCreate;
+    }
+
+    public void setIsAppCreate(Integer isAppCreate) {
+        this.isAppCreate = isAppCreate;
+    }
+
+    public String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
+
+    public String getNewbornSexCode() {
+        return newbornSexCode;
+    }
+
+    public void setNewbornSexCode(String newbornSexCode) {
+        this.newbornSexCode = newbornSexCode;
+    }
+
+    public String getNewbornIdNo() {
+        return newbornIdNo;
+    }
+
+    public void setNewbornIdNo(String newbornIdNo) {
+        this.newbornIdNo = newbornIdNo;
+    }
+
+    public String getNewbornBirthDate() {
+        return newbornBirthDate;
+    }
+
+    public void setNewbornBirthDate(String newbornBirthDate) {
+        this.newbornBirthDate = newbornBirthDate;
+    }
+
+    public String getMotherName() {
+        return motherName;
+    }
+
+    public void setMotherName(String motherName) {
+        this.motherName = motherName;
+    }
+
+    public String getMotherOccupName() {
+        return motherOccupName;
+    }
+
+    public void setMotherOccupName(String motherOccupName) {
+        this.motherOccupName = motherOccupName;
+    }
+
+    public String getMotherTelNo() {
+        return motherTelNo;
+    }
+
+    public void setMotherTelNo(String motherTelNo) {
+        this.motherTelNo = motherTelNo;
+    }
+
+    public String getMotherBirthDate() {
+        return motherBirthDate;
+    }
+
+    public void setMotherBirthDate(String motherBirthDate) {
+        this.motherBirthDate = motherBirthDate;
+    }
+
     public Integer getCsWeek() {
         return csWeek;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index 2317ec3..95d6525 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -497,6 +497,17 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
             restMap.put("skinOther", newbornVisit.getSkinOther() == null ? "" : newbornVisit.getSkinOther());
             restMap.put("complexionOther", newbornVisit.getComplexionOther() == null ? "" : newbornVisit.getComplexionOther());
             restMap.put("umbilicalCordOther", newbornVisit.getUmbilicalCordOther() == null ? "" : newbornVisit.getUmbilicalCordOther());
+            /** 公卫2.0-新增新生儿家庭访视 */
+            restMap.put("isAppCreate", newbornVisit.getIsAppCreate());
+            restMap.put("standard", newbornVisit.getStandard());
+            restMap.put("newbornSexCode", newbornVisit.getNewbornSexCode());
+            restMap.put("newbornIdNo", newbornVisit.getNewbornIdNo());
+            restMap.put("newbornBirthDate", newbornVisit.getNewbornBirthDate());
+            restMap.put("motherName", newbornVisit.getMotherName());
+            restMap.put("motherOccupName", newbornVisit.getMotherOccupName());
+            restMap.put("motherTelNo", newbornVisit.getMotherTelNo());
+            restMap.put("motherBirthDate", newbornVisit.getMotherBirthDate());
+
             return RespBuilder.buildSuccess(restMap);
         }
         return RespBuilder.buildSuccess();
-- 
1.8.3.1