Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r32957 -r32958 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 32957) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 32958) @@ -481,7 +481,7 @@ String returnMan1= StrutsParamUtils.getPraramValue("returnMan1", ""); String returneeOfSupplier1= StrutsParamUtils.getPraramValue("returneeOfSupplier1", ""); //超时处理方式GYEY-758 - String timeoutHandType = StrutsParamUtils.getPraramValue("timeoutHandType", ""); + String timeoutHandType = StrutsParamUtils.getPraramValue("timeoutHandType", null); if(StringUtils.isNotBlank(returnMan1)){ foreignTousseApplication.setReturnMan(returnMan1); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r32957 -r32958 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 32957) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 32958) @@ -2282,9 +2282,7 @@ 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); - } + adverseEventRecordManager.saveAdverseEventRecord(foreignTousseApplication, AdverseEventRecord.EVENTNAME_FOREIGNTOUSSESENDTIMEOUTCODE, AdverseEventRecord.EVENTNAME_FOREIGNTOUSSESENDTIMEOUT, timeoutHandType); } } }