From 245c3992e231500bf7a1eb9bc6844b4374e93206 Mon Sep 17 00:00:00 2001
From: cfl <chaifulai@163.com>
Date: Fri, 20 Oct 2023 13:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/query/ReferralApplyScreeningQuery.java  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java
index d95f8af..0232f9a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java
@@ -420,7 +420,7 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo
         }
         if (null != birthEnd) {
             if (null != c) {
-                c = c.lte(birthEnd);
+                c = c.where("birth").lte(birthEnd);
             } else {
                 c = Criteria.where("birth").lte(birthEnd);
             }
@@ -435,18 +435,23 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo
         }
         if (null != dueDateEnd) {
             if (c != null) {
-                c = c.lte(dueDateEnd);
+                c = c.and("days").lte(dueDateEnd);
             } else {
                 c = Criteria.where("days").lte(dueDateEnd);
             }
         }
         //高危评分
         if (null != scoreStart) {
-            c = c.and("score").gte(scoreStart);
+            if (null != c) {
+                c = c.and("score").gte(scoreStart);
+            }else{
+                c = Criteria.where("score").gte(scoreStart);
+            }
+
         }
         if (null != scoreEnd) {
             if (null != c) {
-                c = c.lte(scoreEnd);
+                c = c.and("score").lte(scoreEnd);
             } else {
                 c = Criteria.where("score").lte(scoreEnd);
             }
@@ -477,7 +482,7 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo
         }
         if (null != transferredEnd) {
             if (c != null) {
-                c = c.lte(transferredEnd);
+                c = c.and("created").lte(transferredEnd);
             } else {
                 c = Criteria.where("created").lte(transferredEnd);
             }
-- 
1.8.3.1