From 061e478edf1ac4cd788bffb1b9f6f2107827ff6b Mon Sep 17 00:00:00 2001
From: tranny <1163285868@qq.com>
Date: Fri, 27 Nov 2020 16:32:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/TrackDownFacade.java        | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
index 4fd926f..5185828 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
@@ -354,15 +354,15 @@ public class TrackDownFacade {
             isPatient = true;
         }
 
-        if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期
-            patientsQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime());
-            isPatient = true;
-        }
-
-        if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期
-            patientsQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime());
-            isPatient = true;
-        }
+//        if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期
+//            patientsQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime());
+//            isPatient = true;
+//        }
+//
+//        if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期
+//            patientsQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime());
+//            isPatient = true;
+//        }
 
         /**2019-07 需求搜索条件添加*/
         if (StringUtils.isNotEmpty(downQueryRequest.getFmType())) {//分泌方式
@@ -652,6 +652,15 @@ public class TrackDownFacade {
 
         downRecordQuery.setHospitalId(hospitalId);
 
+
+        if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期
+            downRecordQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime());
+        }
+
+        if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期
+            downRecordQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime());
+        }
+
         return downRecordQuery;
     }
 
-- 
1.8.3.1