jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 4e27b5f06137517527311ae99c8ebee3db9f8290

Authored by shiyang
1 parent cf98044cf0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 14 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java View file @ 4e27b5f
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.common.result.BaseResponse;
8 8 import com.lyms.platform.common.result.PageResult;
9 9 import com.lyms.platform.common.result.RespBuilder;
  10 +import com.lyms.platform.common.utils.DateUtil;
10 11 import com.lyms.platform.operate.web.request.TeamModelRequest;
11 12 import com.lyms.platform.operate.web.result.FrontEndResult;
12 13 import com.lyms.platform.operate.web.service.TeamService;
13 14  
14 15  
15 16  
16 17  
... ... @@ -330,20 +331,25 @@
330 331 public BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit) {
331 332 Criteria criteria=new Criteria();
332 333 if(StringUtils.isNotEmpty(recordUpdateModel.getPatientName())){
333   - criteria.and("patientName").regex(".*?\\" +recordUpdateModel.getPatientName()+ ".*");
  334 + criteria.and("patientName").regex(".*" +recordUpdateModel.getPatientName()+ ".*");
334 335 }
335 336 if(StringUtils.isNotEmpty(recordUpdateModel.getDoctorName())){
336   - criteria.and("doctorName").regex(".*?\\" +recordUpdateModel.getDoctorName()+ ".*");
  337 + criteria.and("doctorName").regex(".*" +recordUpdateModel.getDoctorName()+ ".*");
337 338 }
338 339 if(StringUtils.isNotEmpty(recordUpdateModel.getTeamName())){
339   - criteria.and("teamName").regex(".*?\\" +recordUpdateModel.getTeamName()+ ".*");
  340 + criteria.and("teamName").regex(".*" +recordUpdateModel.getTeamName()+ ".*");
340 341 }
341   - if(null!=recordUpdateModel.getStartTime()){
342   - criteria.and("created").gte(recordUpdateModel.getStartTime());
  342 + if(null!=recordUpdateModel.getStartTime()&&null!=recordUpdateModel.getEndTime()){
  343 + criteria.and("created").gte(recordUpdateModel.getStartTime()).lte(recordUpdateModel.getEndTime());
  344 + }else{
  345 + if(null!=recordUpdateModel.getStartTime()){
  346 + criteria.and("created").gte(recordUpdateModel.getStartTime());
  347 + }
  348 + if(null!=recordUpdateModel.getEndTime()){
  349 + criteria.and("created").lte(recordUpdateModel.getEndTime());
  350 + }
343 351 }
344   - if(null!=recordUpdateModel.getEndTime()){
345   - criteria.and("created").lte(recordUpdateModel.getEndTime());
346   - }
  352 +
347 353 PageResult pageResult = findMongoPage(TeamRecordUpdateModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
348 354 return RespBuilder.buildSuccess(pageResult);
349 355 }