From dff00ec3d62cf066302c4ee419ad68e576354c0c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 6 Jul 2016 15:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/AntenatalExaminationModel.java  |  9 +++++++++
 .../lyms/platform/operate/web/request/AntExAddRequest.java | 14 +++++++++++++-
 .../operate/web/result/AntenatalExaminationResult.java     | 11 +++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

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 cf1a1e1..80c2ded 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
@@ -75,6 +75,7 @@ public class AntenatalExaminationModel {
     private String diagnosis;
     //分类
     private String type;
+    private String typeYc;
     //处理意见
     private String treatmentOpinion;
     //指导
@@ -88,6 +89,14 @@ public class AntenatalExaminationModel {
     private Integer yn;
     private Date created;
 
+    public String getTypeYc() {
+        return typeYc;
+    }
+
+    public void setTypeYc(String typeYc) {
+        this.typeYc = typeYc;
+    }
+
     public Date getCreated() {
         return created;
     }
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 6b5c639..48dc814 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
@@ -57,8 +57,9 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //诊断
     private String diagnosis;
     //分类
-    @JsonIgnore
     private String type;
+    //异常
+    private String typeYc;
     //处理意见
     private String treatmentOpinion;
     //指导
@@ -70,6 +71,16 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //下次产检日期
     private String nextCheckDate;
 
+
+
+    public String getTypeYc() {
+        return typeYc;
+    }
+
+    public void setTypeYc(String typeYc) {
+        this.typeYc = typeYc;
+    }
+
     @Override
     public AntenatalExaminationModel convertToDataModel() {
         AntenatalExaminationModel examinationModel =  new AntenatalExaminationModel();
@@ -93,6 +104,7 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setOtherRisk(JsonUtil.obj2JsonString(otherRisk));
         examinationModel.setDiagnosis(diagnosis);
         examinationModel.setType(type);
+        examinationModel.setTypeYc(typeYc);
         examinationModel.setTreatmentOpinion(treatmentOpinion);
         examinationModel.setGuide(guide);
         examinationModel.setCheckDoctor(checkDoctor);
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 d67c8a2..a753757 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
@@ -57,6 +57,8 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     private String diagnosis;
     //分类
     private String type;
+    //异常
+    private String typeYc;
     //处理意见
     private String treatmentOpinion;
     //指导
@@ -100,9 +102,18 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         setTireNumber(destModel.getTireNumber());
         setTireData(destModel.getTireData());
         setType(destModel.getType());
+        setTypeYc(destModel.getTypeYc());
         return this;
     }
 
+    public String getTypeYc() {
+        return typeYc;
+    }
+
+    public void setTypeYc(String typeYc) {
+        this.typeYc = typeYc;
+    }
+
     public Map getBp() {
         return bp;
     }
-- 
1.8.3.1