Modified the template and corrected some calculations
Revised the dhis2 template