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 ab4b72f..d5c0ffa 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
@@ -665,8 +665,28 @@ public class PatientFacade {
         //查询符合条件的孕妇
         StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
         stopWatch.start();
-        System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
-        List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
+        //20201204 滦平实现 默认查询有预约产检时间数据，可以选择有预约和没有预约时间，其它机构使用以前逻辑
+        List <Patients> patientses = new ArrayList <>();
+       if("lp".equals(riskPatientsQueryRequest.getHstart())){
+            if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){
+                //下次检查时间非空
+                patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
+            }else {
+                if("1".equals(riskPatientsQueryRequest.getYyzt())){
+                    //获取有检查数据
+                    patientsQuery.setNextCheckTimeNe(true);
+                    patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
+                }else if("2".equals(riskPatientsQueryRequest.getYyzt())){
+                    //获取没有有检查数据
+                    patientsQuery.setNextCheckTimeIs(true);
+                    patientsQuery.setNextCheckTimeNe(false);
+                    patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
+                }
+            }
+        }else {
+            //以前逻辑
+            patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
+        }
         stopWatch.stop();
         logger.info(stopWatch.toString());
         List data = new ArrayList<QuanChanResult>();
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 257765b..6f0d356 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
@@ -17,6 +17,8 @@ import java.util.Date;
 public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     //判断定制机构 lp滦平
     private String hstart;
+    // 预约产检日期状态：1 有预约产检日期 2 没有预约产检日期
+    private String yyzt;
 
     @FormParam
     //孕妇名字
@@ -817,6 +819,14 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
         return twinsType;
     }
 
+    public String getYyzt() {
+        return yyzt;
+    }
+
+    public void setYyzt(String yyzt) {
+        this.yyzt = yyzt;
+    }
+
     public void setTwinsType(String twinsType) {
         this.twinsType = twinsType;
     }