Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15692 -r15693 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15692) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15693) @@ -940,11 +940,16 @@ String nextYear = getNextYear(year) + " 00:00:00"; String timeCompareSql = ""; String database = dbConnection.getDatabase(); - // 按天算次日下送时间,只要不是当天回收当天发,都是次日下送. if(DatabaseUtil.isOracle(database)){ - timeCompareSql = " trunc(iv.sendTime) - trunc(iv.recyclingTime) > 0 "; + // 按天算次日下送时间,只要不是当天回收当天发,都是次日下送. +// timeCompareSql = " trunc(iv.sendTime) - trunc(iv.recyclingTime) > 0 "; + // 按24小时算,两者相减的单位是24小时,> 1即大于24小时 + timeCompareSql = " trunc(iv.sendTime,'hh24') - trunc(iv.recyclingTime,'hh24') > 1"; }else{ - timeCompareSql = " DATEDIFF(DAY,iv.recyclingTime,iv.sendTime) > 0 "; + // 按天算次日下送时间,只要不是当天回收当天发,都是次日下送. +// timeCompareSql = " DATEDIFF(DAY,iv.recyclingTime,iv.sendTime) > 0 "; + // 按小时计算,单位是小时 超过24小时算次日下送 + timeCompareSql = " DATEDIFF(HOUR,iv.recyclingTime,iv.sendTime) > 24 "; } // String recyclingSql = "select "+dateQueryAdapter.dateConverAdapter3("p.applicationtime","mm")+" as monthstr,count(*) from invoiceplan p ,invoice i,tousseinstance t where p.id = i.invoiceplan_id and t.invoice_id = i.id " // + "and "+applicationtimeSql+" != "+sendtimeSql+" and p.depart = '手术室' "