diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 093b3db..dde181d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -717,18 +717,20 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) { criteria.and("doctor").is(doctor); } - + List chechMonths = new ArrayList<>(); if (b && StringUtils.isNotEmpty(chechMonth)) { - if ("0".equals(chechMonth)) { - chechMonth = "1"; - } else if ("9".equals(chechMonth)) { - chechMonth = "12"; - } else if ("18".equals(chechMonth)) { - chechMonth = "24"; + if ("1".equals(chechMonth)) { + chechMonths.add("0"); + } else if ("12".equals(chechMonth)) { + chechMonths.add("9"); + } else if ("24".equals(chechMonth)) { + chechMonth = "18"; } + + chechMonths.add(chechMonth); } if (StringUtils.isNotEmpty(chechMonth)) { - criteria.and("checkMonthId").is(chechMonth); + criteria.and("checkMonthId").in(chechMonths); } if (currentMonthStart != null && currentMonthEnd != null) {