From 939161cf0ddf3a3e6484024a2cb91faf969e4e12 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 24 Aug 2016 16:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java  | 4 ++--
 .../java/com/lyms/platform/operate/web/result/SieveDetailResult.java | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 144320f..03a64da 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -100,8 +100,8 @@ public class SieveFacade {
 
         if(CollectionUtils.isNotEmpty(sieveModels)){
             SieveModel sieveModel=  sieveModels.get(0);
-            Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
-            sieveDetailResult.convert(sieveModel,patients);
+//            Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
+            sieveDetailResult.convert(sieveModel);
 
         }
         return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java
index e61fbda..3914f86 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.enums.RenShenJieJuEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.SieveModel;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.Date;
 import java.util.List;
@@ -42,7 +43,7 @@ public class SieveDetailResult {
     private String diaresultText;
     //妊娠结局
     private String pregnancyOutcome;
-
+    @JsonIgnore
     private String pregnancyOutcomeText;
     //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊
     private Integer status;
@@ -134,7 +135,7 @@ public class SieveDetailResult {
         this.status = status;
     }
 
-    public SieveDetailResult convert(SieveModel sieveModel,Patients patients) {
+    public SieveDetailResult convert(SieveModel sieveModel) {
       /*  try {
             if(null!=patients.getBirth()){
                 setAge(DateUtil.getAge(patients.getBirth()));
-- 
1.8.3.1