YTD For Two Dates

Hello,

I hope there is someone who could help with this. I have two fact tables.

Table 1 contains Work Order (Integer), WO Created (date) and Order Intake (decimal), Customer (text):

Table 2 contains Work Order (Integer), Period (date) and Revenue (decimal).

Table 3 is the dim_Calendar, calendarauto() table.

What I want to have is the table visual that has the following fields: Customer, Order Intake, Revenue:

1) if MonthToDate,

2) if QuarterToDate,

3) if YearToDate.

Therefore, the desired output for April would be:

1) MTD

2) QTD

3) YTD

I have the following measures:

Revenue-Sum = sum(fact_Revenue[Revenue])

Revenue = 
switch(SELECTEDVALUE(dim_Scenario[Scenario]),
"MTD",TOTALMTD([Revenue-Sum],'dim_Calendar'[Date]),
"QTD",TOTALQTD([Revenue-Sum],'dim_Calendar'[Date]),
"YTD",TOTALYTD([Revenue-Sum],'dim_Calendar'[Date]))

Order-Intake-Sum = sum(fact_Install[Order Intake])

Order-Intake-CY = 
switch(SELECTEDVALUE(dim_Scenario[Scenario]),
"MTD",TOTALMTD([Order-Intake-Sum],'dim_Calendar'[Date]),
"QTD",TOTALQTD([Order-Intake-Sum],'dim_Calendar'[Date]),
"YTD",TOTALYTD([Order-Intake-Sum],'dim_Calendar'[Date]))

There is also a many to one relationship between dim_Calendar[Date] and fact_Revenue[Period] and likewise between dim_Calendar[Date] and fact_Install[WO Created].

Problem Statement

Order intake measure works correctly, it is showing as I want MTD/QTD/YTD. The problem is with the Revenue measure.

For example, when I select April MTD, it is showing Order Intake 111,037, which is correct. But, the revenue is showing 16,641 which is wrong.