From 71bf542dedb3d42448f8860c9e6b661dc924f003 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 30 Aug 2016 10:26:29 +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

---
 .../platform/operate/web/result/ApplyOrderOutResult.java | 16 ++++++++++++++++
 .../platform/operate/web/result/PatientBaseResult.java   |  1 -
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
index c551cd8..f6ff3b1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
@@ -63,6 +63,18 @@ public class ApplyOrderOutResult {
     //转入医院
     private String zhuanRname;
 
+    //1 孕妇 0  产妇
+    private String isGravida;
+
+
+    public String getIsGravida() {
+        return isGravida;
+    }
+
+    public void setIsGravida(String isGravida) {
+        this.isGravida = isGravida;
+    }
+
     public String getcDueWeek() {
         if(null==cDueWeek){
             return SPIT;
@@ -318,8 +330,10 @@ public class ApplyOrderOutResult {
             int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
             if(-1==destModel.getDueWeek()){
                 setDueWeek("已分娩");
+                setIsGravida("0");
             }else{
                 setDueWeek(StringUtils.dueWeek(days));
+                setIsGravida("1");
             }
 
         }
@@ -328,8 +342,10 @@ public class ApplyOrderOutResult {
         if(null!=destModel.getDueWeek()) {
             if (-1 == destModel.getDueWeek()){
                 setcDueWeek("已分娩");
+                setIsGravida("0");
             }else{
                 setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
+                setIsGravida("1");
             }
         }
         if(null!=destModel.getReceived()){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
index 9d2d702..6f5786f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
@@ -127,7 +127,6 @@ public class PatientBaseResult {
         setName(patients.getUsername());
         setPhone(patients.getPhone());
         setRemarks(patients.getMremark());
-        setRiskScore("60");
 
         if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) {
             this.dueWeek = "终止妊娠";
-- 
1.8.3.1