Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge120CSV.java
===================================================================
diff -u -r39219 -r40534
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge120CSV.java	(.../WashDataOfMarge120CSV.java)	(revision 39219)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge120CSV.java	(.../WashDataOfMarge120CSV.java)	(revision 40534)
@@ -250,7 +250,10 @@
 	 * 漂洗实际次数(次)
 	 */
 	public String washFrequency;
-
+	/**
+	 * 预清洗实际时间
+	 */
+	public String preCleaningSecond;
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -604,5 +607,13 @@
 	public void setWashFrequency(String washFrequency) {
 		this.washFrequency = washFrequency;
 	}
+
+	public String getPreCleaningSecond() {
+		return preCleaningSecond;
+	}
+
+	public void setPreCleaningSecond(String preCleaningSecond) {
+		this.preCleaningSecond = preCleaningSecond;
+	}
 	
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java
===================================================================
diff -u -r39486 -r40534
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java	(.../Marge120CSVDataManagerImpl.java)	(revision 39486)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java	(.../Marge120CSVDataManagerImpl.java)	(revision 40534)
@@ -285,11 +285,18 @@
 			br = new BufferedReader(isr);
 			int lineNo = 0;
 			Date nowTime = new Date();
+			boolean hasTubeWashSecond = false;
 			while ((line = br.readLine()) != null) {
 				lineNo++;
-				if(lineNo == 1 || StringUtils.isBlank(line)){
+				if(StringUtils.isBlank(line)){
 					continue;
 				}
+				if(lineNo == 1){
+					if(line.contains("管腔抽洗实际时间")){//目前有两种格式 一种有管腔抽洗实际时间 但没有预清洗实际时间 另外一种没有有管腔抽洗实际时间 但有预清洗实际时间
+						hasTubeWashSecond = true;
+					}
+					continue;
+				}
 				String[] split = line.split(",");
 				if(split.length != 40){
 					throw new SystemException("文件内容格式异常，正常文件字段个数为40，当前文件字段个数为" + split.length);
@@ -323,32 +330,52 @@
 				washData.setUltrasonicWashTemp(split[19].trim());
 				washData.setUltrasonicAverageCurrent(split[20].trim());
 				washData.setUltrasonicAverageFrequency(split[21].trim());
-				
 				washData.setPerfusionFrequency(split[22].trim());
 				washData.setPerfusionTemp(split[23].trim());
-				
 				washData.setTubeWashFrequency(split[24].trim());
-				washData.setTubeWashSecond(split[25].trim());
-				
-				washData.setWashPulseSecond(split[26].trim());
-				washData.setWashPulseFrequency(split[27].trim());
-				
-				washData.setSterilizeSecond(split[28].trim());
-				washData.setSterilizeTemp(split[29].trim());
-				
-				washData.setApplyOilQuantity(split[30].trim());
-				washData.setAo(split[31].trim());
-				
-				washData.setDrySecond(split[32].trim());
-				washData.setDryTemp(split[33].trim());
-				
-				washData.setRunTime(split[34].trim());
-				washData.setCycleCounter(DatabaseUtil.isPoIdValid(split[35].trim()) ? Long.valueOf(split[35].trim()) : null);
-				washData.setMethodNumber(split[36].trim());
-				washData.setLoadCapacity(split[37].trim());
-				washData.setMethodName(split[38].trim());
-				washData.setWashFrequency(split[39].trim());
-				
+				if(hasTubeWashSecond){
+					washData.setTubeWashSecond(split[25].trim());
+					
+					washData.setWashPulseSecond(split[26].trim());
+					washData.setWashPulseFrequency(split[27].trim());
+					
+					washData.setSterilizeSecond(split[28].trim());
+					washData.setSterilizeTemp(split[29].trim());
+					
+					washData.setApplyOilQuantity(split[30].trim());
+					washData.setAo(split[31].trim());
+					
+					washData.setDrySecond(split[32].trim());
+					washData.setDryTemp(split[33].trim());
+					
+					washData.setRunTime(split[34].trim());
+					washData.setCycleCounter(DatabaseUtil.isPoIdValid(split[35].trim()) ? Long.valueOf(split[35].trim()) : null);
+					washData.setMethodNumber(split[36].trim());
+					washData.setLoadCapacity(split[37].trim());
+					washData.setMethodName(split[38].trim());
+					washData.setWashFrequency(split[39].trim());
+				}else{
+					
+					washData.setWashPulseSecond(split[25].trim());
+					washData.setWashPulseFrequency(split[26].trim());
+					
+					washData.setSterilizeSecond(split[27].trim());
+					washData.setSterilizeTemp(split[28].trim());
+					
+					washData.setApplyOilQuantity(split[29].trim());
+					washData.setAo(split[30].trim());
+					
+					washData.setDrySecond(split[31].trim());
+					washData.setDryTemp(split[32].trim());
+					
+					washData.setRunTime(split[33].trim());
+					washData.setCycleCounter(DatabaseUtil.isPoIdValid(split[34].trim()) ? Long.valueOf(split[34].trim()) : null);
+					washData.setMethodNumber(split[35].trim());
+					washData.setLoadCapacity(split[36].trim());
+					washData.setMethodName(split[37].trim());
+					washData.setWashFrequency(split[38].trim());
+					washData.setPreCleaningSecond(split[39].trim());
+				}
 				//设置启动时间和停止时间
 				setWashDataOfMarge120CSVStartTimeEndTime(washData);