diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 931e73d..97628d7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -5,6 +5,8 @@ import java.util.*; import com.lyms.hospitalapi.lcfy.LisService; import com.lyms.platform.biz.service.PremaritalCheckupService; import com.lyms.platform.biz.service.ResidentsArchiveService; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.*; @@ -372,7 +374,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if(isUploadingProvince==1){//已上传 query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince)); }else {//未上传 - query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince).orOperator(Criteria.where("isUploadingProvince").exists(true))); + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("isUploadingProvince", isUploadingProvince, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("isUploadingProvince",false, MongoOper.EXISTS); + query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); } }