Added fixes in drug management
Adding bart2 features to national EMR