Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
===================================================================
diff -u -r27395 -r27526
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 27395)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 27526)
@@ -172,6 +172,17 @@
 	public static final String RECYCLINGSTATUS_RECYCLED = "已回收";
 
 	/**
+	 * 回收状态手工设置人
+	 */
+	private String manualSetRecyclingStatusUser;
+
+	/**
+	 * 回收状态手工设置时间
+	 */
+	private Date manualSetRecyclingStatusTime;
+
+
+	/**
 	 * 优先转换状态(值有"已转换","未转换")
 	 */
 	private String priorConvertStatus = PRIORCONVERTSTATUS_UNCONVERT;
@@ -360,6 +371,22 @@
 		this.recyclingStatus = recyclingStatus;
 	}
 
+	public String getManualSetRecyclingStatusUser() {
+		return manualSetRecyclingStatusUser;
+	}
+
+	public void setManualSetRecyclingStatusUser(String manualSetRecyclingStatusUser) {
+		this.manualSetRecyclingStatusUser = manualSetRecyclingStatusUser;
+	}
+
+	public Date getManualSetRecyclingStatusTime() {
+		return manualSetRecyclingStatusTime;
+	}
+
+	public void setManualSetRecyclingStatusTime(Date manualSetRecyclingStatusTime) {
+		this.manualSetRecyclingStatusTime = manualSetRecyclingStatusTime;
+	}
+
 	public String getPriorConvertStatus() {
 		return priorConvertStatus;
 	}
@@ -796,6 +823,9 @@
 		jsonObject.put("dataType", getDataType());
 		jsonObject.put("reviewOperateUserCode", getReviewOperateUserCode());
 		jsonObject.put("departCodeOfpatient", getDepartCodeOfpatient());
+		jsonObject.put("recyclingStatus", getRecyclingStatus());
+		jsonObject.put("manualSetRecyclingStatusUser", getManualSetRecyclingStatusUser());
+		jsonObject.put("manualSetRecyclingStatusTime", getManualSetRecyclingStatusTime());
 		
 		if(CollectionUtils.isNotEmpty(tousseInstanceList)){
 			JSONArray array = new JSONArray();