From faba85d90057edfeb50941027f9cd0541a83e97c Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 13 Sep 2022 21:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8D=AB2.0-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=A7=E5=90=8E42=E5=A4=A9=EF=BC=88=E4=BA=A7=E5=90=8E?=
 =?UTF-8?q?=E5=A4=8D=E6=9F=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/PostReviewModel.java    | 64 ++++++++++++++++++++
 .../platform/operate/web/facade/ViewFacade.java    |  7 +++
 .../operate/web/request/PostReviewRequest.java     | 68 +++++++++++++++++++++
 .../operate/web/result/PostReviewResult.java       | 69 ++++++++++++++++++++++
 4 files changed, 208 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
index c9c9ef4..44e3dcd 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
@@ -188,6 +188,70 @@ public class PostReviewModel extends BaseModel {
     // B超
     private String bChao;
 
+    /**
+     * 公卫2.0-新增产后42天（产后复查）
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //本次随访医师id
+    private String followupDoctorId;
+    //本次随访医师姓名
+    private String followupDoctorName;
+    //本人姓名
+    private String name;
+    //本次随访日期
+    private String followupDate;
+    //国家规范版本号
+    private String standard;
+
+    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 String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
+
     public String getXhdb() {
         return xhdb;
     }
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 643f818..0d536a2 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
@@ -4738,6 +4738,12 @@ public class ViewFacade {
         map.put("bld", data.getBld());
         map.put("ncgOther", data.getNcgOther());
         map.put("bChao", data.getbChao());
+        map.put("isAppCreate", data.getIsAppCreate());
+        map.put("followupDoctorId", data.getFollowupDoctorId());
+        map.put("followupDoctorName", data.getFollowupDoctorName());
+        map.put("followupDate", data.getFollowupDate());
+        map.put("name", data.getName());
+        map.put("standard", data.getStandard());
 
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
@@ -6525,6 +6531,7 @@ public class ViewFacade {
         model.setFollowupVisitDoctorName(checkModel.getFollowupVisitDoctorName());
         model.setChildHealthExamFormNo(checkModel.getChildHealthExamFormNo());
         model.setVisitType(checkModel.getVisitType());
+        model.setRecordChoice(checkModel.getRecordChoice());
         return model;
 
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
index d04f14a..962d99f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
@@ -185,7 +185,69 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
 
     // B超
     private String bChao;
+    /**
+     * 公卫2.0-新增产后42天（产后复查）
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //本次随访医师id
+    private String followupDoctorId;
+    //本次随访医师姓名
+    private String followupDoctorName;
+    //本人姓名
+    private String name;
+    //本次随访日期
+    private String followupDate;
+    //国家规范版本号
+    private String standard;
+
+    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 String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
 
     public String getXhdb() {
         return xhdb;
@@ -879,6 +941,12 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
         postReviewModel.setNcgOther(ncgOther);
         postReviewModel.setbChao(bChao);
 
+        postReviewModel.setIsAppCreate(isAppCreate);
+        postReviewModel.setFollowupDoctorId(followupDoctorId);
+        postReviewModel.setFollowupDoctorName(followupDoctorName);
+        postReviewModel.setFollowupDate(followupDate);
+        postReviewModel.setName(name);
+        postReviewModel.setStandard(standard);
         return postReviewModel;
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
index 7743a56..186b5f8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
@@ -174,6 +174,21 @@ public class PostReviewResult implements Serializable{
     // B超
     private String bChao;
 
+    /**
+     * 公卫2.0-新增产后42天（产后复查）
+     */
+    //各厂商对接时，再确定具体的值
+    private Integer isAppCreate;
+    //本次随访医师id
+    private String followupDoctorId;
+    //本次随访医师姓名
+    private String followupDoctorName;
+    //本人姓名
+    private String name;
+    //本次随访日期
+    private String followupDate;
+    //国家规范版本号
+    private String standard;
 
 
     public PostReviewResult convertToResult(PostReviewModel postReviewModel) {
@@ -252,9 +267,63 @@ public class PostReviewResult implements Serializable{
         setNcgOther(postReviewModel.getNcgOther());
         setbChao(postReviewModel.getbChao());
 
+        setIsAppCreate(postReviewModel.getIsAppCreate());
+        setFollowupDoctorId(postReviewModel.getFollowupDoctorId());
+        setFollowupDoctorName(postReviewModel.getFollowupDoctorName());
+        setFollowupDate(postReviewModel.getFollowupDate());
+        setName(postReviewModel.getName());
+        setStandard(postReviewModel.getStandard());
         return this;
     }
 
+    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 String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
+
     public String getXhdb() {
         return xhdb;
     }
-- 
1.8.3.1