; (B) in subparagraph (D), by striking the period and inserting ; or ; and (C) by inserting after subparagraph (D) the following: (E) an individual appointed to the National Disaster Medical System under section 2812 of the Public Health Service Act ( 42 U.S.C. 300hh–11 ) who is performing official duties of the Department of Health and Human Services, if those official duties are— (i) related to responding to a public health emergency or potential public health emergency, or other activities for which the Secretary of Health and Human Services has activated such National Disaster Medical System; and (ii) determined by the Secretary of Health and Human Services to be hazardous. . (3) Sunset The amendments made by paragraphs (1) and (2) shall cease to have force or effect on October 1, 2021. (e) Mission readiness report to Congress (1) Report Not later than one year after the date of enactment of this section, the Comptroller General of the United States (referred to in this subsection as the Comptroller General ) shall submit to the Committee on Health, Education, Labor, and Pensions of the Senate and the Committee on Energy and Commerce of the House of Representatives, a report on the medical surge capacity of the United States in the event of a public health emergency, including the capacity and capability of the current health care workforce to prepare for, and respond to the full range of public health emergencies or potential public health emergencies, and recommendations to address any gaps identified in such workforce. (2) Contents The Comptroller General shall include in the report under paragraph (1)— (A) the number of health care providers who have volunteered to provide health care services during a public health emergency, including members of the National Disaster Medical System, the Disaster Medical Assistant Teams, the Medical Reserve Corps, and other volunteer health care professionals in the verification network pursuant to section 319I of the Public Health Service Act ( 42 U.S.C. 247d–7b )