Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
===================================================================
diff -u -r17573 -r18783
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 17573)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 18783)
@@ -221,7 +221,11 @@
 				record.setCycleCounter(Long.parseLong(split[1]));
 				String time = split[2];
 				time = time.replaceAll("\"", "");
-				time = yymmdd + getTime(time);
+				String hmsTime = getTime(time);
+				if(StringUtils.isBlank(hmsTime)){
+					hmsTime = getTime1(time);
+				}
+				time = yymmdd + hmsTime;
 				record.setTime(time);
 				record.setStep(split[3]);
 				record.setPhase(split[4]);
@@ -375,9 +379,9 @@
 		return null;
 	}
 	/**
-	 * 12小时制转24小时   以AM或者PM结尾
-	 * @param time12h
-	 * @return
+	 * 12小时制转24小时   以AM或者PM结尾 
+	 * @time time12h 格式如 12:22:51 PM 12:22:51 AM
+	 * @return 12:22:51
 	 */
 	public String getTime(String time)
 	{
@@ -411,7 +415,45 @@
 		}
 		return null;
 	}
+	// Monday 14:36:54 
 	/**
+	 * 
+	 * @param time 格式如 Monday 14:36:54
+	 * @return 格式  14:36:54
+	 */
+	private String getTime1(String time){
+		String retTime = "";
+		if(StringUtils.isNotBlank(time))
+		{
+			retTime = time.trim();
+			if(retTime.startsWith("Monday")){
+				retTime = retTime.replace("Monday", "");
+				retTime = retTime.trim();
+			}else if(retTime.startsWith("Tuesday")){
+				retTime = retTime.replace("Tuesday", "");
+				retTime = retTime.trim();
+			}else if(retTime.startsWith("Wednesday")){
+				retTime = retTime.replace("Wednesday", "");
+				retTime = retTime.trim();
+			}else if(retTime.startsWith("Thursday")){
+				retTime = retTime.replace("Thursday", "");
+				retTime = retTime.trim();
+			}else if(retTime.startsWith("Friday")){
+				retTime = retTime.replace("Friday", "");
+				retTime = retTime.trim();
+			}else if(retTime.startsWith("Saturday")){
+				retTime = retTime.replace("Saturday", "");
+				retTime = retTime.trim();
+			}else if(retTime.startsWith("Sunday")){
+				retTime = retTime.replace("Sunday", "");
+				retTime = retTime.trim();
+			}else{
+				retTime = "";
+			}
+		}
+		return retTime;
+	}
+	/**
 	 * 倍力曼清洗机数据处理
 	 */
 	public JSONArray washDataReadAndSave(SmbFile remoteFile,DeviceInterface devInterface)
@@ -438,7 +480,11 @@
 				record.setCycleCounter(Long.parseLong(split[1]));
 				String time = split[2];
 				time = time.replaceAll("\"", "");
-				time = yymmdd + getTime(time);
+				String hmsTime = getTime(time);
+				if(StringUtils.isBlank(hmsTime)){
+					hmsTime = getTime1(time);
+				}
+				time = yymmdd + hmsTime;
 				record.setTime(time);
 				record.setStep(split[3]);
 				record.setPhase(split[4]);