Commit b9fe0e22269d5235729c991148f239390cb53f07
1 parent
445b8e5c95
Exists in
master
and in
6 other branches
追访记录
Showing 1 changed file with 17 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
View file @
b9fe0e2
| ... | ... | @@ -358,8 +358,8 @@ |
| 358 | 358 | String startCheckTime = request.getStartCheckTime(); |
| 359 | 359 | String endCheckTime = request.getEndCheckTime(); |
| 360 | 360 | if (Objects.nonNull(startCheckTime) && Objects.nonNull(endCheckTime)) { |
| 361 | - startCheckTime += startCheckTime + "00:00:00"; | |
| 362 | - endCheckTime += endCheckTime + "23:59:59"; | |
| 361 | + startCheckTime += " 00:00:00"; | |
| 362 | + endCheckTime += " 23:59:59"; | |
| 363 | 363 | Date startDate = DateUtil.parseYMDHMS(startCheckTime); |
| 364 | 364 | Date endDate = DateUtil.parseYMDHMS(endCheckTime); |
| 365 | 365 | query.addCriteria(Criteria.where("checkTime").gte(startDate).lte(endDate)); |
| ... | ... | @@ -411,7 +411,7 @@ |
| 411 | 411 | |
| 412 | 412 | Date date = new Date(); |
| 413 | 413 | // 交集 |
| 414 | - boolean a = s2.before(e1) && e1.after(e2) && s1.before(s2) && date.after(s2) && date.before(e1); | |
| 414 | + /* boolean a = s2.before(e1) && e1.after(e2) && s1.before(s2) && date.after(s2) && date.before(e1); | |
| 415 | 415 | boolean b = s2.before(e1) && e2.before(e1) && s1.before(s2) && date.after(s2) && date.before(e2); |
| 416 | 416 | boolean c = s2.before(s1) && s1.before(e2) && e2.before(e1) && date.before(e2) && date.after(s1); |
| 417 | 417 | boolean d = s2.before(s1) && s1.before(e1) && e1.before(e2) && date.before(e1) && date.after(s1); |
| ... | ... | @@ -422,6 +422,17 @@ |
| 422 | 422 | query.addCriteria(Criteria.where("appointmentTime").gte(s1).lte(date)); |
| 423 | 423 | }else { |
| 424 | 424 | return new BaseResponse(); |
| 425 | + }*/ | |
| 426 | + if (s1.before(s2) && s2.before(e1) && e1.before(e2)) { | |
| 427 | + query.addCriteria(Criteria.where("appointmentTime").gte(s2).lte(e1)); | |
| 428 | + } else if (s1.before(s2) && s2.before(e2) && e2.before(s1)) { | |
| 429 | + query.addCriteria(Criteria.where("appointmentTime").gte(s2).lte(e2)); | |
| 430 | + } else if (s2.before(s1) && s1.before(e2) && e2.before(e1)) { | |
| 431 | + query.addCriteria(Criteria.where("appointmentTime").gte(s1).lte(e2)); | |
| 432 | + } else if (s2.before(s1) && s1.before(e1) && e1.before(e2)) { | |
| 433 | + query.addCriteria(Criteria.where("appointmentTime").gte(s1).lte(e1)); | |
| 434 | + } else { | |
| 435 | + return new BaseResponse(); | |
| 425 | 436 | } |
| 426 | 437 | } |
| 427 | 438 | if (appointmentTimeBoolean && !nonNull) { |
| 428 | 439 | |
| ... | ... | @@ -442,10 +453,11 @@ |
| 442 | 453 | if (beyondDay > 0) { |
| 443 | 454 | end = getEndDate(beyondDay); |
| 444 | 455 | start = getStartDate(beyondDay); |
| 445 | - if (date.before(start) || date.after(end)) { | |
| 456 | + /*if (date.before(start) || date.after(end)) { | |
| 446 | 457 | return new BaseResponse(); |
| 447 | 458 | } |
| 448 | - query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(date)); | |
| 459 | + query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(date));*/ | |
| 460 | + query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(end)); | |
| 449 | 461 | } else { |
| 450 | 462 | // 针对逾期天数为负数 |
| 451 | 463 | beyondDay = new BigInteger(beyondDay.toString()).abs().intValue(); |