+ refactor hasAllergy to hasDrugAllergy
+ [OE-2679] display patient allergy status correctly
Merge branch 'master' into develop