Commit fc1ffd25d160768099c34a45208dc1ff9f30b0c5
1 parent
d25e7906bf
Exists in
master
and in
6 other branches
追访
Showing 1 changed file with 2 additions and 3 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
fc1ffd2
| ... | ... | @@ -639,18 +639,17 @@ |
| 639 | 639 | |
| 640 | 640 | if (-1 != yn) { |
| 641 | 641 | condition = condition.and("yn", yn, MongoOper.IS); |
| 642 | - }else{ | |
| 642 | + } else { | |
| 643 | 643 | if (dataStatus != null) { |
| 644 | 644 | if (dataStatus) {//分娩自动建档 |
| 645 | 645 | condition = condition.and("dataStatus", 1, MongoOper.NE); |
| 646 | 646 | } else { |
| 647 | 647 | mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS)); |
| 648 | 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()])); | |
| 649 | + condition = condition.andCondition(condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]))); | |
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | 652 | } |
| 653 | - | |
| 654 | 653 | |
| 655 | 654 | |
| 656 | 655 | if (null != buildType) { |