From e746aef8752d27659c1abf139e85fa83acc02f89 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Fri, 4 Dec 2020 15:57:35 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/PatientFacade.java | 29 ++--------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

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 188f3e3..ab4b72f 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,32 +665,8 @@ public class PatientFacade {
         //查询符合条件的孕妇
         StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
         stopWatch.start();
-        //滦平实现 下次预约时间升序方式，但是空默认在最前特两次查询组合在一起实现
-        List <Patients> patientses = new ArrayList <>();
-       if("lp".equals(riskPatientsQueryRequest.getHstart())){
-           patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
-
-          /* if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){
-                //下次检查时间非空，不用考虑空排序在前面问题
-                patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
-            }else {
-                //下次检查时间空，先获取有检查数据
-                patientsQuery.setNextCheckTimeNe(true);
-                List <Patients> patients1 = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
-                if(CollectionUtils.isNotEmpty(patients1)){
-                    patientses = patients1;
-                }
-                //在获取没有有检查数据
-                patientsQuery.setNextCheckTimeIs(true);
-                patientsQuery.setNextCheckTimeNe(false);
-                List <Patients>  patientsesm = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
-                patientses.addAll(patientsesm);
-            }*/
-
-        }else {
-            //以前逻辑
-            patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
-        }
+        System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
+        List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
         stopWatch.stop();
         logger.info(stopWatch.toString());
         List data = new ArrayList<QuanChanResult>();
@@ -698,7 +674,6 @@ public class PatientFacade {
             //如果是查高危孕妇
             if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) {
                 data = convertToHighRisk(patientses, userId, hospital);
-                data = convertToHighRisk(patientses, userId, hospital);
             } else if (type == 1) {
                 //处理全部孕妇的情况
                 data = convertToQuanPatient(patientses, userId, hospital);
-- 
1.8.3.1