diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 6dc018f..d4b6e98 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -504,7 +505,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE); - condition = condition.orCondition(new MongoCondition[]{condition12,condition1}); + condition = condition.orCondition(new MongoCondition[]{condition12, condition1}); }else if(null!=buildTypeList){ MongoCondition mongoCondition=MongoCondition.newInstance("buildType",3,MongoOper.IS); MongoCondition condition1=mongoCondition.and("enable", "1", MongoOper.IS); @@ -596,8 +597,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != orServiceStatus && orServiceStatus.length > 1) { - Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]); - condition.andCondition(new MongoCondition(c)); + condition = condition.and("serviceStatus", Arrays.asList(orServiceStatus), MongoOper.IN); +// Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]); +// condition.andCondition(new MongoCondition(c)); } if (null != hcertificateNum) { condition = condition.and("hcertificateNum", hcertificateNum, MongoOper.LIKE);