Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r19266 -r19298
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19266)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19298)
@@ -357,6 +357,10 @@
 	private String recyclingOperator;
 	
 	/**
+	 * 回收人
+	 */
+	private String recyclingUser;
+	/**
 	 * 代理灭菌单是否已经发货.如果包实例关联了代理灭菌单,并且代理灭菌单已经发了此包实例,这个时候值为是.
 	 * 其他情况下为否或者空(null或者"")
 	 */
@@ -1528,6 +1532,14 @@
 		this.recyclingOperator = recyclingOperator;
 	}
 
+	public String getRecyclingUser() {
+		return recyclingUser;
+	}
+
+	public void setRecyclingUser(String recyclingUser) {
+		this.recyclingUser = recyclingUser;
+	}
+
 	public String getProxyDisinfectionSent() {
 		return proxyDisinfectionSent;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19266 -r19298
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19266)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19298)
@@ -4620,6 +4620,7 @@
 			tousseInstance.setWashOperator(StringUtils.isNotBlank(personInCharge)?personInCharge:tousseInstance.getWashOperator());
 			tousseInstance.setWashOperatorCode(StringUtils.isNotBlank(personInChargeCode)?personInChargeCode:tousseInstance.getWashOperatorCode());
 			tousseInstance.setRecyclingOperator(washJson.optString("recyclingOperator"));
+			tousseInstance.setRecyclingUser(washJson.optString("recyclingUser"));
 		}
 		if(washRecordId != null){
 			WashAndDisinfectRecord lastWashRecord = washAndDisinfectRecordManager.getWashAndDisinfectRecordById("" + washRecordId);
@@ -4629,6 +4630,7 @@
 		if (PackingTask.TASK_QUALITY_MONITOR.equals(currentPackingTask.getTaskType())){
 			tousseInstance.setClassifyBasketIds(currentPackingTask.getClassifyBasketIds());
 			tousseInstance.setRecyclingOperator(currentPackingTask.getRpRecyclingOperator());
+			tousseInstance.setRecyclingUser(currentPackingTask.getRpRecyclingOperator());
 		}
 		tousseInstance.setPackingRecord_id(packingRecordId);
 
@@ -4680,6 +4682,7 @@
 		String washOperatorCode = "";
 		String classifyBasketIds = "";
 		String recyclingOperator = "";
+		String recyclingUser = "";
 		//追溯清洗的多个篮筐
 		if(currentPackingTask != null){
 			if (PackingTask.TASK_RECYCLINGRECORD.equals(currentPackingTask
@@ -4716,12 +4719,13 @@
 					}
 					
 					
-					String sql2 = "select operator from RecyclingRecord where id=" + currentPackingTask.getSourceId();
+					String sql2 = "select operator,recyclingUser from RecyclingRecord where id=" + currentPackingTask.getSourceId();
 					
 					ResultSet rs2 = objectDao.executeSql(sql2);
 					try {
 						while (rs2.next()) {
 							recyclingOperator = StringUtils.defaultString(rs2.getString("operator"));  //回收清点人
+							recyclingUser = StringUtils.defaultString(rs2.getString("recyclingUser"));  // 回收人
 							break;
 						}
 					} catch (SQLException e) {
@@ -4736,6 +4740,7 @@
 		result.put("WashOperatorCode", washOperatorCode);
 		result.put("classifyBasketIds", classifyBasketIds);
 		result.put("recyclingOperator", recyclingOperator);
+		result.put("recyclingUser", recyclingUser);
 		return result;
 	}