diff --git a/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs b/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs
index 276dc303..eadb5019 100644
--- a/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs
@@ -455,8 +455,8 @@ namespace YLErp.Modules.SwapModule
         /// <returns></returns>
         private SearchListResult<ClientSwapPositionResponse> GetSearchPositionEventList(ClientSwapPositionRequest req)
         {
-            List<int> eventTyps = new List<int>() { (int)SwapEventTypeEnum.平仓, (int)SwapEventTypeEnum.互换, (int)SwapEventTypeEnum.自动互换 };
-            var predicate = PredicateBuilder.Create<swap_flow_event>(n => n.DataState == (int)SwapFlowDateStateEnum.完成 && eventTyps.Contains(n.EventType));
+           // List<int> eventTyps = new List<int>() { (int)SwapEventTypeEnum.平仓, (int)SwapEventTypeEnum.互换, (int)SwapEventTypeEnum.自动互换 };
+            var predicate = PredicateBuilder.Create<swap_flow_event>(n => n.DataState == (int)SwapFlowDateStateEnum.完成 );
             var tradePredicate = PredicateBuilder.Create<trade>(n => n.TradeType == "收益互换"
                                                     && n.ValidState != "InValid");
             if (req.ClientId > 0)
diff --git a/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx b/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx
index 43f1b2e8..7e66c151 100644
Binary files a/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx and b/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx differ
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js
index d14c0681..87557703 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js
@@ -248,30 +248,6 @@ var colModelGrid = [
         width: 90,
         align: 'center',
         sortable: false,
-    }, {
-        name: 'OpenMarginAmount',
-        label: '期初预付金',
-        index: 'OpenMarginAmount',
-        width: 120,
-        align: 'center',
-        formatter: StockEqvNotionalFormat,
-        sortable: false,
-    }, {
-        name: 'OpenMarginRate',
-        label: '期初预付金利率',
-        index: 'OpenMarginRate',
-        width: 120,
-        align: 'center',
-        sortable: false,
-        formatter: RateFormat
-    }, {
-        name: 'MarginInterestAmount',
-        label: '预付金利息',
-        index: 'MarginInterestAmount',
-        width: 120,
-        align: 'center',
-        formatter: StockEqvNotionalFormat,
-        sortable: false,
     }, {
         name: 'FloatRateAbs',
         label: '浮动利率（绝对）',