Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35349 -r35353
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35349)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35353)
@@ -12966,7 +12966,7 @@
 		 */
 		private void setWashDateAmountMap(){
 			int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
-			washWorkloadSql = getWashWorkloadSql(params, startDateStr, endDateStr, querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, true,"yyyy-mm-dd",dateType);
+			washWorkloadSql = getWashWorkloadSql(params, startDateStr, endDateStr, querySupplyRoom, dataSoureOfMaterialsCountOfToussesInReports, true,"yyyy-mm-dd HH24:MI:SS",dateType);
 			washDateAmountMap = getWashWorkloadAmountMap(washWorkloadSql,true);
 		}
 		/**
@@ -13162,8 +13162,8 @@
 			 + " and cb.id=ci.classifybasket_id " 
 			 + " and ci.itemType='" + ClassifiedItem.TYPE_MATERIAL + "' "
 			 + " and ci.orgUnitName in ('" + departs + "')"
-			 + " and ( wr.startDate between "+dateQueryAdapter.dateConverAdapter2(sartDate,"yyyy-mm-dd")
-		     + " and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") + ")"
+			 + " and ( wr.startDate between "+dateQueryAdapter.dateConverAdapter2(sartDate,"yyyy-mm-dd HH24:MI:SS")
+		     + " and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd HH24:MI:SS") + ")"
 		     + " and wr.orgUnitCoding = '"+querySupplyRoom+"'"
 			 + " group by " + timeSql + " ,ci.orgUnitName)) "
 			 + " union all "
@@ -13175,8 +13175,8 @@
 			 + " and cb.id=ci.classifybasket_id and ci.toussedefinition_id=tdc.tdID " 
 			 + " and ci.itemType != '" + ClassifiedItem.TYPE_MATERIAL + "' "
 			 + " and ci.orgUnitName in ('" + departs + "')"
-			 + " and ( wr.startDate between "+dateQueryAdapter.dateConverAdapter2(sartDate,"yyyy-mm-dd")
-		     + " and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") + ")"
+			 + " and ( wr.startDate between "+dateQueryAdapter.dateConverAdapter2(sartDate,"yyyy-mm-dd HH24:MI:SS")
+		     + " and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd HH24:MI:SS") + ")"
 		     + " and wr.orgUnitCoding = '"+querySupplyRoom+"'"
 			 + " group by " + timeSql + ",ci.orgUnitName) "
 			 + " ) c "