Commit 5376fa69deaab7388cb830e38f558956b6b248e4
1 parent
e4def35472
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 3 additions and 3 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
5376fa6
| ... | ... | @@ -521,10 +521,10 @@ |
| 521 | 521 | if (null != hScore) { |
| 522 | 522 | condition = condition.and("riskScore", hScore, MongoOper.IS); |
| 523 | 523 | } |
| 524 | - if (null != isHighRisk) { | |
| 525 | - condition = condition.and("riskLevelId", null, MongoOper.NE); | |
| 526 | - } else if (StringUtils.isNotEmpty( rLevel)) { | |
| 524 | + if (StringUtils.isNotEmpty( rLevel)) { | |
| 527 | 525 | condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); |
| 526 | + }else if (null != isHighRisk) { | |
| 527 | + condition = condition.and("riskLevelId", null, MongoOper.NE); | |
| 528 | 528 | } |
| 529 | 529 | if (null != areaId) { |
| 530 | 530 | condition = condition.and("areaId", areaId, MongoOper.IS); |