After you enter the 1099-R in Federal > Wages and Income > Retirement, there will be questions. One of them asks about repayments/rollovers. Note that the TT Income Summary only lists the gross number, and is just FYI.
Since the two transactions spanned two tax years, be sure to keep documentation in case of an IRS query.
