Commit 4b691ce04c08dae010e6a6b836e1535c26243e01
1 parent
a50f60c07d
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
4b691ce
| ... | ... | @@ -717,18 +717,20 @@ |
| 717 | 717 | if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) { |
| 718 | 718 | criteria.and("doctor").is(doctor); |
| 719 | 719 | } |
| 720 | - | |
| 720 | + List<String> chechMonths = new ArrayList<>(); | |
| 721 | 721 | if (b && StringUtils.isNotEmpty(chechMonth)) { |
| 722 | - if ("0".equals(chechMonth)) { | |
| 723 | - chechMonth = "1"; | |
| 724 | - } else if ("9".equals(chechMonth)) { | |
| 725 | - chechMonth = "12"; | |
| 726 | - } else if ("18".equals(chechMonth)) { | |
| 727 | - chechMonth = "24"; | |
| 722 | + if ("1".equals(chechMonth)) { | |
| 723 | + chechMonths.add("0"); | |
| 724 | + } else if ("12".equals(chechMonth)) { | |
| 725 | + chechMonths.add("9"); | |
| 726 | + } else if ("24".equals(chechMonth)) { | |
| 727 | + chechMonth = "18"; | |
| 728 | 728 | } |
| 729 | + | |
| 730 | + chechMonths.add(chechMonth); | |
| 729 | 731 | } |
| 730 | 732 | if (StringUtils.isNotEmpty(chechMonth)) { |
| 731 | - criteria.and("checkMonthId").is(chechMonth); | |
| 733 | + criteria.and("checkMonthId").in(chechMonths); | |
| 732 | 734 | } |
| 733 | 735 | |
| 734 | 736 | if (currentMonthStart != null && currentMonthEnd != null) { |