Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java =================================================================== diff -u -r26446 -r27357 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 26446) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 27357) @@ -404,8 +404,8 @@ String sql = "select count(*) amount,s.name from SterilizationRecord sr,Sterilizer s " + " where sr.sterilizer_id = s.id and s.orgUnitCoding = '"+ departCoding +"'" + sqlOfSterilizationPurpose - + " and sr.endDate between " + dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI") - + " and "+dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI") + + " and sr.endDate between " + dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS") + + " and "+dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS") + " group by s.name"; return sql; } @@ -473,9 +473,9 @@ + " and s.id=" + sterilizerId +" and s.orgUnitCoding = '"+departCoding+"'" +" and sr.endDate between "+dateQueryAdapter.dateConverAdapter2( startTime - , "yyyy-mm-dd HH24:MI") + , "yyyy-mm-dd HH24:MI:SS") +" and "+dateQueryAdapter.dateConverAdapter2( endTime - , "yyyy-mm-dd HH24:MI") + , "yyyy-mm-dd HH24:MI:SS") + sqlOfSterilizationPurpose + groupSql + orderBySql; return sql; }