Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java
===================================================================
diff -u -r25473 -r25676
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java	(.../ModbusControllerManager.java)	(revision 25473)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java	(.../ModbusControllerManager.java)	(revision 25676)
@@ -427,7 +427,7 @@
 	}
 	
 	/**
-	 * 
+	 * 获取美雅洁清洗机清洗参数：完成标志
 	 * @param ip
 	 * @param post
 	 * @param deviceIdStr
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java
===================================================================
diff -u -r25473 -r25676
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(.../MeiYaJieDataManagerImpl.java)	(revision 25473)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(.../MeiYaJieDataManagerImpl.java)	(revision 25676)
@@ -37,6 +37,10 @@
 	@Autowired
 	private LogManager appLogManager;
 	
+	/**
+	 * 因为美雅洁接口参数需要显示的数据比较多
+	 * 所以用WashDataOfMarge来保存清洗参数而不用WashData
+	 */
 	@Override
 	public void readAndSaveRecord(WashAndDisinfectRecord washAndDisinfectRecord,DeviceInterface devInteface,WashData washData, int timeoutSeconds) {
 		String ip = devInteface.getIP();//ip地址
@@ -66,6 +70,7 @@
 				//3）、保存：美雅洁清洗机的完成数据
 				saveOrUpdateWashDataOfMarge(washAndDisinfectRecord,washDataOfMarge);
 			}else{//2-2、清洗标志不为完成、失败则：只需保存清洗机的温度曲线数据
+				logger.debug("清洗机获取完成标志:"+completeSign+" ==》开始获取温度曲线信息参数");
 				//1)、获取美雅洁清洗机清洗参数：温度曲线信息
 				JSONObject resultTeampData = modbusControllerManager.getWashTempModbusDataByMeiYaJie(ip, post, deviceIdStr,model,timeoutSeconds);
 				WashDataOfMarge washTeampDataOfMarge = (WashDataOfMarge) JSONObject.toBean(resultTeampData, WashDataOfMarge.class);
@@ -113,7 +118,7 @@
 	}
 	
 	/**
-	 * 
+	 * 设置：美雅洁清洗机详细参数
 	 * @param washDataItemOfMarge
 	 * @param washData
 	 * @param devInteface
@@ -164,10 +169,10 @@
 			washStatus = WashAndDisinfectRecord.STATUS_WASHFAILD;
 		}
 		//
-		washDataItemOfMarge.setStartTime(startTime);
-		washDataItemOfMarge.setEndTime(endTime);
-		washDataItemOfMarge.setSerialNumber(serialNumber);
-		washDataItemOfMarge.setWashStatus(washStatus);
+		washDataItemOfMarge.setStartTime(startTime);//启动时间
+		washDataItemOfMarge.setEndTime(endTime);//停止时间
+		washDataItemOfMarge.setSerialNumber(serialNumber);//序列号
+		washDataItemOfMarge.setWashStatus(washStatus);//清洗状态
 		washDataItemOfMarge.setMachineNo(washData.getMachineNo());//机器号
 		washDataItemOfMarge.setCycleCounter(washData.getCycleCounter());//循环次数
 		washDataItemOfMarge.setDeviceInterfaceID(devInteface.getId());//设备接口
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r25659 -r25676
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 25659)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 25676)
@@ -2771,16 +2771,17 @@
 					if(deviceInterface == null){
 						logger.error(String.format("未找到%s的设备接口!", washAndDisinfectRecord.getDisinfectIdentification()));
 					}
-					if(!StringUtils.equals(deviceInterface.getDeviceBrand(), "Marge")){
+					if(!StringUtils.equals(deviceInterface.getDeviceBrand(), DeviceInterface.MARGE)){
 						logger.warn(String.format("%s的设备接口品牌已改为%s，终止读取!", washAndDisinfectRecord.getDisinfectIdentification(),deviceInterface.getDeviceBrand()));
 					}
 					
-					// 读取数据
 					WashData washData = new WashData();
 					washData.setMachineNo(rinser.getMachineNumber());
 					washData.setCycleCounter(washAndDisinfectRecord.getCycleCounter());
-					readWashDataFromDeviceInterface(washAndDisinfectRecord,deviceInterface, washData, 10);
 					washData.setDeviceInterfaceID(deviceInterface.getId().toString());
+					readWashDataFromDeviceInterface(washAndDisinfectRecord,deviceInterface, washData, 10);
+					//因为美雅洁接口参数需要显示的数据较多
+					//所以用WashDataOfMarge来保存清洗参数而不用WashData
 					//objectDao.save(washData);
 					
 					Long washDataAmount = washAndDisinfectRecord.getWashDataAmount();