Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33405 -r33408 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33405) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33408) @@ -11442,8 +11442,13 @@ sql += " order by m.enteringDate desc "; ResultSet rs = null; try { + boolean enableTheDisplayOfDepartNameOfPatientAndUsageCountForUsingRecordEntryDetailReports = CssdUtils.getSystemSetConfigByNameBool("enableTheDisplayOfDepartNameOfPatientAndUsageCountForUsingRecordEntryDetailReports", false); + if(enableTheDisplayOfDepartNameOfPatientAndUsageCountForUsingRecordEntryDetailReports){ + requestParameters.put("jasperreportName", + "extendedFieldsUseRecordEntryDetailReport.jasper"); + } rs = objectDao.executeSql(sql); - if(StringUtils.isNotBlank(requestParameters.get("enableExtendedFieldsUseRecordEntryDetailReports"))){ + if(enableTheDisplayOfDepartNameOfPatientAndUsageCountForUsingRecordEntryDetailReports){ firstColumnVos = new ArrayList(); Map firstColumnVoMap = new HashMap(); while (rs.next()) {