Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13853 -r13924
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13853)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13924)
@@ -7096,54 +7096,60 @@
 	@Override
 	public List<TousseWorkLoadVO> getTousseWorkLoadData(String startTime,
 			String endTime, String departCoding) {
-		
+		if(StringUtils.isNotBlank(startTime) && startTime.trim().length() == 10){
+			startTime = startTime + " 00:00:00";
+		}
+		if(StringUtils.isNotBlank(endTime) && endTime.trim().length() == 10){
+			endTime = endTime + " 23:59:59";
+		}
+		String dateFormatter = "yyyy-mm-dd HH24:MI:SS";
 		String sql = "select 'recyc' as type,td.name,sum(ci.amount) from recyclingRecord rr,ClassifiedItem ci,TousseDefinition td "
 				+" where rr.id = ci.recyclingRecordId and ci.toussedefinition_id = td.id "
 				+" and ci.itemType != '材料' and rr.orgUnitCoding = '"+departCoding+"'" 
-				+" and rr.recyclingTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and rr.recyclingTime between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by td.name "
 				+" union all "
 				+" select 'wash' as type, td.name,sum(ci.amount) from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw," +
 				"ClassifyBasket cb,ClassifiedItem ci,TousseDefinition td where wdr.id = cw.WashAndDisinfectRecord_ID "
 				+" and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.toussedefinition_id = td.id "
 				+" and ci.itemType != '材料' and wdr.orgUnitCoding = '"+departCoding+"'"
-				+" and wdr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and wdr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by td.name "
 				+" union all "
 				+" select 'packing' as type,pr.tousseName,sum(pr.amount) from PackingRecord pr "
 				+" where pr.orgUnitCoding = '"+departCoding+"' "
-				+" and pr.packTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and pr.packTime between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by pr.tousseName "
 				+" union all "
 				+" select 'review' as type,t.tousseName,count(*) from TousseInstance t "
 				+" where t.reviewer is not null and t.reviewTime is not null and t.orgUnitCoding = '"+departCoding+"' "
-				+" and t.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and t.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by t.tousseName "
 				+" union all "
 				+" select 'sterilization' as type,ti.tousseName,count(*) from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti "
 				+" where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id "
 				+" and sr.orgUnitCoding = '"+departCoding+"'"
-				+" and sr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and sr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by ti.tousseName "
 				+" union all "
 				+" select 'sterilization' as type,ti.tousseName,count(*) from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti "
 				+" where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id "
 				+" and rb.id = ti.reviewBasket_ID and sr.orgUnitCoding = '"+departCoding+"' "
 				+" and sr.orgUnitCoding = '"+departCoding+"' "
-				+" and sr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and sr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by ti.tousseName "
 				+" union all "
 				+" select 'invoice' as type,ti.tousseName,count(*) from invoice i,TousseInstance ti,TousseDefinition td "
 				+" where i.id = ti.invoice_id and i.orgUnitCoding = '"+departCoding+"' "
 				+" and ti.tousseDefinition_id = td.id  and td.tousseType != '消毒物品'"
-				+" and i.sendTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-MM-dd")
-				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-MM-dd")
+				+" and i.sendTime between "+dateQueryAdapter.dateConverAdapter2(startTime,dateFormatter)
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime,dateFormatter)
 				+" group by ti.tousseName";