fixing report for patients without demographics
fixing calculation of drugs