Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r39530 -r39555
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 39530)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 39555)
@@ -2532,7 +2532,7 @@
 							+ " where po.deviceInterfaceID = " + devInterface.getId()
 							+ machineNoSql
 							+ "and po.cycleCounter = " + wr.getCycleCounter();
-				}else if(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE.equals(devInterface.getParaMatchingMethod()) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUA_PC_L) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUATYPE_S7_300) || StringUtils.equals(DeviceInterface.XINHUA_Repaid_A_520, devInterface.getDeviceModel())){
+				}else if(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE.equals(devInterface.getParaMatchingMethod()) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUATYPE_S7_300) || StringUtils.equals(DeviceInterface.XINHUA_Repaid_A_520, devInterface.getDeviceModel())){
 					// 型号为Repaid-a-520的清洗机，根据清洗记录的开始结束时间匹配清洗数据(NYSY-30)(时间格式为"yyyy-MM-dd HH:mm:ss")
 					beginStartTime = new Date(startTime.getTime() - 15*60*1000);
 					endStartTime = new Date(startTime.getTime() + 15*60*1000);
@@ -4775,7 +4775,7 @@
 		List<WashData> washDataList = new ArrayList<WashData>();
 		
 		//获取新华清洗机的详细参数
-		if(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE.equals(deviceInterface.getParaMatchingMethod()) || StringUtils.equals(deviceInterface.getDeviceModel(), DeviceInterface.XINHUA_PC_L)  || StringUtils.equals(deviceInterface.getDeviceModel(), DeviceInterface.XINHUATYPE_S7_300) || StringUtils.equals(deviceInterface.getDeviceModel(), DeviceInterface.XINHUA_Repaid_A_520)){
+		if(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE.equals(deviceInterface.getParaMatchingMethod()) || StringUtils.equals(deviceInterface.getDeviceModel(), DeviceInterface.XINHUATYPE_S7_300) || StringUtils.equals(deviceInterface.getDeviceModel(), DeviceInterface.XINHUA_Repaid_A_520)){
 			if(wdr.getStartDateStr() == null || wdr.getEndDateStr() == null){
 				return null;
 			}
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
===================================================================
diff -u -r39530 -r39555
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java	(.../XinHuaDataManagerImpl.java)	(revision 39530)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java	(.../XinHuaDataManagerImpl.java)	(revision 39555)
@@ -1536,7 +1536,7 @@
 		
 		for(Rinser rs : rinsers)
 		{
-			if(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE.equals(devInterface.getParaMatchingMethod()) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUA_PC_L) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUATYPE_S7_300) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUA_Repaid_A_520)){
+			if(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE.equals(devInterface.getParaMatchingMethod()) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.XINHUA_Repaid_A_520)){
 				if(StringUtils.isBlank(startTimeStr)){
 					throw new SystemException("文件格式错误：时间为空！");
 				}