From 11c4a6fff43515018cdd1cebe53a4bca2ca2fb3f Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 13 Sep 2022 11:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8D=AB2.0-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=9D=9E=E9=A6=96=E6=AC=A1=E4=BA=A7=E5=89=8D=E9=9A=8F=E8=AE=BF?=
 =?UTF-8?q?(=E4=BA=A7=E5=89=8D=E6=A3=80=E6=9F=A5=E5=A4=8D=E8=AF=8A)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/pojo/AntenatalExaminationModel.java   | 54 ++++++++++++++++++++
 .../platform/operate/web/facade/ViewFacade.java    |  6 +++
 .../operate/web/request/AntExAddRequest.java       | 58 ++++++++++++++++++++++
 .../web/result/AntenatalExaminationResult.java     | 58 ++++++++++++++++++++++
 4 files changed, 176 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
index 748beb3..c6ecabb 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
@@ -407,6 +407,60 @@ public class AntenatalExaminationModel extends BaseModel {
     private Integer jmxsScore;
     private Integer jmxsLevel;
 
+    /**
+     * 公卫2.0-新增第一次产前随访(产前检查初诊)
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //本次随访医师id
+    private String followupDoctorId;
+    //本次随访医师姓名
+    private String followupDoctorName;
+    //本人姓名
+    private String name;
+    //本次随访日期
+    private String followupDate;
+
+    public Integer getIsAppCreate() {
+        return isAppCreate;
+    }
+
+    public void setIsAppCreate(Integer isAppCreate) {
+        this.isAppCreate = isAppCreate;
+    }
+
+    public String getFollowupDoctorId() {
+        return followupDoctorId;
+    }
+
+    public void setFollowupDoctorId(String followupDoctorId) {
+        this.followupDoctorId = followupDoctorId;
+    }
+
+    public String getFollowupDoctorName() {
+        return followupDoctorName;
+    }
+
+    public void setFollowupDoctorName(String followupDoctorName) {
+        this.followupDoctorName = followupDoctorName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFollowupDate() {
+        return followupDate;
+    }
+
+    public void setFollowupDate(String followupDate) {
+        this.followupDate = followupDate;
+    }
+
     public List<Integer> getJmxspg() {
         return jmxspg;
     }
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 fbbe8fa..643f818 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
@@ -3490,6 +3490,12 @@ public class ViewFacade {
         map.put("bloodSugar2h", data.getBloodSugar2h());
         map.put("productionSieveType", data.getProductionSieveType());
 
+        map.put("isAppCreate",data.getIsAppCreate());
+        map.put("followupDoctorId",data.getFollowupDoctorId());
+        map.put("followupDoctorName",data.getFollowupDoctorName());
+        map.put("name",data.getName());
+        map.put("followupDate",data.getFollowupDate());
+
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         br.setData(map);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index bf0c784..d4fb327 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -1374,6 +1374,59 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     public void setResultSupple(String resultSupple) {
         this.resultSupple = resultSupple;
     }
+    /**
+     * 公卫2.0-新增第一次产前随访(产前检查初诊)
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //本次随访医师id
+    private String followupDoctorId;
+    //本次随访医师姓名
+    private String followupDoctorName;
+    //本人姓名
+    private String name;
+    //本次随访日期
+    private String followupDate;
+
+    public Integer getIsAppCreate() {
+        return isAppCreate;
+    }
+
+    public void setIsAppCreate(Integer isAppCreate) {
+        this.isAppCreate = isAppCreate;
+    }
+
+    public String getFollowupDoctorId() {
+        return followupDoctorId;
+    }
+
+    public void setFollowupDoctorId(String followupDoctorId) {
+        this.followupDoctorId = followupDoctorId;
+    }
+
+    public String getFollowupDoctorName() {
+        return followupDoctorName;
+    }
+
+    public void setFollowupDoctorName(String followupDoctorName) {
+        this.followupDoctorName = followupDoctorName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFollowupDate() {
+        return followupDate;
+    }
+
+    public void setFollowupDate(String followupDate) {
+        this.followupDate = followupDate;
+    }
 
     @Override
     public AntenatalExaminationModel convertToDataModel() {
@@ -1578,6 +1631,11 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         if(null!=productionSieveType) {
             examinationModel.setProductionSieveType(productionSieveType);
         }
+        examinationModel.setIsAppCreate(isAppCreate);
+        examinationModel.setFollowupDoctorId(followupDoctorId);
+        examinationModel.setFollowupDoctorName(followupDoctorName);
+        examinationModel.setName(name);
+        examinationModel.setFollowupDate(followupDate);
         return examinationModel;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 6d7db84..46447f7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -1228,6 +1228,59 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     public void setBloodSugar2h(String bloodSugar2h) {
         this.bloodSugar2h = bloodSugar2h;
     }
+    /**
+     * 公卫2.0-新增第一次产前随访(产前检查初诊)
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //本次随访医师id
+    private String followupDoctorId;
+    //本次随访医师姓名
+    private String followupDoctorName;
+    //本人姓名
+    private String name;
+    //本次随访日期
+    private String followupDate;
+
+    public Integer getIsAppCreate() {
+        return isAppCreate;
+    }
+
+    public void setIsAppCreate(Integer isAppCreate) {
+        this.isAppCreate = isAppCreate;
+    }
+
+    public String getFollowupDoctorId() {
+        return followupDoctorId;
+    }
+
+    public void setFollowupDoctorId(String followupDoctorId) {
+        this.followupDoctorId = followupDoctorId;
+    }
+
+    public String getFollowupDoctorName() {
+        return followupDoctorName;
+    }
+
+    public void setFollowupDoctorName(String followupDoctorName) {
+        this.followupDoctorName = followupDoctorName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFollowupDate() {
+        return followupDate;
+    }
+
+    public void setFollowupDate(String followupDate) {
+        this.followupDate = followupDate;
+    }
 
     @Override
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
@@ -1405,6 +1458,11 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         setJmxspg(destModel.getJmxspg());
         setJmxsScore(destModel.getJmxsScore());
         setJmxsLevel(destModel.getJmxsLevel());
+        setIsAppCreate(destModel.getIsAppCreate());
+        setFollowupDoctorId(destModel.getFollowupDoctorId());
+        setFollowupDoctorName(destModel.getFollowupDoctorName());
+        setName(destModel.getName());
+        setFollowupDate(destModel.getFollowupDate());
         return this;
     }
 
-- 
1.8.3.1