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 960f2ce..7898ac5 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
@@ -270,6 +270,12 @@ public class PuerperaManageController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId());
         patientsQueryRequest.sethId(null);
+
+        patientsQueryRequest.setFmWeekStart(patientsQueryRequest.getStartDueWeek());
+        patientsQueryRequest.setFmWeekEnd(patientsQueryRequest.getEndDueWeek());
+        patientsQueryRequest.setStartDueWeek(null);
+        patientsQueryRequest.setEndDueWeek(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 1caba7e..ca622c1 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
@@ -500,6 +500,20 @@ public class PatientFacade {
         }
 
 
+        if (riskPatientsQueryRequest.getFmWeekStart() != null)
+        {
+            int start = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekStart(), 0);
+            patientsQuery.setFmWeekStart(start);
+        }
+
+        if (riskPatientsQueryRequest.getFmWeekEnd() != null)
+        {
+            int end = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekEnd(), 0)+1;
+            patientsQuery.setFmWeekEnd(end);
+        }
+
+
+
         return patientsQuery;
     }
 
@@ -568,7 +582,7 @@ public class PatientFacade {
         patientsQuery.setPhone(patientQueryRequest.getPhone());
         patientsQuery.setCardNo(patientQueryRequest.getCardNo());
 
-        Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
+        Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
         PatientBaseResult patientBaseResult = new PatientBaseResult();
         if (null != patients) {
             patientBaseResult.convert(patients);
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 d8afe90..58e09ce 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
@@ -131,6 +131,25 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     //分娩医院
     private String fmHospital;
 
+    private String fmWeekStart;
+    private String fmWeekEnd;
+
+    public String getFmWeekStart() {
+        return fmWeekStart;
+    }
+
+    public void setFmWeekStart(String fmWeekStart) {
+        this.fmWeekStart = fmWeekStart;
+    }
+
+    public String getFmWeekEnd() {
+        return fmWeekEnd;
+    }
+
+    public void setFmWeekEnd(String fmWeekEnd) {
+        this.fmWeekEnd = fmWeekEnd;
+    }
+
     public String getFprovinceId() {
         return fprovinceId;
     }