From 719f572548e2b3568be6ebc27d58caadf67b472d Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 12 Jun 2017 15:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/AntExChuModel.java | 20 ++++++++++++++++++++
 .../operate/web/request/AntExcAddRequest.java      | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

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 6ef557c..d98b334 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
@@ -21,6 +21,10 @@ public class AntExChuModel extends BaseModel {
     private String id;
     private String parentId;
     private String pid;
+    //新生儿死亡备注
+    private String neoDeathTodo;
+    //出生缺陷儿备注
+    private String birthDefectTodo;
     //预产期
     private Date dueDate;
     //末次月经
@@ -106,6 +110,22 @@ public class AntExChuModel extends BaseModel {
      */
     private String diagnosisOther;
 
+    public String getNeoDeathTodo() {
+        return neoDeathTodo;
+    }
+
+    public void setNeoDeathTodo(String neoDeathTodo) {
+        this.neoDeathTodo = neoDeathTodo;
+    }
+
+    public String getBirthDefectTodo() {
+        return birthDefectTodo;
+    }
+
+    public void setBirthDefectTodo(String birthDefectTodo) {
+        this.birthDefectTodo = birthDefectTodo;
+    }
+
     public String getDiagnosisOther() {
         return diagnosisOther;
     }
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 2fd6156..b4444ed 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
@@ -210,6 +210,26 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
      * 其他的诊断意见
      */
     private String diagnosisOther;
+    //新生儿死亡备注
+    private String neoDeathTodo;
+    //出生缺陷儿备注
+    private String birthDefectTodo;
+
+    public String getNeoDeathTodo() {
+        return neoDeathTodo;
+    }
+
+    public void setNeoDeathTodo(String neoDeathTodo) {
+        this.neoDeathTodo = neoDeathTodo;
+    }
+
+    public String getBirthDefectTodo() {
+        return birthDefectTodo;
+    }
+
+    public void setBirthDefectTodo(String birthDefectTodo) {
+        this.birthDefectTodo = birthDefectTodo;
+    }
 
     public String getDiagnosisOther() {
         return diagnosisOther;
@@ -915,6 +935,8 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     @Override
     public AntExChuModel convertToDataModel() {
         AntExChuModel antExChuModel=new AntExChuModel();
+        antExChuModel.setNeoDeathTodo(neoDeathTodo);
+        antExChuModel.setBirthDefectTodo(birthDefectTodo);
         antExChuModel.setDiagnosisOther(diagnosisOther);
         antExChuModel.setBg(bg);
         antExChuModel.setBarCode(barCode);
-- 
1.8.3.1