Commit faff4978dd426014a1811b7cdbd4f94eb878b842
1 parent
1f22fe8095
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 6 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
faff497
| ... | ... | @@ -5,6 +5,8 @@ |
| 5 | 5 | import com.lyms.hospitalapi.lcfy.LisService; |
| 6 | 6 | import com.lyms.platform.biz.service.PremaritalCheckupService; |
| 7 | 7 | import com.lyms.platform.biz.service.ResidentsArchiveService; |
| 8 | +import com.lyms.platform.common.dao.operator.MongoCondition; | |
| 9 | +import com.lyms.platform.common.dao.operator.MongoOper; | |
| 8 | 10 | import com.lyms.platform.common.enums.YnEnums; |
| 9 | 11 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 10 | 12 | import com.lyms.platform.common.utils.*; |
| ... | ... | @@ -372,7 +374,10 @@ |
| 372 | 374 | if(isUploadingProvince==1){//已上传 |
| 373 | 375 | query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince)); |
| 374 | 376 | }else {//未上传 |
| 375 | - query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince).orOperator(Criteria.where("isUploadingProvince").exists(true))); | |
| 377 | + MongoCondition c = MongoCondition.newInstance(); | |
| 378 | + MongoCondition con1 = MongoCondition.newInstance("isUploadingProvince", isUploadingProvince, MongoOper.IS); | |
| 379 | + MongoCondition con2 = MongoCondition.newInstance("isUploadingProvince",false, MongoOper.EXISTS); | |
| 380 | + query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); | |
| 376 | 381 | } |
| 377 | 382 | |
| 378 | 383 | } |