Calculated expression re-calculation bug#12

FikriMilano wants to merge 2 commits intomasteropensrp/android-fhir:masterfrom

fikri-re-calculation-bugopensrp/android-fhir:fikri-re-calculation-bugCopy head branch name to clipboard