Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r40309 -r40311
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40309)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40311)
@@ -5817,7 +5817,7 @@
 		String sstsDepartmentCode = requestJson.optString("sstsDepartmentCode");
 		String sstsDepartmentName = requestJson.optString("sstsDepartmentName");
 		if(StringUtils.isNotBlank(sstsDepartmentCode) && !StringUtils.equals(sstsDepartmentCode, orgUnitCoding)){
-			throw new SystemException("清洗机【" + rinser.getName() + "】所属科室不是" + sstsDepartmentName + "！");
+			throw new SystemException(String.format("清洗机【%s】所属科室不是%s(%s)！", rinser.getName(), sstsDepartmentName, sstsDepartmentCode));
 		}
 		
 		User operatorUser = getOperatorUser(operator, orgUnitCoding);
@@ -5890,7 +5890,12 @@
 		String processStepName = requestJson.optString("processStepName");
 		//清洗机名称
 		String washMachineName = requestJson.optString("washMachineName");
+		//清洗记录id
+		Long endoscopeWashRecordId = requestJson.optLong("id");
 		
+		if(!DatabaseUtil.isPoIdValid(endoscopeWashRecordId)){
+			throw new RuntimeException("清洗记录id不能为空！");
+		}
 		if(!DatabaseUtil.isPoIdValid(endoscopeCycleInstanceId)){
 			throw new RuntimeException("内镜循环实例的id不能为空！");
 		}
@@ -5905,17 +5910,15 @@
 		}
 		
 		EndoscopeWashRecord endoscopeWashRecord = null;
-		String where = " where endoscopeCycleInstanceId=:endoscopeCycleInstanceId and endoscopeIdentifier=:endoscopeIdentifier and washMachineName=:washMachineName and processStepName=:processStepName";
+		String where = " where endoscopeWashRecordId=:endoscopeWashRecordId";
 		Map<String,Object> params = new HashMap<>();
-		params.put("endoscopeCycleInstanceId", endoscopeCycleInstanceId);
-		params.put("endoscopeIdentifier", endoscopeIdentifier);
-		params.put("washMachineName", washMachineName);
-		params.put("processStepName", processStepName);
+		params.put("endoscopeWashRecordId", endoscopeWashRecordId);
 		List list = objectDao.getCollection(EndoscopeWashRecord.class.getSimpleName(), where, params, 0, 1);
 		if(CollectionUtils.isNotEmpty(list)){
 			endoscopeWashRecord = (EndoscopeWashRecord) list.get(0);
 		}else{
 			endoscopeWashRecord = new EndoscopeWashRecord();
+			endoscopeWashRecord.setEndoscopeWashRecordId(endoscopeWashRecordId);
 		}
 		
 		endoscopeWashRecord.setProcessStepName(requestJson.optString("processStepName"));
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/EndoscopeWashRecord.java
===================================================================
diff -u -r40309 -r40311
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/EndoscopeWashRecord.java	(.../EndoscopeWashRecord.java)	(revision 40309)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/EndoscopeWashRecord.java	(.../EndoscopeWashRecord.java)	(revision 40311)
@@ -29,6 +29,11 @@
 	private Long id;
 	
 	/**
+	 * 内镜系统的清洗记录id
+	 */
+	private Long endoscopeWashRecordId;
+	
+	/**
 	 * 清洗步骤名称
 	 */
 	private String processStepName;
@@ -138,6 +143,14 @@
 		this.id = id;
 	}
 
+	public Long getEndoscopeWashRecordId() {
+		return endoscopeWashRecordId;
+	}
+
+	public void setEndoscopeWashRecordId(Long endoscopeWashRecordId) {
+		this.endoscopeWashRecordId = endoscopeWashRecordId;
+	}
+
 	public String getProcessStepName() {
 		return processStepName;
 	}