Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r31206 -r31281 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 31206) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 31281) @@ -4565,14 +4565,6 @@ StrutsResponseUtils.output(jasperReportManager.queryQualityMonitoringDataSource().toString()); } /** - * 保存导出的信息,因为导出内容过长,前台ie报错,所以采取这种方式保存 - */ - public void saveExportHtmlTableInfo() { - HttpServletRequest request = StrutsParamUtils.getRequest(); - String htmlTable = request.getParameter("htmlTable"); - request.getSession().setAttribute("htmlTable", htmlTable); - } - /** * 获取Echarts图形数据 */ public void getReportDataOfEcharts(){ @@ -4641,6 +4633,38 @@ e.printStackTrace(); } return obj; + }else if("QualityMonitoringInspectMonthReport".equals(reportName)){ + JSONObject obj = new JSONObject(); + try { + // 查询科室编码 + String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", ""); + if(StringUtils.isNotBlank(querySupplyRoom) && querySupplyRoom.contains("全部")){ + querySupplyRoom = null; + } + // 质量监测项统计月报 + String queryYear = StrutsParamUtils.getPraramValue("queryYear", ""); + String queryMonth = StrutsParamUtils.getPraramValue("queryMonth", ""); + String monitoringType = StrutsParamUtils.getPraramValue("monitoringType", ""); + // 责任环节 + String responsibilityType = StrutsParamUtils.getPraramValue("responsibilityType", ""); + // 监测项 + String inspectItem = StrutsParamUtils.getPraramValue("inspectItem", ""); + // 图形显示类型 + String type = StrutsParamUtils.getPraramValue("type", null); + String inspectDetail = StrutsParamUtils.getPraramValue("inspectDetail", ""); + List list = null; + if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(queryMonth) ){ + list = jasperReportManager.getQualityMonitoringInspectDayOfMonthParamet(queryYear,querySupplyRoom,queryMonth,monitoringType,inspectItem,inspectDetail,type,responsibilityType); + }else if(StringUtils.isNotBlank(queryYear) ){ + list = jasperReportManager.getQualityMonitoringInspectMonthParamet(queryYear,querySupplyRoom,monitoringType,inspectItem,inspectDetail,type,responsibilityType); + } + obj.put("data", list); + obj.put("success", true); + } catch (Exception e) { + obj.put("success", false); + e.printStackTrace(); + } + return obj; } return new JSONObject(); }