From 4e27b5f06137517527311ae99c8ebee3db9f8290 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 17 Nov 2021 10:33:05 +0800
Subject: [PATCH] update

---
 .../operate/web/service/impl/TeamServiceImpl.java  | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java
index 0b7e493..b853936 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java
@@ -7,6 +7,7 @@ import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.result.PageResult;
 import com.lyms.platform.common.result.RespBuilder;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.TeamModelRequest;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.operate.web.service.TeamService;
@@ -330,20 +331,25 @@ public class TeamServiceImpl implements TeamService {
     public BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit) {
         Criteria criteria=new Criteria();
         if(StringUtils.isNotEmpty(recordUpdateModel.getPatientName())){
-            criteria.and("patientName").regex(".*?\\" +recordUpdateModel.getPatientName()+ ".*");
+            criteria.and("patientName").regex(".*" +recordUpdateModel.getPatientName()+ ".*");
         }
         if(StringUtils.isNotEmpty(recordUpdateModel.getDoctorName())){
-            criteria.and("doctorName").regex(".*?\\" +recordUpdateModel.getDoctorName()+ ".*");
+            criteria.and("doctorName").regex(".*" +recordUpdateModel.getDoctorName()+ ".*");
         }
         if(StringUtils.isNotEmpty(recordUpdateModel.getTeamName())){
-            criteria.and("teamName").regex(".*?\\" +recordUpdateModel.getTeamName()+ ".*");
+            criteria.and("teamName").regex(".*" +recordUpdateModel.getTeamName()+ ".*");
         }
-        if(null!=recordUpdateModel.getStartTime()){
-            criteria.and("created").gte(recordUpdateModel.getStartTime());
-        }
-        if(null!=recordUpdateModel.getEndTime()){
-            criteria.and("created").lte(recordUpdateModel.getEndTime());
+        if(null!=recordUpdateModel.getStartTime()&&null!=recordUpdateModel.getEndTime()){
+            criteria.and("created").gte(recordUpdateModel.getStartTime()).lte(recordUpdateModel.getEndTime());
+        }else{
+            if(null!=recordUpdateModel.getStartTime()){
+                criteria.and("created").gte(recordUpdateModel.getStartTime());
+            }
+            if(null!=recordUpdateModel.getEndTime()){
+                criteria.and("created").lte(recordUpdateModel.getEndTime());
+            }
         }
+
         PageResult pageResult = findMongoPage(TeamRecordUpdateModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
         return RespBuilder.buildSuccess(pageResult);
     }
-- 
1.8.3.1