Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java
===================================================================
diff -u -r38907 -r41036
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java	(.../DeviceMaintenanceHelper.java)	(revision 38907)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java	(.../DeviceMaintenanceHelper.java)	(revision 41036)
@@ -278,8 +278,13 @@
 		if (StringUtils.isNotBlank(startDate)
 				&& StringUtils.isNotBlank(endDate)
 				&& StringUtils.isNotBlank(formName)) {
-			startDate += " 00:00:00";
-			endDate += " 23:59:59";
+			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 = null;
 			List<FormInstance> instanceList = null;
 			Map<Long, FormInstanceVo> formInstanceVoMap = new HashMap<Long, FormInstanceVo>();
@@ -306,8 +311,9 @@
 			if(StringUtils.isNotBlank(departCoding)){
 				sql += " and po.orgUnitCoding = '" + departCoding + "'";
 			}
-			ResultSet rs = objectDao.executeSql(sql);
+			ResultSet rs = null;
 			try {
+				rs = objectDao.executeSql(sql);
 				while (rs.next()) {
 					String sterilizerName = rs.getString("name");
 					String frequency = rs.getString("frequency");