Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r28834 -r28877 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28834) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28877) @@ -9397,7 +9397,7 @@ return ; } ReportQueryParams params = new ReportQueryParams(); - String sql = getWashWorkloadSql(params, statDate, endDate, querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, false); + String sql = getWashWorkloadSql(params, statDate, endDate, querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, false,"yyyy-mm-dd"); Map amountMap = getWashWorkloadAmountMap(sql); // 清洗不合格数量 @@ -9452,10 +9452,10 @@ * @param dataSoureOfMaterialsCountOfToussesInReports 报表材料数量显示方式 * @return */ - private String getWashWorkloadSql(ReportQueryParams params, String statDate, String endDate, String querySupplyRoom, Integer dataSoureOfMaterialsCountOfToussesInReports, boolean groupByDay){ + private String getWashWorkloadSql(ReportQueryParams params, String statDate, String endDate, String querySupplyRoom, Integer dataSoureOfMaterialsCountOfToussesInReports, boolean groupByDay, String format){ String betweenSql = String.format(" between %s and %s ", - dateQueryAdapter.dateConverAdapter2(statDate, "yyyy-mm-dd"), - dateQueryAdapter.dateConverAdapter2(endDate, "yyyy-mm-dd")); + dateQueryAdapter.dateConverAdapter2(statDate, format), + dateQueryAdapter.dateConverAdapter2(endDate, format)); params.betweenSql = betweenSql; params.querySupplyRoom = querySupplyRoom; String groupByDaySql = null; @@ -13883,7 +13883,7 @@ if(Constants.STR_YES.equals(recordRinseInformation)){ ReportQueryParams params = new ReportQueryParams(); int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); - String sql = getWashWorkloadSql(params, startDate + " 00:00:00", endDate + " 23:59:59", querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, true); + String sql = getWashWorkloadSql(params, startDate + " 00:00:00", endDate + " 23:59:59", querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, true, "yyyy-mm-dd HH24:MI:SS"); washAmountMap = getWashWorkloadAmountMap(sql, true); } }else if(QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION.equals(responsibilityPart)){