Commit db25e26450aefe9cfde6d38814869991eb02edad
1 parent
b0639d14bd
Exists in
master
and in
6 other branches
肌萎缩
Showing 1 changed file with 10 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
View file @
db25e26
| ... | ... | @@ -155,7 +155,15 @@ |
| 155 | 155 | } |
| 156 | 156 | else if (param.getQueryType() == 3) |
| 157 | 157 | { |
| 158 | - query.addCriteria(Criteria.where("status").gte(2)); | |
| 158 | + Integer status = param.getStatus(); | |
| 159 | + if (status != null && status >= 2) { | |
| 160 | + query.addCriteria(Criteria.where("status").is(status)); | |
| 161 | + } | |
| 162 | + else | |
| 163 | + { | |
| 164 | + query.addCriteria(Criteria.where("status").gte(2)); | |
| 165 | + } | |
| 166 | + | |
| 159 | 167 | } |
| 160 | 168 | |
| 161 | 169 | if (StringUtils.isNotEmpty(param.getSendHospitalId())) |
| ... | ... | @@ -250,7 +258,7 @@ |
| 250 | 258 | query.addCriteria(Criteria.where("ybNum").is(ybNum)); |
| 251 | 259 | } |
| 252 | 260 | Integer status = param.getStatus(); |
| 253 | - if (status != null) { | |
| 261 | + if (status != null && param.getQueryType() != 3) { | |
| 254 | 262 | query.addCriteria(Criteria.where("status").is(status)); |
| 255 | 263 | } |
| 256 | 264 | Integer result = param.getResult(); |