Commit a67a6ba924278933d954e80b9b8b68c1cfbb5089
1 parent
9c752d6d5b
Exists in
master
and in
6 other branches
建册统计加上yn限制
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
a67a6ba
| ... | ... | @@ -1084,7 +1084,7 @@ |
| 1084 | 1084 | .lt(DateUtil.getNextYearDate(year)) |
| 1085 | 1085 | .and("hospitalId").is(hospitalId);*/ |
| 1086 | 1086 | |
| 1087 | - Criteria criteria = Criteria.where("hospitalId").is(hospitalId); | |
| 1087 | + Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").nin(0); | |
| 1088 | 1088 | |
| 1089 | 1089 | /** 产前检查： lyms_antexc（初诊），lyms_antex（复诊）设置pid */ |
| 1090 | 1090 | List<AntenatalExaminationModel> antenatalExaminationModels = mongoUtil.findField(AntenatalExaminationModel.class, criteria, "parentId"); |
| ... | ... | @@ -1125,7 +1125,7 @@ |
| 1125 | 1125 | /** 增加年份条件限制 */ |
| 1126 | 1126 | criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year)) |
| 1127 | 1127 | .lt(DateUtil.getNextYearDate(year)) |
| 1128 | - .and("hospitalId").is(hospitalId).and("id").in(patientIds); | |
| 1128 | + .and("hospitalId").is(hospitalId).and("id").in(patientIds).and("yn").nin(0); | |
| 1129 | 1129 | |
| 1130 | 1130 | if(StringUtils.isNotEmpty(provinceId)) { |
| 1131 | 1131 | criteria.and("provinceRegisterId").in(CollectionUtils.asList(provinceId)); |