From cc5027286195ceb99e1d454f1f76b181f0d65449 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 23 Jun 2016 09:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=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

---
 .../lyms/platform/operate/web/request/AntExAddRequest.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 c6c0742..6b5c639 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
@@ -4,6 +4,7 @@ import com.lyms.platform.common.base.IBasicRequestConvert;
 import com.lyms.platform.common.core.annotation.form.Form;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.List;
 import java.util.Map;
@@ -38,7 +39,7 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     FetalPosition  胎方位
     FetalPresentation 胎先露
     join   衔接*/
-    private List tireData;
+    private List<MatDeliverAddRequest.Placenta> tireData;
     //血红蛋白
     private String hemoglobin;
     //尿蛋白
@@ -48,7 +49,7 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //血糖
     private String bloodSugar;
     //高危因素
-    private String riskFactor;
+    private List<String> riskFactor;
     //  高危评分
     private String riskScore;
     //其他高危
@@ -56,6 +57,7 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //诊断
     private String diagnosis;
     //分类
+    @JsonIgnore
     private String type;
     //处理意见
     private String treatmentOpinion;
@@ -86,7 +88,7 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setUrineProtein(urineProtein);
         examinationModel.setbChao(bChao);
         examinationModel.setBloodSugar(bloodSugar);
-        examinationModel.setRiskFactor(riskFactor);
+        examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
         examinationModel.setRiskScore(riskScore);
         examinationModel.setOtherRisk(JsonUtil.obj2JsonString(otherRisk));
         examinationModel.setDiagnosis(diagnosis);
@@ -236,11 +238,11 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         this.parentId = parentId;
     }
 
-    public String getRiskFactor() {
+    public List<String> getRiskFactor() {
         return riskFactor;
     }
 
-    public void setRiskFactor(String riskFactor) {
+    public void setRiskFactor(List<String> riskFactor) {
         this.riskFactor = riskFactor;
     }
 
-- 
1.8.3.1