Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
===================================================================
diff -u -r28769 -r28781
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 28769)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 28781)
@@ -255,7 +255,7 @@
 			while ((line = br.readLine()) != null) {
 				lineNo++;
 				String[] split = line.split(";");
-				if(split.length == 29 && lineNo != 1){
+				if(lineNo != 1){
 					String machineNo = split[0];//设备编号
 					String cycleCounter = split[1];//周期数
 					String cycleStartTimeStr = split[3].replaceAll("\"", "");//周期开始
@@ -268,13 +268,21 @@
 					washDataOfBelimed.setMachineNo(machineNo);
 					washDataOfBelimed.setDeviceInterfaceID(devInterface.getId());
 					washDataOfBelimed.setCycleCounter(Long.parseLong(cycleCounter));
-					cycleStartTimeStr = cycleStartTimeStr.substring(0, cycleStartTimeStr.lastIndexOf("."));
-					cycleEndTimeStr = cycleEndTimeStr.substring(0, cycleEndTimeStr.lastIndexOf("."));
-					washDataOfBelimed.setCycleStartTime(DateTools.coverStrToDate(cycleStartTimeStr, "yyyy-MM-dd-HH.mm.ss"));
-					washDataOfBelimed.setCycleEndTime(DateTools.coverStrToDate(cycleEndTimeStr, "yyyy-MM-dd-HH.mm.ss"));
+					if(StringUtils.isNotBlank(cycleStartTimeStr)){
+						cycleStartTimeStr = cycleStartTimeStr.substring(0, cycleStartTimeStr.lastIndexOf("."));
+						washDataOfBelimed.setCycleStartTime(DateTools.coverStrToDate(cycleStartTimeStr, "yyyy-MM-dd-HH.mm.ss"));
+					}
+					if(StringUtils.isNotBlank(cycleEndTimeStr)){
+						cycleEndTimeStr = cycleEndTimeStr.substring(0, cycleEndTimeStr.lastIndexOf("."));
+						washDataOfBelimed.setCycleEndTime(DateTools.coverStrToDate(cycleEndTimeStr, "yyyy-MM-dd-HH.mm.ss"));
+					}
 					washDataOfBelimed.setIsPassed(isPassed);
-					washDataOfBelimed.setCycleTotalTime(Long.parseLong(cycleTotalTimeStr));
-					washDataOfBelimed.setDisinfectTotalTime(Long.parseLong(disinfectTotalTimeStr));
+					if(StringUtils.isNotBlank(cycleTotalTimeStr)){
+						washDataOfBelimed.setCycleTotalTime(Long.parseLong(cycleTotalTimeStr));
+					}
+					if(StringUtils.isNotBlank(disinfectTotalTimeStr)){
+						washDataOfBelimed.setDisinfectTotalTime(Long.parseLong(disinfectTotalTimeStr));
+					}
 					objectDao.save(washDataOfBelimed);
 				}
 			}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r28769 -r28781
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 28769)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 28781)
@@ -3281,20 +3281,26 @@
 				//清洗人（取值追溯系统）
 				resultData.put("operator",wdr.getOperator());
 				//周期开始（从K文件读取）
-				String startedDateTimeStr = DateTools.getFormatDateStr(washDataOfBelimed.getCycleStartTime(), DateTools.COMMON_DATE_HMS);
+				String startedDateTimeStr = "";
+				if(washDataOfBelimed.getCycleStartTime() != null){
+					startedDateTimeStr = DateTools.getFormatDateStr(washDataOfBelimed.getCycleStartTime(), DateTools.COMMON_DATE_HMS);
+				}
 				resultData.put("startedTime", startedDateTimeStr);
 				//周期结束（从K文件读取）
-				String completedTimeStr = DateTools.getFormatDateStr(washDataOfBelimed.getCycleEndTime(), DateTools.COMMON_DATE_HMS);
+				String completedTimeStr = "";
+				if(washDataOfBelimed.getCycleEndTime() != null){
+					completedTimeStr = DateTools.getFormatDateStr(washDataOfBelimed.getCycleEndTime(), DateTools.COMMON_DATE_HMS);
+				}
 				resultData.put("completedTime", completedTimeStr);
 				//是否通过（从K文件读取）
 				String isPassed = washDataOfBelimed.getIsPassed();
 				resultData.put("isPassed", isPassed);
 				//周期数（循环次数）（从K文件读取）
-				resultData.put("cycleCounter", washDataOfBelimed.getCycleCounter());
+				resultData.put("cycleCounter", washDataOfBelimed.getCycleCounter() == null ? "" : washDataOfBelimed.getCycleCounter());
 				//周期时间（从K文件读取）
-				resultData.put("cycleTotalTime", washDataOfBelimed.getCycleTotalTime());
+				resultData.put("cycleTotalTime", washDataOfBelimed.getCycleTotalTime() == null ? "" : washDataOfBelimed.getCycleTotalTime());
 				//消毒时间（从K文件读取）
-				resultData.put("disinfectTotalTime", washDataOfBelimed.getDisinfectTotalTime());
+				resultData.put("disinfectTotalTime", washDataOfBelimed.getDisinfectTotalTime() == null ? "" : washDataOfBelimed.getDisinfectTotalTime());
 				//折线图需要的参数明细
 				JSONObject lineChartData = new JSONObject();
 				JSONArray timeArray = new JSONArray();