Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java =================================================================== diff -u -r41581 -r41583 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java (.../InstrumentRepairBarChartReportHandler.java) (revision 41581) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java (.../InstrumentRepairBarChartReportHandler.java) (revision 41583) @@ -101,7 +101,6 @@ parameterMap.put("title", "器械维修记录报表" + startTime + "至" + endTime); parameterMap.put("faultLocationMap", faultLocationMap); parameterMap.put("deviceTypeMap", deviceTypeMap); - System.out.println(JSONObject.fromObject(parameterMap)); return new JSONArray(); } /** @@ -114,12 +113,12 @@ try (ResultSet rs = objectDao.executeSql(sql)){ while (rs.next()) { String yearMonth = rs.getString("yyyymm"); - String deviceType = rs.getString("optionText"); + String optionText = rs.getString("optionText"); int amount = rs.getInt("amount"); resultMap - .computeIfAbsent(yearMonth, k -> new HashMap<>()) - .put(deviceType, amount); + .computeIfAbsent(optionText, k -> new HashMap<>()) + .put(yearMonth, amount); } } catch (Exception e) { e.printStackTrace();