shiyang / regional-platform

Download as
Browse Code »

Commit a7112efb5a974dd55c6302472a2b74ce4fd3dd56

Authored by rui.zhang
1 parent 33b9865bac
Exists in master and in 1 other branch nobuildprocess

platform permission 

参考值查询

Showing 1 changed file with 20 additions and 4 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java View file @ a7112ef
... ... @@ -40,18 +40,34 @@
40 40 }
41 41 if (null != referVal) {
42 42 if(1 == referVal) {
43   - condition.and("charRefer", null, MongoOper.NE);
  43 + condition.andCondition(new MongoCondition("charRefer", null, MongoOper.NE).orCondition(new MongoCondition("charRefer", "", MongoOper.NE)));
44 44 } else if(2 == referVal) {
45   - condition.and("charRefer", null, MongoOper.IS);
  45 + condition.orCondition(new MongoCondition[] {new MongoCondition("charRefer", null, MongoOper.IS), new MongoCondition("charRefer", "", MongoOper.IS)});
46 46 }
47 47 }
48 48 if (null != emergencyVal) {
49 49 if(1 == emergencyVal) {
50   - condition.and("emergencyChar", null, MongoOper.NE);
  50 + condition.andCondition(new MongoCondition("emergencyChar", null, MongoOper.NE).orCondition(new MongoCondition("emergencyChar", "", MongoOper.NE)));
  51 +
51 52 } else if(2 == emergencyVal) {
52   - condition.and("emergencyChar", null, MongoOper.IS);
  53 + condition.orCondition(new MongoCondition[]{new MongoCondition("emergencyChar", null, MongoOper.IS), new MongoCondition("emergencyChar", "", MongoOper.IS)});
53 54 }
54 55 }
  56 +
  57 +// if (null != referVal) {
  58 +// if(1 == referVal) {
  59 +// condition.and("charRefer", null, MongoOper.NE);
  60 +// } else if(2 == referVal) {
  61 +// condition.and("charRefer", null, MongoOper.IS);
  62 +// }
  63 +// }
  64 +// if (null != emergencyVal) {
  65 +// if(1 == emergencyVal) {
  66 +// condition.and("emergencyChar", null, MongoOper.NE);
  67 +// } else if(2 == emergencyVal) {
  68 +// condition.and("emergencyChar", null, MongoOper.IS);
  69 +// }
  70 +// }
55 71  
56 72 if(null != yn) {
57 73 condition.and("yn", yn, MongoOper.IS);