Commit 2faa927707248314ce318768ec8947a0dc542597
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java
View file @
2faa927
| ... | ... | @@ -120,11 +120,14 @@ |
| 120 | 120 | if(StringUtils.isNotEmpty(areaId)){ |
| 121 | 121 | condition= condition.and("areaId",areaId, MongoOper.IS); |
| 122 | 122 | } |
| 123 | - if(StringUtils.isNotEmpty(areaId)){ | |
| 123 | + if(StringUtils.isNotEmpty(hospitalId)){ | |
| 124 | 124 | condition= condition.and("hospitalId",hospitalId, MongoOper.IS); |
| 125 | 125 | } |
| 126 | 126 | if(StringUtils.isNotEmpty(streetId)){ |
| 127 | 127 | condition = condition.and("streetId", streetId, MongoOper.IS); |
| 128 | + } | |
| 129 | + if(null!=trackType){ | |
| 130 | + condition = condition.and("trackType", trackType, MongoOper.IS); | |
| 128 | 131 | } |
| 129 | 132 | if(StringUtils.isNotEmpty(parentId)){ |
| 130 | 133 | condition = condition.and("parentId", parentId, MongoOper.IS); |