jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2cc39ec0f1026253131c6af69d0b13cb80ac2d23

Authored by gengxiaokai
1 parent f890f67950
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

婚检统计

Showing 1 changed file with 34 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 2cc39ec
... ... @@ -2492,6 +2492,10 @@
2492 2492 List<String> currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions2(userId, provinceId,
2493 2493 cityId, areaId);
2494 2494 int xuhao = 1;
  2495 + int orgHeji = 0;
  2496 + int totalHeji = 0;
  2497 + int manHeji = 0;
  2498 + int womanHeji = 0;
2495 2499 //图标数据
2496 2500 List<Map<String, Object>> series = new LinkedList<>();
2497 2501 Map<String,Object> hjTotalMap = new HashMap<String,Object>();
... ... @@ -2547,6 +2551,7 @@
2547 2551 if (dataNan != null && dataNan.size() > 0) {
2548 2552 hjManList.add(String.valueOf(dataNan.size()));
2549 2553 totalMan=dataNan.size();
  2554 + manHeji+=totalMan;
2550 2555 } else {
2551 2556 hjManList.add("0");
2552 2557 }
2553 2558  
... ... @@ -2556,11 +2561,13 @@
2556 2561 if (dataNv != null && dataNv.size() > 0) {
2557 2562 hjWomanList.add(String.valueOf(dataNv.size()));
2558 2563 totalWoman=dataNv.size();
  2564 + womanHeji+=totalWoman;
2559 2565 }else {
2560 2566 hjWomanList.add("0");
2561 2567 }
2562 2568 xuhao++;
2563   - item.add(String.valueOf(totalMan+totalWoman));
  2569 + totalHeji+=(totalMan+totalWoman);
  2570 + item.add(String.valueOf(totalMan + totalWoman));
2564 2571 if(dataNan != null && dataNan.size() > 0){
2565 2572 item.add(String.valueOf(dataNan.size()));
2566 2573 }else{
... ... @@ -2574,6 +2581,17 @@
2574 2581 hjTotalList.add(String.valueOf(totalMan+totalWoman));
2575 2582 xAxis.add(orgs.get(0).getName());
2576 2583 result.add(item);
  2584 + if(xuhao>currentUserHospPermissions.size()){
  2585 + List<String> items = new ArrayList<String>();
  2586 + items.add(String.valueOf(xuhao));
  2587 + items.add("合计");
  2588 + items.add(String.valueOf(xuhao-1));
  2589 + items.add(String.valueOf(totalHeji));
  2590 + items.add(String.valueOf(manHeji));
  2591 + items.add(String.valueOf(womanHeji));
  2592 + result.add(items);
  2593 + }
  2594 +
2577 2595 }
2578 2596 hjTotalMap.put("data",hjTotalList);
2579 2597 hjManMap.put("data",hjManList);
... ... @@ -2646,7 +2664,6 @@
2646 2664  
2647 2665 if (CollectionUtils.isNotEmpty(configList)) {
2648 2666  
2649   -
2650 2667 for (BasicConfig c : configList) {
2651 2668 List<String> item = new ArrayList<String>();
2652 2669 OrganizationQuery idQuery = new OrganizationQuery();
... ... @@ -2665,6 +2682,7 @@
2665 2682 //机构总数
2666 2683 int orgSize = CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0;
2667 2684 item.add(String.valueOf(orgSize));
  2685 + orgHeji+=orgSize;
2668 2686  
2669 2687 List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
2670 2688  
... ... @@ -2685,6 +2703,7 @@
2685 2703 if (dataNan != null && dataNan.size() > 0) {
2686 2704 hjManList.add(String.valueOf(dataNan.size()));
2687 2705 totalMan=dataNan.size();
  2706 + manHeji+=totalMan;
2688 2707 } else {
2689 2708 hjManList.add("0");
2690 2709 }
2691 2710  
... ... @@ -2694,9 +2713,11 @@
2694 2713 if (dataNv != null && dataNv.size() > 0) {
2695 2714 hjWomanList.add(String.valueOf(dataNv.size()));
2696 2715 totalWoman=dataNv.size();
  2716 + womanHeji+=totalWoman;
2697 2717 } else {
2698 2718 hjWomanList.add("0");
2699 2719 }
  2720 + totalHeji+=(totalMan+totalWoman);
2700 2721 item.add(String.valueOf(totalMan+totalWoman));
2701 2722 if(dataNan != null && dataNan.size() > 0){
2702 2723 item.add(String.valueOf(dataNan.size()));
2703 2724  
... ... @@ -2708,10 +2729,20 @@
2708 2729 }else{
2709 2730 item.add("0");
2710 2731 }
2711   - hjTotalList.add(String.valueOf(totalMan+totalWoman));
  2732 + hjTotalList.add(String.valueOf(totalMan + totalWoman));
2712 2733 }
2713 2734 xuhao++;
2714 2735 result.add(item);
  2736 + if(xuhao > configList.size()){
  2737 + List<String> items = new ArrayList<String>();
  2738 + items.add(String.valueOf(xuhao));
  2739 + items.add("合计");
  2740 + items.add(String.valueOf(orgHeji));
  2741 + items.add(String.valueOf(totalHeji));
  2742 + items.add(String.valueOf(manHeji));
  2743 + items.add(String.valueOf(womanHeji));
  2744 + result.add(items);
  2745 + }
2715 2746 }
2716 2747 hjTotalMap.put("data",hjTotalList);
2717 2748 hjManMap.put("data",hjManList);