From b4f5fd98716f513bb690949498c328423d3a3b50 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 29 Aug 2017 23:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     |  8 ++++----
 .../operate/web/result/AntexListResult.java        | 23 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 3016485..1ccc596 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -1948,10 +1948,10 @@ public class AntenatalExaminationFacade {
                     latelyAntExChuModel = antExChuModel;
                 }
             }
-            latelyAntExChuModel.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次
-            latelyAntExChuModel.setProdTime(latelyAntExChuModel.getProdTime()); // 产次
-            latelyAntExChuModel.setAbortion(latelyAntExChuModel.getAbortion()); // 流产
-            latelyAntExChuModel.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数
+            antexListResult.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次
+            antexListResult.setProdTime(latelyAntExChuModel.getProdTime()); // 产次
+            antexListResult.setAbortion(latelyAntExChuModel.getAbortion()); // 流产
+            antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数
         }
 
         HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index fde3f16..ebbf8bd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -20,6 +20,13 @@ public class AntexListResult {
 
     private String id;
 
+
+
+    private Integer pregnancyTimes;
+    private Integer prodTime;
+    private Integer abortion;
+    private Integer survFetus;
+
     /** 处理意见 */
     private List<String> treatmentOpinion2;
     /** 处理意见 */
@@ -274,4 +281,20 @@ public class AntexListResult {
     public void setLastMenses(String lastMenses) {
         this.lastMenses = lastMenses;
     }
+
+    public void setPregnancyTimes(Integer pregnancyTimes) {
+        this.pregnancyTimes = pregnancyTimes;
+    }
+
+    public void setProdTime(Integer prodTime) {
+        this.prodTime = prodTime;
+    }
+
+    public void setAbortion(Integer abortion) {
+        this.abortion = abortion;
+    }
+
+    public void setSurvFetus(Integer survFetus) {
+        this.survFetus = survFetus;
+    }
 }
-- 
1.8.3.1