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 6f5786f..6a155f6 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
@@ -30,6 +30,16 @@ public class PatientBaseResult {
     private String remarks;
     //末次月经
     private String lastMenses;
+    //1 孕妇 0  产妇
+    private String isGravida;
+
+    public String getIsGravida() {
+        return isGravida;
+    }
+
+    public void setIsGravida(String isGravida) {
+        this.isGravida = isGravida;
+    }
 
     public Integer getAge() {
         return age;
@@ -96,7 +106,7 @@ public class PatientBaseResult {
     }
 
     public String getRiskScore() {
-        if(null==riskScore){
+        if (null == riskScore) {
             return "0";
         }
         return riskScore;
@@ -113,31 +123,35 @@ public class PatientBaseResult {
     public void setyChanQi(String yChanQi) {
         this.yChanQi = yChanQi;
     }
-    public PatientBaseResult convert(Patients patients){
+
+    public PatientBaseResult convert(Patients patients) {
         setId(patients.getId());
         try {
-            if(null!=patients.getBirth()){
+            if (null != patients.getBirth()) {
                 setAge(DateUtil.getAge(patients.getBirth()));
             }
-        }catch (Exception e){
+        } catch (Exception e) {
         }
-        if(null!=patients.getDueDate()){
+        if (null != patients.getDueDate()) {
             setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
         }
         setName(patients.getUsername());
         setPhone(patients.getPhone());
         setRemarks(patients.getMremark());
 
-        if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) {
-            this.dueWeek = "终止妊娠";
-        } else if (3 == patients.getType()) {
-            this.dueWeek = "已分娩";
-        } else {
-            if (null != patients.getLastMenses()) {
-                int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
-                this.dueWeek = StringUtils.dueWeek(days);
-            }
+        if(null!=patients.getFmDate()){
+            //1 孕妇 0  产妇
+            setIsGravida("0");
+        }else{
+            setIsGravida("1");
         }
+
+
+        if (null != patients.getLastMenses()) {
+            int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
+            this.dueWeek = StringUtils.dueWeek(days);
+        }
+
         return this;
     }
 }