Commit fb05ec1c04e82d589b0cf118c40e17826ede23a2
1 parent
6c8a933f8f
Exists in
master
and in
6 other branches
追访
Showing 1 changed file with 8 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
fb05ec1
| ... | ... | @@ -638,16 +638,19 @@ |
| 638 | 638 | List<MongoCondition> mongoCondits = new ArrayList<>(); |
| 639 | 639 | |
| 640 | 640 | if (-1 != yn) { |
| 641 | - // MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS); | |
| 642 | - mongoCondits.add(new MongoCondition("yn", yn, MongoOper.IS)); | |
| 643 | - mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); | |
| 641 | + MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS); | |
| 644 | 642 | } |
| 645 | 643 | |
| 646 | - condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); | |
| 647 | - | |
| 648 | 644 | if (dataStatus) {//分娩自动建档 |
| 649 | 645 | condition = condition.and("dataStatus", 1, MongoOper.NE); |
| 646 | + }else{ | |
| 647 | + mongoCondits.add(new MongoCondition("yn", yn, MongoOper.IS)); | |
| 648 | + mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); | |
| 649 | + condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); | |
| 650 | 650 | } |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 651 | 654 | if (null != buildType) { |
| 652 | 655 | condition = condition.and("buildType", buildType, MongoOper.IS); |
| 653 | 656 | } |