Whenever such disability of any such officer or employee continues for a period beyond one year, such member shall thereafter be subject as to disability indemnity to the provisions of this division other than Section 4850 during the remainder of the period of said disability or until the effective date of his retirement under the Public Employees’ Retirement Act, and the leave of absence shall continue.