Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
===================================================================
diff -u -r28786 -r29821
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java	(.../SterisDataManagerImpl.java)	(revision 28786)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java	(.../SterisDataManagerImpl.java)	(revision 29821)
@@ -151,7 +151,7 @@
                 	continue;
                 if( !machineNumber.equals(machineNo) )
                 {
-                	appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_QUERY, String.format("文件机器号[%s]不匹配灭菌炉机器号[%]", machineNumber,machineNo));
+                	appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_QUERY, String.format("文件机器号[%s]不匹配灭菌炉机器号[%s]", machineNumber,machineNo));
                 	continue ;
                 }
                 String cycleCounter = null;
@@ -440,7 +440,7 @@
 			String yymmdd = df1.format(da).replace("-", "/") + " ";
 			inputStream = commonFileManager.getInputStream(remoteType, ftp, fileName, remoteFile, out);
 			br = commonFileManager.getBufferedReader(isr, inputStream,"GBK");
-			String machineNumber = getMachineNo(remoteFile.getName());
+			String machineNumber = getMachineNo(fileName);
 			String cycleCounter = null;
 			String time = null;
 			// 读取直到最后一行