From 03fd15f9d1d3dac2ca5568e750fa464e10c705dc Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 21 Nov 2018 10:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/PremaritalCheckupFacade.java | 48 ++++++++++++++++++---- 1 file changed, 41 insertions(+), 7 deletions(-) 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 e87831c..ea9298c 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 @@ -2198,13 +2198,14 @@ public class PremaritalCheckupFacade { //图标数据 List> series = new LinkedList<>(); Map hjMap = new HashMap(); - hjMap.put("name","婚前检查"); + hjMap.put("name","婚前医学检查人数"); hjMap.put("type","bar"); Map hqwsMap = new HashMap(); hqwsMap.put("name","婚前卫生咨询情况"); hqwsMap.put("type","bar"); List hjList = new ArrayList(); List hqwsList = new ArrayList(); + List> result = new ArrayList<>(); //标题名称 List titleItems = new LinkedList<>(); titleItems.add("男婚检人数"); @@ -2218,13 +2219,14 @@ public class PremaritalCheckupFacade { if(StringUtils.isNotEmpty(areaId)){//按照医院统计 for(String hospitalId : currentUserHospPermissions){ - List shu = new ArrayList(); - Map map = new HashMap(); + List item = new ArrayList(); //查询X轴标题数据 OrganizationQuery idQuery = new OrganizationQuery(); idQuery.setYn(YnEnums.YES.getId()); idQuery.setId(Integer.parseInt(hospitalId)); List orgs = organizationService.queryOrganization(idQuery); + //填报单位 + item.add(orgs.get(0).getName()); PremaritalCheckupQuery query = new PremaritalCheckupQuery(); if (dates != null) { @@ -2265,30 +2267,45 @@ public class PremaritalCheckupFacade { xAxis.add(orgs.get(0).getName()); if(man == 1){ hjList.add("0"); + item.add("0"); if(woman == 1){ hjList.add("0"); hqwsList.add("0"); hqwsList.add("0"); + item.add("0"); + item.add("0"); + item.add("0"); }else{ hjList.add(String.valueOf(dataNv.size())); hqwsList.add("0"); hqwsList.add(String.valueOf(hunqianHealthWoman)); + item.add(String.valueOf(dataNv.size())); + item.add("0"); + item.add(String.valueOf(hunqianHealthWoman)); } }else{ hjList.add(String.valueOf(dataNan.size())); + item.add(String.valueOf(dataNan.size())); if(woman == 1){ hjList.add("0"); hqwsList.add(String.valueOf(hunqianHealthMan)); hqwsList.add("0"); + item.add("0"); + item.add(String.valueOf(hunqianHealthMan)); + item.add("0"); }else{ hjList.add(String.valueOf(dataNv.size())); hqwsList.add(String.valueOf(hunqianHealthMan)); hqwsList.add(String.valueOf(hunqianHealthWoman)); + item.add(String.valueOf(dataNv.size())); + item.add(String.valueOf(hunqianHealthMan)); + item.add(String.valueOf(hunqianHealthWoman)); } } + result.add(item); } hjMap.put("data",hjList); - hqwsMap.put("data",hqwsList); + hqwsMap.put("data", hqwsList); series.add(hjMap); series.add(hqwsMap); }else{ @@ -2358,9 +2375,11 @@ public class PremaritalCheckupFacade { for (BasicConfig c : configList) { - Map map = new HashMap(); + List item = new ArrayList(); OrganizationQuery idQuery = new OrganizationQuery(); idQuery.setYn(YnEnums.YES.getId()); + //填报单位 + item.add(c.getName()); //查询机构数 if (addrType == 1) { @@ -2412,29 +2431,43 @@ public class PremaritalCheckupFacade { xAxis.add(orgs.get(0).getName()); if(man == 1){ hjList.add("0"); + item.add("0"); if(woman == 1){ hjList.add("0"); hqwsList.add("0"); hqwsList.add("0"); + item.add("0"); + item.add("0"); + item.add("0"); }else{ hjList.add(String.valueOf(dataNv.size())); hqwsList.add("0"); hqwsList.add(String.valueOf(hunqianHealthWoman)); + item.add(String.valueOf(dataNv.size())); + item.add("0"); + item.add(String.valueOf(hunqianHealthWoman)); } }else{ hjList.add(String.valueOf(dataNan.size())); + item.add(String.valueOf(dataNan.size())); if(woman == 1){ hjList.add("0"); hqwsList.add(String.valueOf(hunqianHealthMan)); hqwsList.add("0"); + item.add("0"); + item.add(String.valueOf(hunqianHealthMan)); + item.add("0"); }else{ hjList.add(String.valueOf(dataNv.size())); hqwsList.add(String.valueOf(hunqianHealthMan)); hqwsList.add(String.valueOf(hunqianHealthWoman)); + item.add(String.valueOf(dataNv.size())); + item.add(String.valueOf(hunqianHealthMan)); + item.add(String.valueOf(hunqianHealthWoman)); } } } - + result.add(item); } hjMap.put("data",hjList); hqwsMap.put("data",hqwsList); @@ -2444,9 +2477,10 @@ public class PremaritalCheckupFacade { } Map datas = new HashMap<>(); + datas.put("legend",titleItems); datas.put("series", series); + datas.put("tableDatas",result); datas.put("xAxis", xAxis); - datas.put("legend",titleItems); return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas); } -- 1.8.3.1