Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
===================================================================
diff -u -r32077 -r32078
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 32077)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 32078)
@@ -12,6 +12,8 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import jcifs.smb.SmbFile;
 import jcifs.smb.SmbFileInputStream;
@@ -1042,9 +1044,16 @@
 	{
 		if(StringUtils.isNotBlank(content))
 		{
-			content = content.replace("C", "");
-			int index = content.indexOf("=");
-			return content.substring(index +1, content.length() -1).trim();
+			String regExpForTemp = "(\\d+(\\.\\d+)?)";
+			try {
+				Matcher matcher = Pattern.compile(regExpForTemp).matcher(content);
+				if(matcher.find()){
+					// 取第一个()内的字符串
+					return matcher.group(1);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
 		return null;
 	}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r32077 -r32078
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 32077)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 32078)
@@ -1719,9 +1719,7 @@
 					queryString = "select count(*) c from "+ WashDataOfGeting.class.getSimpleName() +" po "
 							+ "where po.deviceInterfaceID = " + devInterface.getId() + machineNoSql
 							+ "and " + dateQueryAdapter.dateAreaSql("po.startTime", beginStartTimeStr, endStartTimeStr, false);
-				}else if(StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_9125E)
-						|| StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_CM320)
-						|| StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_S_8668)){
+				}else{
 					
 					if(sterilizaMatchPatternForDate){
 						beginStartTime = new Date(startTime.getTime() - 10*60*1000);