From 0808dc5912b422b697ea083a3bbb2778beb997d7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 16 Aug 2022 18:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8A=E4=BD=8D=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/AntExChuModel.java | 28 ++++++++++++++++++-
 .../platform/pojo/AntenatalExaminationModel.java   | 28 +++++++++++++++++++
 .../operate/web/request/AntExAddRequest.java       | 31 ++++++++++++++++++++++
 .../operate/web/request/AntExcAddRequest.java      | 30 ++++++++++++++++++++-
 4 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
index 687cb53..179ed2f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
@@ -17,7 +17,9 @@ import java.util.Map;
 public class AntExChuModel extends BaseModel {
 
     private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
-
+    private List<String>  jmxspg;
+    private Integer jmxsScore;
+    private Integer jmxsLevel;
     //预约住院分娩医院
     private String yyzyfmHospitalId;
     /**
@@ -522,6 +524,30 @@ public class AntExChuModel extends BaseModel {
     //秦皇岛定制字段：是否产筛 0：未产筛   1：已产筛
     public Integer productionSieveType;
 
+    public List<String> getJmxspg() {
+        return jmxspg;
+    }
+
+    public void setJmxspg(List<String> jmxspg) {
+        this.jmxspg = jmxspg;
+    }
+
+    public Integer getJmxsScore() {
+        return jmxsScore;
+    }
+
+    public void setJmxsScore(Integer jmxsScore) {
+        this.jmxsScore = jmxsScore;
+    }
+
+    public Integer getJmxsLevel() {
+        return jmxsLevel;
+    }
+
+    public void setJmxsLevel(Integer jmxsLevel) {
+        this.jmxsLevel = jmxsLevel;
+    }
+
     public Integer getProductionSieveType() {
         return productionSieveType;
     }
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 ae3fb69..9df1e80 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
@@ -403,6 +403,34 @@ public class AntenatalExaminationModel extends BaseModel {
     //秦皇岛定制字段：是否产筛 0：未产筛   1：已产筛
     public Integer productionSieveType;
 
+    private List<String>  jmxspg;
+    private Integer jmxsScore;
+    private Integer jmxsLevel;
+
+    public List<String> getJmxspg() {
+        return jmxspg;
+    }
+
+    public void setJmxspg(List<String> jmxspg) {
+        this.jmxspg = jmxspg;
+    }
+
+    public Integer getJmxsScore() {
+        return jmxsScore;
+    }
+
+    public void setJmxsScore(Integer jmxsScore) {
+        this.jmxsScore = jmxsScore;
+    }
+
+    public Integer getJmxsLevel() {
+        return jmxsLevel;
+    }
+
+    public void setJmxsLevel(Integer jmxsLevel) {
+        this.jmxsLevel = jmxsLevel;
+    }
+
     public Integer getProductionSieveType() {
         return productionSieveType;
     }
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 2bafccd..00c8728 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
@@ -29,6 +29,33 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         this.registration = registration;
     }
 
+    public List<String> getJmxspg() {
+        return jmxspg;
+    }
+
+    public void setJmxspg(List<String> jmxspg) {
+        this.jmxspg = jmxspg;
+    }
+
+    public Integer getJmxsScore() {
+        return jmxsScore;
+    }
+
+    public void setJmxsScore(Integer jmxsScore) {
+        this.jmxsScore = jmxsScore;
+    }
+
+    public Integer getJmxsLevel() {
+        return jmxsLevel;
+    }
+
+    public void setJmxsLevel(Integer jmxsLevel) {
+        this.jmxsLevel = jmxsLevel;
+    }
+
+    private List<String>  jmxspg;
+    private Integer jmxsScore;
+    private Integer jmxsLevel;
     //医生签名
     private String doctorSign;
 
@@ -1358,6 +1385,10 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setZyatzlState(zyatzlState);
         examinationModel.setZyatzlContent(zyatzlContent);
 
+        examinationModel.setJmxspg(jmxspg);
+        examinationModel.setJmxsScore(jmxsScore);
+        examinationModel.setJmxsLevel(jmxsLevel);
+
         if (null != secondaryDiagnosisId) {
             examinationModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
index 1e1363b..7604742 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
@@ -20,9 +20,35 @@ import java.util.Map;
  */
 @Form
 public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
+    public List<String> getJmxspg() {
+        return jmxspg;
+    }
+
+    public void setJmxspg(List<String> jmxspg) {
+        this.jmxspg = jmxspg;
+    }
+
+    public Integer getJmxsScore() {
+        return jmxsScore;
+    }
+
+    public void setJmxsScore(Integer jmxsScore) {
+        this.jmxsScore = jmxsScore;
+    }
+
+    public Integer getJmxsLevel() {
+        return jmxsLevel;
+    }
+
+    public void setJmxsLevel(Integer jmxsLevel) {
+        this.jmxsLevel = jmxsLevel;
+    }
 
     //预约住院分娩医院(初证预约住院分娩医院同时，修改档案的预约住院分娩医院)
     private String yyzyfmHospitalId;
+    private List<String>  jmxspg;
+    private Integer jmxsScore;
+    private Integer jmxsLevel;
     /**
      * start
      * 遵化需求新增字段
@@ -2281,7 +2307,9 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
         antExChuModel.setZyatzlContent(zyatzlContent);
         antExChuModel.setYyzyfmHospitalId(yyzyfmHospitalId);
 
-
+        antExChuModel.setJmxspg(jmxspg);
+        antExChuModel.setJmxsScore(jmxsScore);
+        antExChuModel.setJmxsLevel(jmxsLevel);
         //次要诊断
         if (null != secondaryDiagnosisId) {
             antExChuModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId));
-- 
1.8.3.1