Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseWorkLoadHelper.java =================================================================== diff -u -r36140 -r36375 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseWorkLoadHelper.java (.../TousseWorkLoadHelper.java) (revision 36140) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseWorkLoadHelper.java (.../TousseWorkLoadHelper.java) (revision 36375) @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -32,7 +31,6 @@ import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex; import com.forgon.disinfectsystem.reportforms.vo.ReportQueryParams; import com.forgon.tools.db.DatabaseUtil; -import com.forgon.tools.string.StringTools; import com.forgon.tools.util.SqlUtils; /** * 器械包工作量统计报表 @@ -498,12 +496,13 @@ for(String querySql : queryTousseWorkLoadSqlList){ try{ rs = objectDao.executeSql(querySql); + boolean queryTousseGroupName = SqlUtils.isExistColumn(rs, "tousseGroupName"); while(rs.next()){ String type = rs.getString(1); String tousseName = rs.getString(2); Integer amount = rs.getInt(3); String tousseType = rs.getString(4); - if(SqlUtils.isExistColumn(rs, "tousseGroupName")){ + if(queryTousseGroupName){ result.add(new Object[]{type, tousseName , amount , tousseType, rs.getString("tousseGroupName")}); }else{ result.add(new Object[]{type, tousseName , amount , tousseType});