Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java
===================================================================
diff -u -r23823 -r25359
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java	(.../DeviceInterfaceManagerImpl.java)	(revision 23823)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java	(.../DeviceInterfaceManagerImpl.java)	(revision 25359)
@@ -65,7 +65,11 @@
 			if(oldDatFileDetail != null){		//（3#）
 				objectDao.delete(oldDatFileDetail);
 			}
-			deviceInterface.setDeviceId(null);
+			if(deviceInterface.getDeviceBrand().equals(DeviceInterface.Marge)){
+				deviceInterface.setDeviceId(deviceInterface.getDeviceId());
+			}else{
+				deviceInterface.setDeviceId(null);
+			}
 		}
 		objectDao.saveOrUpdate(deviceInterface);
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
===================================================================
diff -u -r25306 -r25359
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java	(.../DeviceInterface.java)	(revision 25306)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java	(.../DeviceInterface.java)	(revision 25359)
@@ -54,6 +54,11 @@
 	 * 新华灭菌炉
 	 */
 	public static final String XINHUA = "XinHua";
+	
+	/**
+	 * 美雅洁清洗机
+	 */
+	public static final String Marge = "Marge";
 
 	private Long id;
 	
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java
===================================================================
diff -u -r25343 -r25359
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(.../MeiYaJieDataManagerImpl.java)	(revision 25343)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(.../MeiYaJieDataManagerImpl.java)	(revision 25359)
@@ -2,16 +2,18 @@
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.forgon.device.ModbusControllerManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData;
+
 /**
  * 美雅洁清洗机设备处理
- * @author shuyongfu
- * @since 2018-11-12
+ * @author YanWeiNing
+ *
  */
 public class MeiYaJieDataManagerImpl implements DeviceDataByCommunicationManager{
 	private static final Logger logger = Logger.getLogger(MeiYaJieDataManagerImpl.class);
@@ -25,6 +27,9 @@
 		int post = devInteface.getPort();//端口号
 		String deviceIdStr = devInteface.getDeviceId();//设备id
 		try {
+			if(StringUtils.isBlank(ip)||StringUtils.isBlank(deviceIdStr)){
+				throw new RuntimeException(String.format("参数ip：%s,deviceIdStr：%s不能为空！",ip,deviceIdStr));
+			}
 			//1、获取美雅洁清洗机modbus返回信息
 			JSONObject resultData = modbusControllerManager.getWashModbusDataByMeiYaJie(ip, post, deviceIdStr, timeoutSeconds);
 			//2、washData设值