Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceCusDataSourceHelper.java
===================================================================
diff -u -r39545 -r41037
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceCusDataSourceHelper.java	(.../DeviceMaintenanceCusDataSourceHelper.java)	(revision 39545)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceCusDataSourceHelper.java	(.../DeviceMaintenanceCusDataSourceHelper.java)	(revision 41037)
@@ -107,10 +107,17 @@
 	}
 	private String  buildDeviceMaintenaceWhereSQL(String startDate, String endDate,
 			String querySupplyRoom, String deviceName){
+		String regex = "^\\d{4}-\\d{2}-\\d{2}$";
+		if(startDate.matches(regex)){
+			startDate += " 00:00:00";
+		}
+		if(endDate.matches(regex)){
+			endDate += " 23:59:59";
+		}
 		String sql = " dmci.maintenanceTime between "
-				+ dateQueryAdapter.dateAdapter(startDate+" 00:00:00")
+				+ dateQueryAdapter.dateAdapter(startDate)
 				+ " and " + ""
-				+ dateQueryAdapter.dateAdapter(endDate+" 23:59:59")
+				+ dateQueryAdapter.dateAdapter(endDate)
 				+ " and fd.orgUnitCoding = '" + querySupplyRoom + "'";
 		if(StringUtils.isNotBlank(deviceName)){
 			sql += " and dmci.deviceName = '" + deviceName + "'";