diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 7898ac5..a544d39 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -276,6 +276,14 @@ public class PuerperaManageController extends BaseController {
         patientsQueryRequest.setStartDueWeek(null);
         patientsQueryRequest.setEndDueWeek(null);
 
+        patientsQueryRequest.setFmTime(patientsQueryRequest.getBuildTime());
+        patientsQueryRequest.setBuildTime(null);
+
+        patientsQueryRequest.setFmStartAge(patientsQueryRequest.getStartAge());
+        patientsQueryRequest.setFmEndAge(patientsQueryRequest.getEndAge());
+        patientsQueryRequest.setStartAge(null);
+        patientsQueryRequest.setEndAge(null);
+
         return  patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.TRUE);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index ce4d3ba..2d305e8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -499,6 +499,17 @@ public class PatientFacade {
             patientsQuery.setFmDateStart(end);
         }
 
+        if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmTime())) {
+
+            String fmTime = riskPatientsQueryRequest.getFmTime();
+            String[] dates = fmTime.split(" - ");
+
+            patientsQuery.setFmDateStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                patientsQuery.setFmDateEnd(DateUtil.parseYMDHMS(dates[1]+" 23:59:59"));
+            }
+        }
+
 
         if (riskPatientsQueryRequest.getFmWeekStart() != null)
         {
@@ -509,10 +520,20 @@ public class PatientFacade {
         if (riskPatientsQueryRequest.getFmWeekEnd() != null)
         {
             int end = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekEnd(), 0)+1;
-            end  = end * 7 - 1;
+            end  =  7;
             patientsQuery.setFmWeekEnd(end);
         }
 
+        if (riskPatientsQueryRequest.getFmStartAge() != null)
+        {
+            patientsQuery.setFmAgeStart(riskPatientsQueryRequest.getFmStartAge());
+        }
+
+        if (riskPatientsQueryRequest.getFmEndAge() != null)
+        {
+            patientsQuery.setFmAgeEnd(riskPatientsQueryRequest.getFmEndAge());
+        }
+
 
 
         return patientsQuery;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
index 58e09ce..ded311c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
@@ -134,6 +134,38 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     private String fmWeekStart;
     private String fmWeekEnd;
 
+    //分娩日期
+    private String fmTime;
+
+    public String getFmTime() {
+        return fmTime;
+    }
+
+    public void setFmTime(String fmTime) {
+        this.fmTime = fmTime;
+    }
+
+
+    //分娩年龄
+    private Integer fmStartAge;
+    private Integer fmEndAge;
+
+    public Integer getFmStartAge() {
+        return fmStartAge;
+    }
+
+    public void setFmStartAge(Integer fmStartAge) {
+        this.fmStartAge = fmStartAge;
+    }
+
+    public Integer getFmEndAge() {
+        return fmEndAge;
+    }
+
+    public void setFmEndAge(Integer fmEndAge) {
+        this.fmEndAge = fmEndAge;
+    }
+
     public String getFmWeekStart() {
         return fmWeekStart;
     }