[ORB-290] removed hard-coded reference to NHS No and Hosp No