Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
===================================================================
diff -u -r32078 -r32080
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 32078)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 32080)
@@ -288,8 +288,15 @@
                 	// 清洗机数据的处理
                 	JSONArray jsArray = washDataReadAndSave(smbForm, devInterface, DeviceInterface.INTERFACETYPE_SHAREFOLDER, null, null, machineNumber, enableDetailedDeviceInformation, loginUserData);
                 	if( jsArray != null){
-                		cycleCounter = (String)jsArray.get(0);
-                		refreshWashRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
+                		boolean sterilizaMatchPatternForDate = CssdUtils.getSystemSetConfigByNameBool("sterilizaMatchPatternForDate", false);
+                		if(sterilizaMatchPatternForDate){
+                			String procStartTimeStr = (String)jsArray.get(1);
+                			Date startTime = ForgonDateUtils.safelyParseDate(procStartTimeStr, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS);
+                			refreshWashRecordAmounts(devInterface.getId().toString(), startTime, machineNumber);
+                		}else{
+                			cycleCounter = (String)jsArray.get(0);
+                			refreshWashRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
+                		}
                 	}
                 }else{
                 	// 灭菌炉数据处理
@@ -528,7 +535,11 @@
 				String machineNumber = machineNumAndIsWashingMachine.optString("machineNo");
 				if( !machineNo.equals(machineNumber) ){
 					if(enableDetailedDeviceInformation){
-						appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_QUERY, String.format("文件机器号[%s]不匹配灭菌炉机器号[%s]", machineNumber,machineNo));
+						if(machineNumAndIsWashingMachine.optBoolean("isWashingMachine")){
+							appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_QUERY, String.format("文件机器号[%s]不匹配清洗机机器号[%s]", machineNumber,machineNo));
+						}else{
+							appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_QUERY, String.format("文件机器号[%s]不匹配灭菌炉机器号[%s]", machineNumber,machineNo));
+						}
 					}
 					continue ;
 				}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
===================================================================
diff -u -r30337 -r32080
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java	(.../WashDataLineChartAction.java)	(revision 30337)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java	(.../WashDataLineChartAction.java)	(revision 32080)
@@ -131,7 +131,7 @@
 				String sourceString = "";
 				//if (StringUtils.equals("1", type)) {
 				for (WashData record : washDatas) {
-						if (sourceString == null) {
+						if (StringUtils.isBlank(sourceString)) {
 							sourceString = "Date,T1\n"; // "Date,T1,T2,T3\n";
 							sourceString +=  record.getTime() + ","
 									+ record.getT1Temp() + "\n";