Fmaps calculation

Fixed fmaps calculations on number of patients . New and revisit, males and females