diff --git a/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs b/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs
index 207d5eea..afe7d581 100644
--- a/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs
+++ b/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs
@@ -123,11 +123,11 @@ namespace YLErp.Modules.EodModule.SettlementModule
             }
             // 互换合约估值信息
             var eodSwapQuery = from eod in DbContext.eod_swap.Where(x => x.ValueDate <= balanceDate && x.ValueDate >= preBalanceDate)
-                               join t in DbContext.trade.Where(x => x.TradeType == "收益互换" && x.ValidState != ConsGlobal.InValid && ConsTrade.TradeStatusAfterConfirmed.Contains(x.TradeStatus) && x.StartDate <= balanceDate) on eod.SwapTradeId equals t.id
+                               join t in DbContext.trade.Where(x => x.TradeType == "收益互换" && x.ValidState != ConsGlobal.InValid && ConsTrade.TradeStatusAfterConfirmed.Contains(x.TradeStatus) && x.TradeDate <= balanceDate) on eod.SwapTradeId equals t.id
                                select eod;
             // 互换合约估值持仓信息
             var eodSwapPosiQuery = from eod in DbContext.eod_swap_position.Where(x => x.ValueDate <= balanceDate && x.ValueDate >= preBalanceDate)
-                               join t in DbContext.trade.Where(x => x.TradeType == "收益互换" && x.ValidState != ConsGlobal.InValid && ConsTrade.TradeStatusAfterConfirmed.Contains(x.TradeStatus) && x.StartDate <= balanceDate) on eod.SwapTradeId equals t.id
+                               join t in DbContext.trade.Where(x => x.TradeType == "收益互换" && x.ValidState != ConsGlobal.InValid && ConsTrade.TradeStatusAfterConfirmed.Contains(x.TradeStatus) && x.TradeDate <= balanceDate) on eod.SwapTradeId equals t.id
                                select eod;
             var positionList = DbContext.trade.Where(t => (ConsTrade.TradeStatusAfterConfirmed.Contains(t.TradeStatus)||t.UnWindDate> balanceDate) && t.ValidState != "InValid"&&t.TradeType=="收益互换");
             var marignQuery = from t in positionList
diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
index 7a397fd5..675129c2 100644
--- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
@@ -1881,7 +1881,7 @@ namespace YLErp.Modules.SwapModule
             if (req.ValueDate != null)
             {
                 predicate = predicate.And(x => x.ValueDate == req.ValueDate);
-                tradePredicate = tradePredicate.And(x => req.ValueDate >= x.StartDate);
+                tradePredicate = tradePredicate.And(x => req.ValueDate >= x.TradeDate);
             }
             var positionQuery = DbContext.eod_swap_position.Where(predicate);
             var tradeQuery = DbContext.trade.Where(tradePredicate);
@@ -1921,7 +1921,7 @@ namespace YLErp.Modules.SwapModule
                 {
                     eventDate = QdpCalendarHelper.GetNonHoliday(eventDate.AddDays(tradeExtend.ExtendObj.SettlementRules));
                 }
-                item.DayCount = (eventDate - item.position.PosiStartDate).Days + 1;
+                item.DayCount = Math.Max(0,(eventDate - item.position.PosiStartDate).Days + 1);
                 //item.position.PosiProfitSum += item.position.VTradingFee-item.position.PosiFeePending;
                 SetClientEodPosition(item.position);
                 //item.position.PosiProfitSum += item.TradingFee;