In making a finding under Section 592.156(b)(2) that, as a result of a mental disorder or mental defect, the client presents a danger to the client or others in the residential care facility in which the client is being treated or in the correctional facility, as applicable, the court shall consider:
(1) an assessment of the client's present mental condition; and
(2) whether the client has inflicted, attempted to inflict, or made a serious threat of inflicting substantial physical harm to the client's self or to another while in the facility.