Incorrect calculation of Encounters with procedures

[aswathikrishnan24]

Describe the bug
Numerator does not take into account Initial population in ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR.Population.
This could probably be another assertion logic issue but there is more to the problem.

Initial population of TC : 305b7ed0-25c0-4fdf-96aa-a872a74f17e3 is 0 and Numerator is 1.
In this case, the assertion logic is not applied.

Initial population of TC : bb5e3c95-fbde-4ed7-9099-0dab743355ed is 1 and Numerator is 2.
In this case, final result looks for encounters with suicide assessment procedures. final result is calculated as 2 instead of 1 because the input file has only one encounter and 2 procedures.

Numerator is calculated incorrectly.

To Reproduce
Steps to reproduce the behavior:

1. Go to ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR.Population
2. Run bb5e3c95-fbde-4ed7-9099-0dab743355ed

Screenshots

Version used

Version: develop-2.0
46d3248

Additional Information
For CesareanBirthFHIR, Test case : 13fc77fb-6db3-4c4d-ae11-2ee08ff9acde
Initial Population calculation is incorrect because of same reason.
Patient has 1 encounter and Initial population is expected to be 1. Encounter calculation also takes into account procedure with code 4504004 and results in 2