Commit bc8731643b0f3439f05e83e2258e09856bc7076a
1 parent
533d7a072d
Exists in
master
and in
6 other branches
统计
Showing 1 changed file with 24 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
bc87316
| ... | ... | @@ -302,7 +302,10 @@ |
| 302 | 302 | |
| 303 | 303 | result.add(title); |
| 304 | 304 | |
| 305 | + //用于存在没有机构的区域Id | |
| 306 | + List<String> addrId = new ArrayList<>(); | |
| 305 | 307 | |
| 308 | + | |
| 306 | 309 | //序列号 |
| 307 | 310 | int seq = 0; |
| 308 | 311 | |
| 309 | 312 | |
| ... | ... | @@ -330,8 +333,17 @@ |
| 330 | 333 | //查询机构数 |
| 331 | 334 | List<Organization> orgs = organizationService.queryOrganization(query); |
| 332 | 335 | |
| 333 | - orgNumTotal += CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0 ; | |
| 334 | 336 | |
| 337 | + int orgSize = CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0; | |
| 338 | + //机构为0的时候不显示区域名称 | |
| 339 | + if (orgSize == 0) | |
| 340 | + { | |
| 341 | + addrId.add(c.getId()+c.getName()); | |
| 342 | + continue; | |
| 343 | + } | |
| 344 | + | |
| 345 | + orgNumTotal += orgSize; | |
| 346 | + | |
| 335 | 347 | List<String> hids = getConditionHospitalIds(currentUserHospPermissions,orgs); |
| 336 | 348 | |
| 337 | 349 | for (BasicConfig level : riskLevelConfig) |
| ... | ... | @@ -527,6 +539,10 @@ |
| 527 | 539 | { |
| 528 | 540 | for (Map<String, Object> addr : list) |
| 529 | 541 | { |
| 542 | + if (addrId.contains(String.valueOf(addr.get("id")) + String.valueOf(addr.get("name")))) | |
| 543 | + { | |
| 544 | + continue; | |
| 545 | + } | |
| 530 | 546 | xAxis.add(String.valueOf(addr.get("name"))); |
| 531 | 547 | } |
| 532 | 548 | for (BasicConfig config : riskLevelConfig) |
| ... | ... | @@ -542,6 +558,11 @@ |
| 542 | 558 | |
| 543 | 559 | for (Map<String, Object> addr : list) |
| 544 | 560 | { |
| 561 | + if (addrId.contains(String.valueOf(addr.get("id")) + String.valueOf(addr.get("name")))) | |
| 562 | + { | |
| 563 | + continue; | |
| 564 | + } | |
| 565 | + | |
| 545 | 566 | String id = String.valueOf(addr.get("id")); |
| 546 | 567 | if (addrType == 1) |
| 547 | 568 | { |
| ... | ... | @@ -617,8 +638,8 @@ |
| 617 | 638 | } |
| 618 | 639 | datas.put("series",series); |
| 619 | 640 | datas.put("xAxis",xAxis); |
| 620 | - datas.put("legend",titleItems); | |
| 621 | - datas.put("tableDatas",result); | |
| 641 | + datas.put("legend", titleItems); | |
| 642 | + datas.put("tableDatas", result); | |
| 622 | 643 | return new BaseObjectResponse() |
| 623 | 644 | .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas); |
| 624 | 645 | } |