Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r40891 -r40900
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40891)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40900)
@@ -7178,19 +7178,6 @@
 					DeviceInterface deviceInterface = null;
 					Date startTime = null;
 					if("rinser".equals(type)){
-						SterilizationRecord sterilizationRecord = (SterilizationRecord)objectDao.getById(SterilizationRecord.class.getSimpleName(), recordId);
-						if (sterilizationRecord == null) {
-							throw new RuntimeException("recordId参数异常");
-						}
-						startTime = sterilizationRecord.getStartDate();
-						//清洗机定义
-						Sterilizer sterilizer = sterilizationRecord.getSterilizer();
-						if (sterilizer == null) {
-							throw new RuntimeException("数据异常，灭菌记录关联的灭菌炉不存在！");
-						}
-						machineNo = sterilizer.getMachineNumber();
-						deviceInterface = sterilizer.getDeviceInterface();
-					}else{
 						WashAndDisinfectRecord wdr = get(recordId);
 						if (wdr == null) {
 							throw new RuntimeException("recordId参数异常");
@@ -7203,6 +7190,19 @@
 						}
 						machineNo = rinser.getMachineNumber();
 						deviceInterface = rinser.getDeviceInterface();
+					}else{
+						SterilizationRecord sterilizationRecord = (SterilizationRecord)objectDao.getById(SterilizationRecord.class.getSimpleName(), recordId);
+						if (sterilizationRecord == null) {
+							throw new RuntimeException("recordId参数异常");
+						}
+						startTime = sterilizationRecord.getStartDate();
+						//清洗机定义
+						Sterilizer sterilizer = sterilizationRecord.getSterilizer();
+						if (sterilizer == null) {
+							throw new RuntimeException("数据异常，灭菌记录关联的灭菌炉不存在！");
+						}
+						machineNo = sterilizer.getMachineNumber();
+						deviceInterface = sterilizer.getDeviceInterface();
 					}
 					if (deviceInterface == null) {
 						throw new RuntimeException("数据异常，设备关联的设备接口不存在！");