Commit ed8a140acde4f9b14162c2f8d7bb7d8218e57155
1 parent
9c409e1b57
Exists in
master
and in
6 other branches
bug修复 建册统计
Showing 1 changed file with 10 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
ed8a140
| ... | ... | @@ -1115,11 +1115,20 @@ |
| 1115 | 1115 | } |
| 1116 | 1116 | |
| 1117 | 1117 | /** 增加年份条件限制 */ |
| 1118 | - criteria = Criteria.where("created").gte(DateUtil.getYearDate(year)) | |
| 1118 | + criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year)) | |
| 1119 | 1119 | .lt(DateUtil.getNextYearDate(year)) |
| 1120 | 1120 | .and("hospitalId").is(hospitalId); |
| 1121 | + | |
| 1121 | 1122 | if(StringUtils.isNotEmpty(provinceId)) { |
| 1122 | 1123 | criteria.and("provinceId").in(CollectionUtils.asList(provinceId)); |
| 1124 | + } | |
| 1125 | + | |
| 1126 | + if(StringUtils.isNotEmpty(cityId)) { | |
| 1127 | + criteria.and("cityId").in(CollectionUtils.asList(cityId)); | |
| 1128 | + } | |
| 1129 | + | |
| 1130 | + if(StringUtils.isNotEmpty(areaId)) { | |
| 1131 | + criteria.and("areaId").in(CollectionUtils.asList(areaId)); | |
| 1123 | 1132 | } |
| 1124 | 1133 | |
| 1125 | 1134 | List<Patients> patients = mongoTemplate.find(Query.query(criteria), Patients.class); |