Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r15619 -r15623
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15619)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15623)
@@ -16,7 +16,6 @@
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import net.sf.json.JSONArray;
@@ -286,13 +285,15 @@
 			if(tousseInstance != null){
 				
 				RecyclingApplication application = recyclingApplicationManager
-						.getWaitingRecycleApplicationIdContaintTousseInstance(tousseInstance
+						.getRecycleApplicationByTousseBarcode(tousseInstance
 								.getBarcode());
 				if (application != null) {
 					id = application.getId().toString();
 					String handleDepartCoding = AcegiHelper.getLoginUser()
 							.getOrgUnitCodingFromSupplyRoomConfig();
-					if (StringUtils.isNotBlank(handleDepartCoding)
+					if(InvoicePlan.RECYCLINGSTATUS_RECYCLED.equals(application.getRecyclingStatus())){
+						message = "该器械包已回收！";
+					}else if (StringUtils.isNotBlank(handleDepartCoding)
 							&& !handleDepartCoding.equals(application
 									.getHandleDepartCoding())) {
 						message = "该器械包关联的申请单处理科室与当前登录科室不一致！";
@@ -316,7 +317,6 @@
 								message = "该器械包的使用记录未转换申请单，请转换后再回收";
 								break;
 							default:
-								message = "该器械包已回收！";
 								break;
 							}
 						}