From 9086d80f9113b80a97faad76ca75b003d46e12db Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 24 Aug 2016 16:21:49 +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

---
 .../operate/web/facade/BabyCheckFacade.java        |  2 +-
 .../operate/web/result/SieveDetailResult.java      | 82 ++--------------------
 2 files changed, 5 insertions(+), 79 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 0b0989a..49a69d9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -350,7 +350,7 @@ public class BabyCheckFacade {
                     List<Patients> list = patientsService.queryPatient(patientsQuery);
                     if (CollectionUtils.isNotEmpty(list))
                     {
-                        HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth());
+                        HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth(),null);
                         List<String> listHighRisk  = res.getHighRisk();
 
                         if (CollectionUtils.isNotEmpty(listHighRisk))
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 0607f54..e61fbda 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
@@ -18,7 +18,7 @@ import java.util.List;
 public class SieveDetailResult {
     private String id;
     private String parentId;
-    //名字
+  /*  //名字
     private String name;
     //年龄
     private Integer age;
@@ -35,7 +35,7 @@ public class SieveDetailResult {
     //备注
     private String remarks;
     //末次月经
-    private String lastMenses;
+    private String lastMenses;*/
     //产前诊断结果
     private Integer diaresult;
 
@@ -102,15 +102,6 @@ public class SieveDetailResult {
         this.pregnancyOutcomeText = pregnancyOutcomeText;
     }
 
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-
     public String getDiaTime() {
         return diaTime;
     }
@@ -127,38 +118,6 @@ public class SieveDetailResult {
         this.diaUnit = diaUnit;
     }
 
-    public String getDueWeek() {
-        return dueWeek;
-    }
-
-    public void setDueWeek(String dueWeek) {
-        this.dueWeek = dueWeek;
-    }
-
-    public String getLastMenses() {
-        return lastMenses;
-    }
-
-    public void setLastMenses(String lastMenses) {
-        this.lastMenses = lastMenses;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
     public String getPublishName() {
         return publishName;
     }
@@ -167,31 +126,6 @@ public class SieveDetailResult {
         this.publishName = publishName;
     }
 
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-
-    public List getRiskFactor() {
-        return riskFactor;
-    }
-
-    public void setRiskFactor(List riskFactor) {
-        this.riskFactor = riskFactor;
-    }
-
-    public String getRiskScore() {
-        return riskScore;
-    }
-
-    public void setRiskScore(String riskScore) {
-        this.riskScore = riskScore;
-    }
-
     public Integer getStatus() {
         return status;
     }
@@ -200,16 +134,8 @@ public class SieveDetailResult {
         this.status = status;
     }
 
-    public String getyChanQi() {
-        return yChanQi;
-    }
-
-    public void setyChanQi(String yChanQi) {
-        this.yChanQi = yChanQi;
-    }
-
     public SieveDetailResult convert(SieveModel sieveModel,Patients patients) {
-        try {
+      /*  try {
             if(null!=patients.getBirth()){
                 setAge(DateUtil.getAge(patients.getBirth()));
             }
@@ -229,7 +155,7 @@ public class SieveDetailResult {
         this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
         if(null!=patients.getLastMenses()){
             setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
-        }
+        }*/
       /*  //产前诊断结果
         private Integer cqResult;
         //妊娠结局
-- 
1.8.3.1