Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r14357 -r14412
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 14357)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 14412)
@@ -855,7 +855,7 @@
 								.getByProperty(ForeignTousseApplication.class
 										.getSimpleName(), "id", tousseInstance
 										.getForeignTousseApp_id());
-						if(foreignTousseApplication != null){
+						if(foreignTousseApplication != null && InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){
 							foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
 							foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_AWAITRECYCLE);
 							objectDao.saveOrUpdate(foreignTousseApplication);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r14407 -r14412
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14407)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14412)
@@ -1065,6 +1065,12 @@
 
 function openRecyclingErrorPage(row){
 	
+	var tousseType = $('#tousseType' + row).val();
+	if(tousseType == '外来器械包'){
+		alertDiv("外来器械包不能添加丢失项！");
+		return false;
+	}
+	
 	var isEditIDCardError = false;
 	if($('#id').val() == ""){
 		isEditIDCardError = true;
@@ -1179,6 +1185,13 @@
 }
 
 function openRecyclingDamagePage(row,tousseName,tousseItemId){
+	
+	var tousseType = $('#tousseType' + row).val();
+	if(tousseType == '外来器械包'){
+		alertDiv("外来器械包不能添加报损项！");
+		return false;
+	}
+	
     var width = 740;
     var height = 400;
     var designedTousseWidth = 980;
@@ -1635,7 +1648,7 @@
          var addButton = "";
          var reduceButton = "";
          var onclickFun = "";
-         if(tousseType != '消毒物品' || (tousseType == '消毒物品' && '是' == isApplyEntireTousse)){
+         if((tousseType != '消毒物品' && tousseType != '外来器械包') || (tousseType == '消毒物品' && '是' == isApplyEntireTousse)){
         	 addButton = '<td><a href="javascript:void(0);" class="add" onclick="add('+row+');">+</a></td>';
         	 reduceButton = '<td><a href="javascript:void(0);" class="minus" onclick="reduce('+row+');">-</a></td>';
         	 onclickFun = 'onclick="openUpdateAmount(this,'+ row +');"';
@@ -2075,6 +2088,13 @@
 }
 //选择器械包
 function openSelectTousse(){
+	
+	var tousseType = $('#tousseType0').val();
+	if(tousseType == '外来器械包'){
+		alertDiv("外来器械回收单不能添加器械包！");
+		return false;
+	}
+	
 	var width = 780;
 	var height = 650;
 	var designedTousseWidth = 1080;
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r14407 -r14412
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 14407)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 14412)
@@ -458,6 +458,7 @@
 		}
 		//为外来器械申请单设置科室查看权限
 		setReaders(foreignTousseApplication);
+		foreignTousseApplication.setRemark("病人："+foreignTousseApplication.getPatient()+",住院号："+foreignTousseApplication.getHospitalNumber());
 		foreignTousseApplication.setApplicationItems(foreignTousseItems);
 	}
 
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r14407 -r14412
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14407)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14412)
@@ -934,20 +934,12 @@
 						foreignTousseApp
 								.setOrderByFiled(InvoicePlan.DELIVER_PARTDELIVERED);
 					}
-					//外來器械二次回收
-					if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(invoicePlan.getRecyclingStatus())){
-						foreignTousseApp.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
-					}
 					saveInvoicePlan(foreignTousseApp);
 				}
 			}
 		}
 	}
 
-	
-
-
-
 	public Map<String, GridDataVo> getSendOutGoodsMap(
 			List<GridDataVo> sendOutGoodsInstanceList) {
 		Map<String, GridDataVo> map = new HashMap<String, GridDataVo>();
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14407 -r14412
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14407)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14412)
@@ -4421,12 +4421,6 @@
 	 */
 	private void updateInvoicePlanStatus(InvoicePlan invoicePlan) {
 //		invoicePlanManager.computeAndSetStatus(invoicePlan);
-		//外来器械申请单发货后将状态改为待回收
-		if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(invoicePlan.getType())){
-			if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(invoicePlan.getRecyclingStatus())){
-				invoicePlan.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
-			}
-		}
 		invoicePlanManager.computeAndSetInvoiceStatus(invoicePlan);
 		invoicePlan.setLastInvoiceTime(new Date());
 		objectDao.saveOrUpdate(invoicePlan);