fangcheng / regional-platform

Download as
Browse Code ยป

Commit 9d4ed732fcdf1596cf2c5eda53af60e393b3d6eb

Authored by liquanyu
1 parent 1469b30162
Exists in master and in 1 other branch nobuildprocess

code update

Showing 1 changed file with 5 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 9d4ed73
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.utils.StringUtils;
9 9 import org.springframework.data.mongodb.core.query.Criteria;
10 10  
  11 +import java.util.Arrays;
11 12 import java.util.Date;
12 13 import java.util.List;
13 14  
... ... @@ -504,7 +505,7 @@
504 505  
505 506 MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE);
506 507  
507   - condition = condition.orCondition(new MongoCondition[]{condition12,condition1});
  508 + condition = condition.orCondition(new MongoCondition[]{condition12, condition1});
508 509 }else if(null!=buildTypeList){
509 510 MongoCondition mongoCondition=MongoCondition.newInstance("buildType",3,MongoOper.IS);
510 511 MongoCondition condition1=mongoCondition.and("enable", "1", MongoOper.IS);
... ... @@ -596,8 +597,9 @@
596 597  
597 598  
598 599 if (null != orServiceStatus && orServiceStatus.length > 1) {
599   - Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]);
600   - condition.andCondition(new MongoCondition(c));
  600 + condition = condition.and("serviceStatus", Arrays.asList(orServiceStatus), MongoOper.IN);
  601 +// Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]);
  602 +// condition.andCondition(new MongoCondition(c));
601 603 }
602 604 if (null != hcertificateNum) {
603 605 condition = condition.and("hcertificateNum", hcertificateNum, MongoOper.LIKE);