Commit f9a1b34be30c2c075e5216490a91e7b8b1572149
1 parent
ca33462e77
Exists in
master
and in
6 other branches
统计
Showing 1 changed file with 20 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
f9a1b34
| ... | ... | @@ -359,6 +359,12 @@ |
| 359 | 359 | //权限和筛选条件不未空的时候就查询孕妇高危数量 |
| 360 | 360 | if (CollectionUtils.isNotEmpty(hids)) |
| 361 | 361 | { |
| 362 | + | |
| 363 | + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) { | |
| 364 | + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart())); | |
| 365 | + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd())); | |
| 366 | + } | |
| 367 | + | |
| 362 | 368 | //权限 |
| 363 | 369 | patientsQuery.setHospitalList(hids); |
| 364 | 370 | |
| ... | ... | @@ -420,6 +426,13 @@ |
| 420 | 426 | |
| 421 | 427 | if (currentUserHospPermissions.contains(String.valueOf(org.getId()))) |
| 422 | 428 | { |
| 429 | + | |
| 430 | + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) | |
| 431 | + { | |
| 432 | + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart())); | |
| 433 | + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd())); | |
| 434 | + } | |
| 435 | + | |
| 423 | 436 | List<String> hids = new ArrayList<>(); |
| 424 | 437 | hids.add(String.valueOf(org.getId())); |
| 425 | 438 | //权限 |
| ... | ... | @@ -453,7 +466,7 @@ |
| 453 | 466 | |
| 454 | 467 | int index = addrType < 3 ? 4 : 3; |
| 455 | 468 | |
| 456 | - for (int i = index ; i <= (times == null ? 0+index : times.size()+index) ; i++) | |
| 469 | + for (int i = index ; i <= (times == null ? index : times.size()+index) ; i++) | |
| 457 | 470 | { |
| 458 | 471 | int total = 0; |
| 459 | 472 | for (List<String> items : result) |
| ... | ... | @@ -471,6 +484,12 @@ |
| 471 | 484 | } |
| 472 | 485 | |
| 473 | 486 | //统计柱状图数据封装-------------------------------- |
| 487 | + | |
| 488 | + | |
| 489 | + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) { | |
| 490 | + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart())); | |
| 491 | + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd())); | |
| 492 | + } | |
| 474 | 493 | |
| 475 | 494 | //图标数据 |
| 476 | 495 | List<Map<String,Object>> series = new ArrayList<>(); |