Replace the chi number with the nhs no and a type enum.