Commit a455a86c61d1c2e3b5c48d4cf933a9697461fa11
1 parent
5eab2080f6
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
View file @
a455a86
... | ... | @@ -611,12 +611,14 @@ |
611 | 611 | } else if (Objects.equals(TYPE_CHECK, type)) { |
612 | 612 | |
613 | 613 | // 儿保检查 |
614 | - query.addCriteria(Criteria.where("yn").in(1)); | |
614 | + query.addCriteria(Criteria.where("yn").is(1)); | |
615 | + query.addCriteria(Criteria.where("dataStatus").ne(1)); | |
615 | 616 | query.addCriteria(new Criteria().orOperator(Criteria.where("buildType").is(3).and("enable").is("1"), Criteria.where("buildType").in(new ArrayList(){{add(1);add(2);}}))); |
616 | 617 | } else if (Objects.equals(TYPE_EYE_CHECK, type)) { |
617 | 618 | |
618 | 619 | // 眼保检查 |
619 | - query.addCriteria(Criteria.where("yn").in(1)); | |
620 | + query.addCriteria(Criteria.where("yn").is(1)); | |
621 | + query.addCriteria(Criteria.where("dataStatus").ne(1)); | |
620 | 622 | query.addCriteria(new Criteria().orOperator(Criteria.where("buildType").is(3).and("enable").is("1"), Criteria.where("buildType").in(new ArrayList(){{add(1);add(2);}}))); |
621 | 623 | |
622 | 624 | } else if (4 == type) { |