Okay, I have modified the data structure in the data warehouse. there was no obvious solution in the model.