Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
===================================================================
diff -u -r14726 -r14846
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java	(.../ForeignTousseApplicationTableManager.java)	(revision 14726)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java	(.../ForeignTousseApplicationTableManager.java)	(revision 14846)
@@ -91,33 +91,31 @@
 	}
 
 	/**
-	 * 根据id获取当前申请单状态
-	 * 
-	 * @param parameterMap
+	 * 外来器械包是否可以归还
+	 * @param id
 	 * @return
 	 */
-	public String findForeignTousseApplicationStatus(String id) {
+	public String isForeignTousseCanReturn(String id) {
+		JSONObject obj = new JSONObject();
+		boolean disableReturnStatus = true;
+		boolean disableReturnStatus2 = false;
 		if (DatabaseUtil.isPoIdValid(id)) {
-			ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager
+			ForeignTousseApplication ftApplication = foreignTousseApplicationManager
 					.getById(id);
-			if (foreignTousseApplication != null
-					&& InvoicePlan.DELIVERSTATUS_DELIVERED
-							.equals(foreignTousseApplication.getDeliverStatus())) {
-				if(foreignTousseApplicationManager.isForeignTousseInstanceUsed(foreignTousseApplication)){
-					if(!ForeignTousseApplication.APPLICATION_STATUS_RECYCLING.equals(foreignTousseApplication.getPackageStatus())){
-						//已发货 未回收 已使用的状态 
-						return TousseInstance.STATUS_USED; 
-					}
-				}
-				if (ForeignTousseApplication.APPLICATION_STATUS_SIGNED
-						.equals(foreignTousseApplication.getPackageStatus())) {
-					return InvoicePlan.DELIVERSTATUS_DELIVERED;
-				}
+			if (ftApplication != null && 
+					InvoicePlan.RECYCLINGSTATUS_RECYCLED.equals(ftApplication.getRecyclingStatus()) && 
+					!ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(ftApplication.getPackageStatus())) {
+				disableReturnStatus =  false;
 			}
-			return foreignTousseApplication == null ? ""
-					: foreignTousseApplication.getPackageStatus();
+			
+			if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE.equals(ftApplication.getRecyclingStatus()) || 
+					ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(ftApplication.getPackageStatus())){
+				disableReturnStatus2 = true;
+			}
 		}
-		return "";
+		obj.put("disableReturnStatus", disableReturnStatus);
+		obj.put("disableReturnStatus2", disableReturnStatus2);
+		return obj.toString();
 	}
 
 	/**
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r14802 -r14846
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14802)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14846)
@@ -618,31 +618,20 @@
 	if(formType == 'apply'){
 		includeImplantUsedAmountHidden = true;
 		
-		var preReturn = false;    //是否提前归还
-		var canReturn = false;    //能否归还
-	  	DWREngine.setAsync(false);
-		ForeignTousseApplicationTableManager.findForeignTousseApplicationStatus(id,function(result){
-			if(result != null && result.length > 0){
-				if(result == "已发货"){
-					canReturn = true;
-					preReturn = true;
-				}else if(result == "已回收"){
-					canReturn = true;
-				}else if(result == '已使用'){
-					canReturn = false;
-				}else if(result == "已归还"){
-					canReturn = false;
-				}else if(result == "待接收"){
-					canReturn = false;
-				}else{//已接收、未发货状态
-					preReturn = true;
-					canReturn = true;
-				}
-			}
-		});
-		DWREngine.setAsync(true);
+		var disableReturnStatus = true;    //能否归还
+		var disableReturnStatus2 = false;
+		if(id == null || id == ""){
+			disableReturnStatus2 = true;
+		}else{
+			DWREngine.setAsync(false);
+			ForeignTousseApplicationTableManager.isForeignTousseCanReturn(id,function(result){
+				var json = JSON.parse(result);
+				disableReturnStatus = json.disableReturnStatus;
+				disableReturnStatus2 = json.disableReturnStatus2;
+			});
+			DWREngine.setAsync(true);
+		}
 		
-		
 		bbars = [{
 			text : '打印预览',
 			handler : function() {
@@ -671,9 +660,9 @@
 				}
 			}
 		},{
-			text : preReturn ? '提前归还' : '确认归还',
+			text : '确认归还',
 			id : 'returnBtn',
-			disabled : !canReturn,
+			disabled : disableReturnStatus,
 			handler : function(){
 				if(!foreignTousseForm.getForm().isValid()){
 					showResult('请正确填写表单各值');
@@ -685,6 +674,19 @@
 				}
 			}
 		},{
+			text : '提前归还',
+			disabled:disableReturnStatus2,
+			handler : function(){
+				if(!foreignTousseForm.getForm().isValid()){
+					showResult('请正确填写表单各值');
+					return false;
+				}
+				var success = getForeignTousseInfo();
+				if(success){
+					submintForeignTousseForm(actionType_confirmReturn);
+				}
+			}
+		},{
 			text : '取消',
 			handler : function() {
 				foreignTousseApplyWindow.close();