Nishi #000 adding a null check on patient details and treatment card optional fields