From c093eebfb5670daf9bb0e263971e59ec548f0bf1 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 1 Jun 2018 14:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E8=BF=87=E6=9C=9F=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E7=9F=AD=E4=BF=A1=E7=94=9F=E6=88=90=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/query/PatientsQuery.java    | 13 +++++++++++++
 .../lyms/platform/msg/worker/TempleteMsgGenerateWorker.java |  2 +-
 .../web/controller/ModularFunctionConfigController.java     |  1 -
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index c8ad71f..1781c5c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -515,6 +515,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Date fmDateStart;
     private Date fmDateEnd;
     private Date nextCheckTime;
+    private Date isNextCheckTime;
     private Date nextCheckTimeStart;
     private Date nextCheckTimeEnd;
 
@@ -563,6 +564,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private String blNum;
 
+    public Date getIsNextCheckTime() {
+        return isNextCheckTime;
+    }
+
+    public void setIsNextCheckTime(Date isNextCheckTime) {
+        this.isNextCheckTime = isNextCheckTime;
+    }
+
     public Date getNextCheckTime() {
         return nextCheckTime;
     }
@@ -1669,6 +1678,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("nextCheckTime", nextCheckTime, MongoOper.NE);
         }
 
+        if (null != isNextCheckTime) {
+            condition = condition.and("nextCheckTime", isNextCheckTime, MongoOper.IS);
+        }
+
         if (StringUtils.isNotEmpty(fmHospital)) {
             condition = condition.and("fmHospital", fmHospital, MongoOper.IS);
         }
diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
index 0aa75e1..f48905b 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
@@ -879,7 +879,7 @@ public class TempleteMsgGenerateWorker implements Runnable {
             //该提醒的预约产检时间
             Date yuYueDate = DateUtils.addDay(new Date(), sendTimeType);
 
-            patientsQuery.setNextCheckTimeStart(yuYueDate);
+            patientsQuery.setIsNextCheckTime(yuYueDate);
             //查指定预约下次产检时间
             List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java
index 620da14..bbd0942 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java
@@ -41,7 +41,6 @@ public class ModularFunctionConfigController extends BaseController {
     /**
      * 查询当前医院的功能配置项
      * @param hospitalId
-     * @param request
      * @return
      */
     @RequestMapping(method = RequestMethod.GET, value = "/queryModularFunConfig")
-- 
1.8.3.1