Commit a1123560501b43ab0c6c1f8dc7f4798ebaab8873
1 parent
4c0f645b2d
Exists in
master
and in
1 other branch
追访记录
Showing 1 changed file with 3 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
View file @
a112356
| ... | ... | @@ -436,18 +436,14 @@ |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | |
| 439 | - // 追访结果 1-显示 当前时间 > 预约时间（默认） | |
| 439 | + // 追访结果 1-显示 当前时间 > 预约时间 | |
| 440 | 440 | // 2-显示 当前时间 < 预约时间 |
| 441 | 441 | String afterVisitResult = request.getAfterVisitResult(); |
| 442 | - if (Objects.isNull(afterVisitResult)) { | |
| 443 | - afterVisitResult = "1"; | |
| 444 | - } | |
| 445 | - | |
| 446 | - if ("1".equals(afterVisitResult)) { | |
| 442 | + if (Objects.equals("1", afterVisitResult)) { | |
| 447 | 443 | if (!appointmentTimeBoolean && !nonNull) { |
| 448 | 444 | query.addCriteria(Criteria.where("appointmentTime").lte(new Date())); |
| 449 | 445 | } |
| 450 | - } else { | |
| 446 | + } else if (Objects.equals("2", afterVisitResult)){ | |
| 451 | 447 | if (!appointmentTimeBoolean && !nonNull) { |
| 452 | 448 | query.addCriteria(Criteria.where("appointmentTime").gt(new Date())); |
| 453 | 449 | } |