Index: forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java
===================================================================
diff -u -r15698 -r16484
--- forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java	(.../SqlBuilder.java)	(revision 15698)
+++ forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java	(.../SqlBuilder.java)	(revision 16484)
@@ -241,5 +241,29 @@
 	public static String createStatusNotIn(String statusName, String properties,String separator) {
 		return createStatusWithPrepare(statusName, properties, SqlBuilder.NOT_IN, separator);
 	}
+	
+	/**
+	 * 构建or的sql语句
+	 * @param fieldName	属性名称
+	 * @param values	属性值的集合
+	 * @return
+	 * @author Chenjiaru
+	 */
+	public static <T> String build_OR_SQL(String fieldName, Collection<T> values) {
+		
+		String orSQL = "";
+		if (StringUtils.isBlank(fieldName) || CollectionUtils.isEmpty(values)) {
+			return orSQL;
+		}
+		
+		for (T o : values) {
+			if (o != null) {
+				orSQL += (fieldName+"='"+o.toString()+"' or ");
+			}
+		}
+		
+		orSQL = orSQL.substring(0, orSQL.length() - 4);  //能到这里说明，fieldName和values都不为空
+		return orSQL;
+	}
 
 }
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r16459 -r16484
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 16459)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 16484)
@@ -330,6 +330,14 @@
 				classifyBasket.setWashStartTime(washRecord.getStartDate());
 				classifyBasket.setWashEndTime(washRecord.getEndDate());
 				classifyBaskets.add(classifyBasket);
+				
+				if (!isNewRecord) {  //如果是修改，则联动修改TousseInstance的washOperator属性（这里效率应该影响不大）
+					String washOperator = StringUtils.isNotBlank(personInCharge) ? personInCharge : washRecord.getOperator();
+					String washOperatorCode = StringUtils.isNotBlank(personInChargeCode) ? personInChargeCode : washRecord.getOperatorCode();
+					String sql = "update TousseInstance set washOperator='"+washOperator+"',washOperatorCode='"+washOperatorCode+"' where classifyBasket_id="+id;
+					objectDao.excuteSQL(sql);
+				}
+				
 			}
 		}
 		//移除删除的篮筐
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r16386 -r16484
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16386)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16484)
@@ -82,9 +82,15 @@
 	
 	private String washBasket;//清洗篮筐
 
-	private String washOperator = ""; // 清洗人
+	/**
+	 * 清洗人（篮筐责任人有则取之，否则取清洗操作员）
+	 */
+	private String washOperator = ""; 
 	
-	private String washOperatorCode = ""; // 清洗人编码
+	/**
+	 * 清洗人编码（篮筐责任人有则取之，否则取清洗操作员）
+	 */
+	private String washOperatorCode = "";
 	
 	private String washStartTime = ""; // 清洗开始时间