Power BI Dax Group按度量-显示今天之前的日期

Question

我正在尝试创建一种衡量指标，该指标将按时间显示按类别划分的预订收入。当数据为BLANK（）时，我也想在折线图中显示为0，因此我在IF语句中使用它。一切正常，除非出于任何原因我无法让它仅显示今天之前的日期。

这是当前的衡量标准：

M_BookedRevenue = 
VAR CurrentAccountingYear =
    CALCULATE ( MIN ( 'Date'[AccountingYear] ), 'Date'[Date] = TODAY () )
VAR CurrentDate =
    CALCULATE ( MIN ( 'Date'[SortDate] ), 'Date'[Date] = TODAY() )
RETURN
    CALCULATE (
    IF (
        ISBLANK (
            SUMX (
                FILTER (
                    GROUPBY (
                        RevenueChannel,
                        RevenueChannel[ChannelBucket],
                        RevenueChannel[Channel],
                        'Date'[Date],
                        'Date'[SortDate],
                        'Date'[AccountingWeek],
                        'Date'[WeekNumber],
                        'Date'[AccountingMonthEnglishAbbrYear],
                        'Date'[AccountingMonth],
                        'Date'[AccountingYear],
                        "Revenue", SUMX ( CURRENTGROUP (), RevenueChannel[TransactionRevenue] )
                    ),
                    'Date'[AccountingYear] >= CurrentAccountingYear
                    && 'Date'[SortDate] < CurrentDate
                ),
                [Revenue]
            )
        ),
        0,
        SUMX (
            FILTER (
                GROUPBY (
                    RevenueChannel,
                    RevenueChannel[ChannelBucket],
                    RevenueChannel[Channel],
                    'Date'[Date],
                    'Date'[SortDate],
                    'Date'[AccountingWeek],
                    'Date'[WeekNumber],
                    'Date'[AccountingMonthEnglishAbbrYear],
                    'Date'[AccountingMonth],
                    'Date'[AccountingYear],
                    "Revenue", SUMX ( CURRENTGROUP (), RevenueChannel[TransactionRevenue] )
                ),
                'Date'[AccountingYear] >= CurrentAccountingYear
                && 'Date'[SortDate] < CurrentDate
            ),
            [Revenue]
        )
    )
)