diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index 3bdcb4d..f4a2f7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -436,18 +436,14 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { } - // 追访结果 1-显示 当前时间 > 预约时间(默认) + // 追访结果 1-显示 当前时间 > 预约时间 // 2-显示 当前时间 < 预约时间 String afterVisitResult = request.getAfterVisitResult(); - if (Objects.isNull(afterVisitResult)) { - afterVisitResult = "1"; - } - - if ("1".equals(afterVisitResult)) { + if (Objects.equals("1", afterVisitResult)) { if (!appointmentTimeBoolean && !nonNull) { query.addCriteria(Criteria.where("appointmentTime").lte(new Date())); } - } else { + } else if (Objects.equals("2", afterVisitResult)){ if (!appointmentTimeBoolean && !nonNull) { query.addCriteria(Criteria.where("appointmentTime").gt(new Date())); }