Merged collapsible if statements

https://issues.openmrs.org/browse/GCI-9 - Fixed sonar issue with if statements being collapsible
For long if statements, it's Ok to break them for smaller one. Which will be more readable