Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java =================================================================== diff -u -r26433 -r26435 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 26433) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 26435) @@ -9,6 +9,7 @@ import java.util.Map; import java.util.TreeMap; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -355,28 +356,26 @@ */ public JSONObject getListChartData(String departCoding,String sterilizationPurpose, String yearAndMonth){ - JSONObject resultObj = new JSONObject(); + JSONObject obj = new JSONObject(); try { String sql = createSqlOfListChartData(departCoding, sterilizationPurpose, yearAndMonth); ResultSet resultSet = objectDao.executeSql(sql); - List names = new ArrayList(); - List amounts = new ArrayList(); - while(resultSet.next()){ + JSONArray arr = new JSONArray(); + while(resultSet.next()){ + JSONObject itemObj = new JSONObject(); Long amount = resultSet.getLong("amount"); String name = resultSet.getString("name"); - names.add(name); - amounts.add(amount); + itemObj.put("amount", amount); + itemObj.put("name", name); + arr.add(itemObj); } - JSONObject obj = new JSONObject(); - obj.put("name", names); - obj.put("amounts", amounts); - resultObj.put("data", obj); - resultObj.put("success", true); + obj.put("data", arr); + obj.put("success", true); } catch (Exception e) { - resultObj.put("success", false); + obj.put("success", false); e.printStackTrace(); } - return resultObj; + return obj; } /** * 创建获取灭菌炉使用次数统计报表之图形数据的sql