Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
===================================================================
diff -u -r27115 -r27117
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 27115)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 27117)
@@ -472,34 +472,30 @@
 	 * @return 12:22:51
 	 */
 	public String getTime(String time) {
-		if (StringUtils.isNotBlank(time)) {
-			time = time.trim();
-			String[] timeSplit;
-			if (time.endsWith("AM")) {
-				time = time.replace("AM", "");
-				timeSplit = time.trim().split(":");
-				if (timeSplit[0].equals("12")) {
-					return "00" + ":" + timeSplit[1] + ":" + timeSplit[2];
-				} else {
-					return time;
-				}
-			} else if (time.endsWith("PM")) {
-				time = time.replace("PM", "");
-				timeSplit = time.split(":");
-				int hour = Integer.valueOf(timeSplit[0]);
-				if (hour != 12) {
-					hour = 12 + hour;
-				}
-				return String.valueOf(hour) + ":" + timeSplit[1] + ":"
-						+ timeSplit[2];
-				// time.replace(timeSplit[0], String.valueOf(hour));
-			}else if(time.contains("day")){
-				return time.substring(time.indexOf(" ") + 1);
-			}else {
-				return time; // 新接口文件时间格式
+		if(StringUtils.isBlank(time)){
+			return null;
+		}
+		time = time.trim();
+		String[] timeSplit;
+		if (time.endsWith("AM")) {
+			time = time.replace("AM", "");
+			timeSplit = time.trim().split(":");
+			if (timeSplit[0].equals("12")) {
+				time = "00" + ":" + timeSplit[1] + ":" + timeSplit[2];
 			}
+		} else if (time.endsWith("PM")) {
+			time = time.replace("PM", "");
+			timeSplit = time.split(":");
+			int hour = Integer.valueOf(timeSplit[0]);
+			if (hour != 12) {
+				hour = 12 + hour;
+			}
+			time = String.valueOf(hour) + ":" + timeSplit[1] + ":"
+					+ timeSplit[2];
+		}else if(time.contains("day")){
+			time = time.substring(time.indexOf(" ") + 1).trim();
 		}
-		return null;
+		return time.trim();
 	}
 
 	// Monday 14:36:54