Commit a344d755c33c899e3d37731378393a1030883a36
1 parent
c373f211fb
Exists in
master
and in
6 other branches
访视时间
Showing 1 changed file with 3 additions and 6 deletions
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
View file @
a344d75
| ... | ... | @@ -253,12 +253,6 @@ |
| 253 | 253 | condition = condition.and("hospitalId",hospitalId , MongoOper.IS); |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | - if (visitStartDate!=null) { | |
| 257 | - condition = condition.and("visitDate",visitStartDate , MongoOper.GTE); | |
| 258 | - } | |
| 259 | - if (visitEndDate!=null) { | |
| 260 | - condition = condition.and("visitDate",visitEndDate , MongoOper.LTE); | |
| 261 | - } | |
| 262 | 256 | if (StringUtils.isNotBlank(deliverId)) { |
| 263 | 257 | condition = condition.and("deliverId",deliverId , MongoOper.IS); |
| 264 | 258 | } |
| ... | ... | @@ -286,6 +280,9 @@ |
| 286 | 280 | Criteria c = null; |
| 287 | 281 | if(null != createdTimeStart && createdTimeEnd != null){ |
| 288 | 282 | c = Criteria.where("createDate").gte(createdTimeStart).lte(createdTimeEnd); |
| 283 | + } | |
| 284 | + if(null != visitStartDate && visitEndDate != null){ | |
| 285 | + c = Criteria.where("visitDate").gte(createdTimeStart).lte(createdTimeEnd); | |
| 289 | 286 | } |
| 290 | 287 | if(null != updateDateStart && updateDateEnd != null){ |
| 291 | 288 | c = Criteria.where("updateDate").gte(updateDateStart).lte(updateDateEnd); |