Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
===================================================================
diff -u -r40964 -r40966
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java	(.../XinHuaDataManagerImpl.java)	(revision 40964)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java	(.../XinHuaDataManagerImpl.java)	(revision 40966)
@@ -57,10 +57,8 @@
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Ps100gxpSterilizerRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.CommonStageDetails;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.CommonSterilizerRecord;
-import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.BelimedV2WashDataPDF;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.XinHuaSuper6000Data;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData;
-import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.XinHuaDataPDF;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.XinHuaSuper6000Details;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.filemanager.CommonFileManager;
@@ -290,81 +288,7 @@
 			FileSystemHelper.closeInputStream(inputStream, null, null, out);
 		}
 	}
-	public void refreshWashRecordAmounts(DeviceInterface devInterface, XinHuaDataPDF record) {
-		
-		if(record == null){
-			return;
-		}
-		
-		String machineNo = record.getMachineNumber();
-		Date startTime = record.getStartDate();
-		Long cycleCounter = record.getCycleCounter();
-		
-		if(StringUtils.isBlank(machineNo)){
-			throw new RuntimeException("清洗参数pdf文件记录表机器号不能为空！");
-		}
-		if(cycleCounter == null){
-			throw new RuntimeException("清洗参数pdf文件记录表循环次数不能为空！");
-		}
-		if(startTime == null){
-			throw new RuntimeException("清洗参数pdf文件记录表开始运行时间不能为空！");
-		}
-		
-		// 根据接口和机器号找到清洗机
-		Session session = objectDao.getHibernateSession();
-		String queryString = "select r from Rinser r"
-				+ " where r.deviceInterface.id = :deviceInterfaceId"
-				+ " and r.machineNumber = :machineNo";
-		Query query = session.createQuery(queryString);
-		query.setParameter("deviceInterfaceId", devInterface.getId());
-		query.setParameter("machineNo", machineNo);
-		List<Rinser> rinsers = query.list();
 
-		//Date startTime = DateTools.coverStrToDate(startTimeStr, "yyyy/MM/dd HH:mm:ss");
-		Date beginStartTime = new Date(startTime.getTime() - 10*60*1000);
-		Date endStartTime = new Date(startTime.getTime() + 10*60*1000);
-		String beginStartTimeStr =  ForgonDateUtils.safelyFormatDate(beginStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
-		String endStartTimeStr = ForgonDateUtils.safelyFormatDate(endStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
-		WashAndDisinfectRecord wd = null;
-		for (Rinser rs : rinsers) {
-			String hql = String.format(" where po.rinserId = %s ", rs.getId().toString());
-			if(StringUtils.equals(DeviceInterface.PARAMATCHINGMETHOD_STARTDATE, devInterface.getParaMatchingMethod())){
-				hql += " and " + dateQueryAdapter.dateAreaSql("po.startDate", beginStartTimeStr, endStartTimeStr, false);
-			}else {
-				hql += String.format(" and po.cycleCounter = %s ", cycleCounter);
-			}
-			wd = (WashAndDisinfectRecord) objectDao.getBySql(WashAndDisinfectRecord.class.getSimpleName(), hql);
-			if(wd != null) {
-				Long amounts = wd.getWashDataAmount();
-				amounts = amounts == null ? 0L : amounts;
-				wd.setWashDataAmount(1L);
-				wd.setWashDataType(WashAndDisinfectRecord.WASHDATATYPE_XINHUA_WSPDF);
-			}
-		}
-		record.setRecordId(wd != null?wd.getId():null);
-		objectDao.save(record);
-	}
-	/**
-	 * 判断倍力曼清洗机参数pdf文件是否已经解析过
-	 * @param belimedV2WashDataPDF
-	 * @return
-	 */
-	private boolean isParsedFile(XinHuaDataPDF belimedV2WashDataPDF) {
-		//判断是否已经读取过文件
-		String sql = String.format("select count(1) from %s po "
-				+ "where po.deviceInterfaceID = %s "
-				+ "and po.machineNumber = '%s' "
-				+ "and po.startDate = %s",
-				BelimedV2WashDataPDF.class.getSimpleName(),
-				belimedV2WashDataPDF.getDeviceInterfaceID(),
-				belimedV2WashDataPDF.getMachineNumber(),
-				dateQueryAdapter.dateAdapter(belimedV2WashDataPDF.getStartDate()));
-		if(objectDao.countBySql(sql) > 0){
-			return true;
-		}
-		return false;
-	}
-
 	private void dataRead(SmbFile remoteFile,
 		DeviceInterface deviceInterface, String remoteType, FTPClient ftp,
 		FTPFile ftpFile, boolean enableDetailedDeviceInformation,