Commit 9175b6a05c7f9f449a8500ecd4d153eb0b0e4c8e
1 parent
be11edf5c5
Exists in
master
and in
6 other branches
完善产检次数分布统计
Showing 1 changed file with 6 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
9175b6a
| ... | ... | @@ -1165,9 +1165,11 @@ |
| 1165 | 1165 | criteria.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); |
| 1166 | 1166 | } |
| 1167 | 1167 | if(startWeek != null && endWeek != null) { /** 末次月经 到 现在相隔的周数 */ |
| 1168 | - criteria.and("lastMenses").lte(DateUtil.getWeekDay(startWeek)) | |
| 1169 | - .gte(DateUtil.getWeekDay(-startWeek)); | |
| 1168 | + criteria.and("lastMenses").lte(DateUtil.getWeekDay(startWeek)).gte(DateUtil.getWeekDay(-endWeek)); | |
| 1170 | 1169 | } |
| 1170 | + if(childBirth != null) { | |
| 1171 | + criteria.and("type").is(childBirth); | |
| 1172 | + } | |
| 1171 | 1173 | List<Patients> patients = mongoUtil.findField(Patients.class, criteria,"id", "bookbuildingDate", "fmDate", "pid"); |
| 1172 | 1174 | List<String> patientIds = CollectionUtils.getId(patients, "id", String.class); |
| 1173 | 1175 | Map<String, Object> restMap = new HashMap<>(); |
| 1174 | 1176 | |
| ... | ... | @@ -1333,16 +1335,13 @@ |
| 1333 | 1335 | } |
| 1334 | 1336 | } |
| 1335 | 1337 | } |
| 1336 | - System.out.println(antExChuModels.size()); | |
| 1337 | - System.out.println(antExModels.size()); | |
| 1338 | - System.out.println(datas.size()); | |
| 1339 | - for (Map<String, Object> data : datas) { | |
| 1338 | + /* for (Map<String, Object> data : datas) { | |
| 1340 | 1339 | Set<Map.Entry<String, Object>> entries = data.entrySet(); |
| 1341 | 1340 | for (Map.Entry<String, Object> entry : entries) { |
| 1342 | 1341 | System.out.print(entry.getKey() + " = " + (entry.getValue() instanceof Date ? ((Date) entry.getValue()).toLocaleString(): entry.getValue()) + "\t"); |
| 1343 | 1342 | } |
| 1344 | 1343 | System.out.println(); |
| 1345 | - } | |
| 1344 | + }*/ | |
| 1346 | 1345 | } |
| 1347 | 1346 | |
| 1348 | 1347 | private List<Series> createPatientSeries(List<Map<String, Object>> datas) { |