diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index d476a9b..7ba2f20 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -2492,6 +2492,10 @@ public class PremaritalCheckupFacade { List currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions2(userId, provinceId, cityId, areaId); int xuhao = 1; + int orgHeji = 0; + int totalHeji = 0; + int manHeji = 0; + int womanHeji = 0; //图标数据 List> series = new LinkedList<>(); Map hjTotalMap = new HashMap(); @@ -2547,6 +2551,7 @@ public class PremaritalCheckupFacade { if (dataNan != null && dataNan.size() > 0) { hjManList.add(String.valueOf(dataNan.size())); totalMan=dataNan.size(); + manHeji+=totalMan; } else { hjManList.add("0"); } @@ -2556,11 +2561,13 @@ public class PremaritalCheckupFacade { if (dataNv != null && dataNv.size() > 0) { hjWomanList.add(String.valueOf(dataNv.size())); totalWoman=dataNv.size(); + womanHeji+=totalWoman; }else { hjWomanList.add("0"); } xuhao++; - item.add(String.valueOf(totalMan+totalWoman)); + totalHeji+=(totalMan+totalWoman); + item.add(String.valueOf(totalMan + totalWoman)); if(dataNan != null && dataNan.size() > 0){ item.add(String.valueOf(dataNan.size())); }else{ @@ -2574,6 +2581,17 @@ public class PremaritalCheckupFacade { hjTotalList.add(String.valueOf(totalMan+totalWoman)); xAxis.add(orgs.get(0).getName()); result.add(item); + if(xuhao>currentUserHospPermissions.size()){ + List items = new ArrayList(); + items.add(String.valueOf(xuhao)); + items.add("合计"); + items.add(String.valueOf(xuhao-1)); + items.add(String.valueOf(totalHeji)); + items.add(String.valueOf(manHeji)); + items.add(String.valueOf(womanHeji)); + result.add(items); + } + } hjTotalMap.put("data",hjTotalList); hjManMap.put("data",hjManList); @@ -2646,7 +2664,6 @@ public class PremaritalCheckupFacade { if (CollectionUtils.isNotEmpty(configList)) { - for (BasicConfig c : configList) { List item = new ArrayList(); OrganizationQuery idQuery = new OrganizationQuery(); @@ -2665,6 +2682,7 @@ public class PremaritalCheckupFacade { //机构总数 int orgSize = CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0; item.add(String.valueOf(orgSize)); + orgHeji+=orgSize; List hids = getConditionHospitalIds(currentUserHospPermissions, orgs); @@ -2685,6 +2703,7 @@ public class PremaritalCheckupFacade { if (dataNan != null && dataNan.size() > 0) { hjManList.add(String.valueOf(dataNan.size())); totalMan=dataNan.size(); + manHeji+=totalMan; } else { hjManList.add("0"); } @@ -2694,9 +2713,11 @@ public class PremaritalCheckupFacade { if (dataNv != null && dataNv.size() > 0) { hjWomanList.add(String.valueOf(dataNv.size())); totalWoman=dataNv.size(); + womanHeji+=totalWoman; } else { hjWomanList.add("0"); } + totalHeji+=(totalMan+totalWoman); item.add(String.valueOf(totalMan+totalWoman)); if(dataNan != null && dataNan.size() > 0){ item.add(String.valueOf(dataNan.size())); @@ -2708,10 +2729,20 @@ public class PremaritalCheckupFacade { }else{ item.add("0"); } - hjTotalList.add(String.valueOf(totalMan+totalWoman)); + hjTotalList.add(String.valueOf(totalMan + totalWoman)); } xuhao++; result.add(item); + if(xuhao > configList.size()){ + List items = new ArrayList(); + items.add(String.valueOf(xuhao)); + items.add("合计"); + items.add(String.valueOf(orgHeji)); + items.add(String.valueOf(totalHeji)); + items.add(String.valueOf(manHeji)); + items.add(String.valueOf(womanHeji)); + result.add(items); + } } hjTotalMap.put("data",hjTotalList); hjManMap.put("data",hjManList);