jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 275f6b0ea7040d1fbaefea7d7a52c0b1c0af56c3

Authored by liquanyu
1 parent a0c141f0b6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 22 additions and 13 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 275f6b0
... ... @@ -486,20 +486,7 @@
486 486 condition = condition.orCondition(new MongoCondition[]{con1, con});
487 487 }
488 488  
489   - if (null != normal) {
490   - if ("1".equals(normal))
491   - {
492   - MongoCondition con1 = MongoCondition.newInstance("normal", normal, MongoOper.IS);
493   - MongoCondition con = MongoCondition.newInstance("normal", Boolean.FALSE, MongoOper.EXISTS);
494   - condition = condition.orCondition(new MongoCondition[]{con1, con});
495   - }
496   - else
497   - {
498   - condition = condition.and("normal", normal, MongoOper.IS);
499   - }
500 489  
501   - }
502   -
503 490 if (null != pcensusTypeId) {
504 491 condition = condition.and("pcensusTypeId", pcensusTypeId, MongoOper.IS);
505 492 }
... ... @@ -735,6 +722,9 @@
735 722  
736 723 Criteria c1 = null;
737 724  
  725 +
  726 +
  727 +
738 728 if (null != queryNo) {
739 729 MongoCondition c = MongoCondition.newInstance();
740 730 MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
... ... @@ -851,6 +841,25 @@
851 841 if (CollectionUtils.isNotEmpty(fmHospitalList)) {
852 842 condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
853 843 }
  844 +
  845 + if (null != normal) {
  846 + if ("1".equals(normal))
  847 + {
  848 + MongoCondition c = MongoCondition.newInstance();
  849 + MongoCondition con1 = MongoCondition.newInstance("normal", normal, MongoOper.IS);
  850 + MongoCondition con2 = MongoCondition.newInstance("normal", Boolean.FALSE, MongoOper.EXISTS);
  851 + if (c1 != null) {
  852 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  853 + } else {
  854 + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  855 + }
  856 + }
  857 + else
  858 + {
  859 + condition = condition.and("normal", normal, MongoOper.IS);
  860 + }
  861 + }
  862 +
854 863  
855 864 if (lastCheckEmployeeId != null) {
856 865 condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS);