Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r32866 -r32957
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 32866)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 32957)
@@ -480,6 +480,8 @@
 		String actionType = StrutsParamUtils.getPraramValue("actionType", "");
 		String returnMan1= StrutsParamUtils.getPraramValue("returnMan1", "");
 		String returneeOfSupplier1= StrutsParamUtils.getPraramValue("returneeOfSupplier1", "");
+		//超时处理方式GYEY-758
+		String timeoutHandType = StrutsParamUtils.getPraramValue("timeoutHandType", "");
 		if(StringUtils.isNotBlank(returnMan1)){
 			foreignTousseApplication.setReturnMan(returnMan1);
 		}
@@ -499,7 +501,7 @@
 			//simon-add
 			foreignTousseApplication.setHandleDepart(handleDepart);
 			foreignTousseApplication.setHandleDepartCoding(handleDepartCoding);
-			foreignTousseApplicationManager.saveOrUpdate(origineFta, foreignTousseApplication, foreignTousseInfo, actionType);
+			foreignTousseApplicationManager.saveOrUpdate(origineFta, foreignTousseApplication, foreignTousseInfo, actionType, timeoutHandType);
 			jsonObject.put("id", foreignTousseApplication.getId());  //供前台打印
 			jsonObject.put("applicationTime", ForgonDateUtils.safelyFormatDate(foreignTousseApplication.getApplicationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""));  //供前台打印
 		} catch (Exception e) {
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r32750 -r32957
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 32750)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 32957)
@@ -30,12 +30,14 @@
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
+import com.forgon.disinfectsystem.adverseeventrecord.service.AdverseEventRecordManager;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.urgent.service.UrgentLevelManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.entity.adverseeventrecord.AdverseEventRecord;
 import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
@@ -128,6 +130,13 @@
 	
 	private RecyclingApplicationManager recyclingApplicationManager;
 	
+	private AdverseEventRecordManager adverseEventRecordManager;
+	
+	public void setAdverseEventRecordManager(
+			AdverseEventRecordManager adverseEventRecordManager) {
+		this.adverseEventRecordManager = adverseEventRecordManager;
+	}
+	
 	public void setRecyclingApplicationManager(
 			RecyclingApplicationManager recyclingApplicationManager) {
 		this.recyclingApplicationManager = recyclingApplicationManager;
@@ -2266,4 +2275,16 @@
 		}
 		return arr;
 	}
+	
+	@Override
+	public void saveOrUpdate(ForeignTousseApplication origineFta,
+			ForeignTousseApplication foreignTousseApplication,
+			String foreignTousseTreeData, String actionType, String timeoutHandType) {
+		this.saveOrUpdate(origineFta, foreignTousseApplication, foreignTousseTreeData, actionType);
+		if(ForeignTousseApplication.ACTION_TYPE_ADD.equals(actionType)){
+			if(StringUtils.isNotBlank(timeoutHandType)){
+				adverseEventRecordManager.saveAdverseEventRecord(foreignTousseApplication, AdverseEventRecord.EVENTNAME_FOREIGNTOUSSESENDTIMEOUTCODE, AdverseEventRecord.EVENTNAME_FOREIGNTOUSSESENDTIMEOUT, timeoutHandType);
+			}
+		}
+	}
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
===================================================================
diff -u -r32707 -r32957
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java	(.../ForeignTousseApplicationManager.java)	(revision 32707)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java	(.../ForeignTousseApplicationManager.java)	(revision 32957)
@@ -44,6 +44,19 @@
 	public void saveOrUpdate(ForeignTousseApplication origineFta, ForeignTousseApplication foreignTousseApplication,
 			String foreignTousseTreeData, String actionType);
 	
+	/**
+	 * 保存外来器械包申请单，并设置不良事件GYEY-758
+	 * @param origineFta 原外来器械包申请单的信息
+	 * @param foreignTousseApplication	外来器械包申请单
+	 * @param foreignTousseTreeData		外来器械包的一些数据
+	 * @param actionType				保存外来器械包的动作（值目前有三种：1、新增 2、干预 3、确认归还）
+	 * @param basketBarcode
+	 * @param eventCode					事件代码
+	 * @param eventName					事件名称
+	 */
+	public void saveOrUpdate(ForeignTousseApplication origineFta, ForeignTousseApplication foreignTousseApplication,
+			String foreignTousseTreeData, String actionType, String timeoutHandType);
+	
 	public List<ForeignTousseApplication> findForeignTousseApplication(String tousseName,String supplierName);
 	
 	public ForeignTousseApplication findForeignTousseApplicationByBarcode(String barcode);