PEPPER-1364 . Additional PHI Manifest changes #2931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ssettipalli
commented
Aug 27, 2024
| int age = DateTimeUtil.calculateAgeInYears(dateOfBirth); | ||
| boolean hasCompletedPediatricConsentAddendum = participant.hasCompletedActivity(CONSENT_ADDENDUM_PEDIATRICS_ACTIVITY_CODE); | ||
|
|
||
| if (hasCompletedPediatricConsentAddendum) { | ||
| if (age >= 7) { | ||
| if (age >= 7 || participantStatus.equalsIgnoreCase(CONSENT_SUSPENDED)) { |
There was a problem hiding this comment.
agedup participants should fall into this >7 age for sure any way but explicitly checking for CONSENT_SUSPENDED will help just incase DOB isn't in ES DSM document.
Doesnt hurt to include in OR , hence added
ssettipalli
commented
Aug 27, 2024
| if (StringUtils.isBlank(dateOfMajority) || DateTimeUtil.isAdult(dateOfMajority)) { | ||
| return (Boolean)getAdultParticipantConsentedToTumorAnswer(participant, ddpInstanceDto.getStudyGuid()) | ||
| String participantStatus = participant.getStatus().orElse(""); | ||
| if (StringUtils.isBlank(dateOfMajority) || participant.hasCompletedActivity(CONSENT_ACTIVITY_CODE)) { |
There was a problem hiding this comment.
explicitly checking for SELF CONSENT will make sure aged-up and self enrolled fall into this category
ssettipalli
commented
Aug 27, 2024
| } | ||
| } | ||
|
|
||
| private static boolean isPediatricValidForPHI(ElasticSearchParticipantDto participant, String dateOfBirth, String participantStatus) { | ||
| int age = DateTimeUtil.calculateAgeInYears(dateOfBirth); | ||
| boolean hasCompletedPediatricConsentAddendum = participant.hasCompletedActivity(CONSENT_ADDENDUM_PEDIATRICS_ACTIVITY_CODE); |
There was a problem hiding this comment.
Might be an edge case in existing code base ... if child was enrolled when < 7 and after few years current age will be > 7.. and the child might not have this question: SOMATIC_ASSENT_ADDENDUM_QUESTION_STABLE_ID answered ! (Need to test this scenario later & might need to fix it) .
zyme
approved these changes
Aug 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PEPPER-1364
Add functionality to let aged-up participants who are in lost to followup (not self consented yet) be included in PHI manifest download.