From ba9b1fb0097b6b5c6c59b7e1cd65d777c101def0 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 22 Jun 2016 19:01:35 +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

---
 .../web/result/AntenatalExaminationResult.java     |  8 +--
 .../operate/web/result/AntexChuResult.java         | 83 +++++-----------------
 2 files changed, 23 insertions(+), 68 deletions(-)

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 c096004..0085e68 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
@@ -39,7 +39,7 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
     FetalPosition  胎方位
     FetalPresentation 胎先露
     join   衔接*/
-    private String tireData;
+    private List tireData;
     //血红蛋白
     private String hemoglobin;
     //尿蛋白
@@ -89,7 +89,7 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
         setId(destModel.getId());
         setOtherRisk(destModel.getOtherRisk());
         setTireNumber(destModel.getTireNumber());
-        setTireData(JsonUtil.obj2JsonString(destModel.getTireData()));
+        setTireData(destModel.getTireData());
         setType(destModel.getType());
         return this;
     }
@@ -246,11 +246,11 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
         this.riskScore = riskScore;
     }
 
-    public String getTireData() {
+    public List getTireData() {
         return tireData;
     }
 
-    public void setTireData(String tireData) {
+    public void setTireData(List tireData) {
         this.tireData = tireData;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 7c0241c..e6d43ab 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -1,7 +1,14 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.common.base.IBasicResultConvert;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
+import com.lyms.platform.pojo.AntExChuModel;
+import com.lyms.platform.pojo.AntenatalExaminationModel;
+import com.lyms.platform.pojo.Patients;
+import org.apache.commons.collections.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -10,12 +17,12 @@ import java.util.List;
  * 产前检查初诊 *
  * Created by Administrator on 2016/6/20 0020.
  */
-public class AntexChuResult {
+public class AntexChuResult  {
 
     private String parentId;
     /**基本信息**/
     private String id;
-    //名字
+  /*  //名字
     private String name;
     //年龄
     private Integer age;
@@ -30,7 +37,7 @@ public class AntexChuResult {
     //高危评分
     private String riskScore;
     //备注
-    private String remarks;
+    private String remarks;*/
     //末次月经
     private String lastMenses;
 
@@ -193,13 +200,7 @@ public class AntexChuResult {
         this.abortion = abortion;
     }
 
-    public Integer getAge() {
-        return age;
-    }
 
-    public void setAge(Integer age) {
-        this.age = age;
-    }
 
     public String getAlbumin() {
         return albumin;
@@ -305,13 +306,6 @@ public class AntexChuResult {
         this.dirOpinion = dirOpinion;
     }
 
-    public String getDueWeek() {
-        return dueWeek;
-    }
-
-    public void setDueWeek(String dueWeek) {
-        this.dueWeek = dueWeek;
-    }
 
     public String getFamilyHistory() {
         return familyHistory;
@@ -409,13 +403,7 @@ public class AntexChuResult {
         this.mdxqsy = mdxqsy;
     }
 
-    public String getName() {
-        return name;
-    }
 
-    public void setName(String name) {
-        this.name = name;
-    }
 
     public String getNcgOther() {
         return ncgOther;
@@ -481,13 +469,7 @@ public class AntexChuResult {
         this.personalHistory = personalHistory;
     }
 
-    public String getPhone() {
-        return phone;
-    }
 
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
 
     public List<MatDeliverAddRequest.Placenta> getPlacentas() {
         return placentas;
@@ -537,37 +519,7 @@ public class AntexChuResult {
         this.prodTime = prodTime;
     }
 
-    public String getRemarks() {
-        return remarks;
-    }
 
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public String getRh() {
-        return rh;
-    }
-
-    public void setRh(String rh) {
-        this.rh = rh;
-    }
-
-    public String getRiskFactor() {
-        return riskFactor;
-    }
-
-    public void setRiskFactor(String riskFactor) {
-        this.riskFactor = riskFactor;
-    }
-
-    public String getRiskScore() {
-        return riskScore;
-    }
-
-    public void setRiskScore(String riskScore) {
-        this.riskScore = riskScore;
-    }
 
     public String getStillbirth() {
         return stillbirth;
@@ -673,13 +625,7 @@ public class AntexChuResult {
         this.xqjq = xqjq;
     }
 
-    public String getyChanQi() {
-        return yChanQi;
-    }
 
-    public void setyChanQi(String yChanQi) {
-        this.yChanQi = yChanQi;
-    }
 
     public String getYdfmw() {
         return ydfmw;
@@ -776,4 +722,13 @@ public class AntexChuResult {
     public void setParentId(String parentId) {
         this.parentId = parentId;
     }
+
+    public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
+        setId(antExChuModel.getId());
+        setParentId(antExChuModel.getParentId());
+        setAbo(antExChuModel.getAbortion());
+        setAlbumin(antExChuModel.getAbortion());
+        setBaricIndex(antExChuModel.getBaricIndex());
+        return this;
+    }
 }
-- 
1.8.3.1