Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17734 -r17735
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17734)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17735)
@@ -12008,28 +12008,14 @@
 	@Override
 	public List<ForeignTousseAfterUseDeliveryVO> getforeignTousseAfterUseDeliveryVOList(
 			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 betweenSql = dateQueryAdapter.dateAreaSql("rr.recyclingTime", startTime, endTime, true);
 		
-		String betweenSql = "between "
-				+ dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS")
-				+ " and " + dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS") + " ";
-		
-		
-		Map<String, ForeignTousseAfterUseDeliveryVO> voMap = new LinkedHashMap<String, ForeignTousseAfterUseDeliveryVO>();
-		
-		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
-		
 		String sql = 
 				"select ci.invoicePlanID invoicePlanID,"
 				+ "rr.recyclingTime recyclingTime,"
 				+ "fta.tousseName tousseName,"
 				+ "fta.supplierName supplierName,"
-				+ "case when "+sqlLengthFunctionName+"(cb.personInCharge)>0 then cb.personInCharge else wr.operator end personInCharge,"
+				+ "case when "+DatabaseUtil.getSqlLengthFunctionName(dbConnection)+"(cb.personInCharge)>0 then cb.personInCharge else wr.operator end personInCharge,"
 				+ "cw.WashAndDisinfectRecord_ID washAndDisinfectRecordId "
 				
 				+ "from RecyclingRecord rr "
@@ -12042,11 +12028,11 @@
 				
 				+ "where ci.isSencondWashForForeignTousse=1 "
 				+ "and rr.orgUnitCoding='" + departCoding + "' "
-				+ "and rr.recyclingTime " + betweenSql
-				+ "order by rr.recyclingTime desc"
+				+ "and " + betweenSql
+				+ "order by rr.id desc"
 				;
-		
 		ResultSet result = objectDao.executeSql(sql);
+		Map<String, ForeignTousseAfterUseDeliveryVO> voMap = new LinkedHashMap<String, ForeignTousseAfterUseDeliveryVO>();
 		try {
 			while(result.next()){
 				String invoicePlanID = StringTools.defaultString(result.getString("invoicePlanID"));
@@ -12107,7 +12093,6 @@
 			}
 			voList.add(vo);
 		}
-		
 		return voList;
 	}