Skip to content

feat!: Show g7,g9,g10 with Attestation Check-In Report #1910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kekey1 wants to merge 4 commits into
base: staging
Choose a base branch
from
Open

feat!: Show g7,g9,g10 with Attestation Check-In Report #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5120d71
feat!: Show g7,g9,g10 with Attestation Check-In Report
kekey1 Jan 28, 2026
67b11cc
Merge branch 'staging' into OCD-5153
kekey1 Feb 5, 2026
31024d2
Merge branch 'staging' into OCD-5153
kekey1 Feb 11, 2026
2c2d1a4
Merge branch 'staging' into OCD-5153
kekey1 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...va/gov/healthit/chpl/scheduler/job/developer/attestation/AttestationCheckinReportDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ public void save(List<CheckInReport> checkinReports) {
.realWorldTestingValidation(report.getRealWorldTestingValidation())
.apiValidation(report.getApiValidation())
.warnings(report.getWarnings())
.attestsG7(report.getAttestsG7())
.attestsG9(report.getAttestsG9())
.attestsG10(report.getAttestsG10())
.build();
create(entity);
});
Expand Down
12 changes: 11 additions & 1 deletion ...gov/healthit/chpl/scheduler/job/developer/attestation/AttestationCheckinReportEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ public class AttestationCheckinReportEntity extends EntityAudit {
@Column(name = "warnings")
private String warnings;

@Column(name = "attests_g7")
private Boolean attestsG7;

@Column(name = "attests_g9")
private Boolean attestsG9;

@Column(name = "attests_g10")
private Boolean attestsG10;

public CheckInReport toDomain() {
return CheckInReport.builder()
Expand Down Expand Up @@ -162,7 +170,9 @@ public CheckInReport toDomain() {
.realWorldTestingValidation(this.getRealWorldTestingValidation())
.apiValidation(this.getApiValidation())
.warnings(this.getWarnings())
.attestsG7(this.getAttestsG7())
.attestsG9(this.getAttestsG9())
.attestsG10(this.getAttestsG10())
.build();

}
}
15 changes: 13 additions & 2 deletions ...ce/src/main/java/gov/healthit/chpl/scheduler/job/developer/attestation/CheckInReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.time.LocalDateTime;
import java.util.List;

import org.apache.commons.lang3.BooleanUtils;

import gov.healthit.chpl.changerequest.domain.ChangeRequest;
import gov.healthit.chpl.domain.CertificationBody;
import gov.healthit.chpl.domain.Developer;
Expand Down Expand Up @@ -46,6 +48,9 @@ public class CheckInReport {
private String realWorldTestingValidation;
private String apiValidation;
private String warnings;
private Boolean attestsG7;
private Boolean attestsG9;
private Boolean attestsG10;

private ChangeRequest mostRecentAttestationChangeRequest;
private Developer developer;
Expand Down Expand Up @@ -80,7 +85,10 @@ public List<String> toListOfStrings() {
openDirectReviewNonconformities != null ? openDirectReviewNonconformities.toString() : "0",
assurancesValidation != null ? assurancesValidation : "",
apiValidation != null ? apiValidation : "",
realWorldTestingValidation != null ? realWorldTestingValidation : "");
realWorldTestingValidation != null ? realWorldTestingValidation : "",
BooleanUtils.isTrue(attestsG7) ? "TRUE" : "FALSE",
BooleanUtils.isTrue(attestsG9) ? "TRUE" : "FALSE",
BooleanUtils.isTrue(attestsG10) ? "TRUE" : "FALSE");
}

public static List<String> getHeaders() {
Expand Down Expand Up @@ -112,6 +120,9 @@ public static List<String> getHeaders() {
"Open Direct Review Non-conformities",
"Has listing(s) with Assurances criteria (b)(10)",
"Has listing(s) with API criteria",
"Has listing(s) with RWT criteria");
"Has listing(s) with RWT criteria",
"170.315 (g)(7)",
"170.315 (g)(9)",
"170.315 (g)(10)");
}
}
29 changes: 23 additions & 6 deletions ...ava/gov/healthit/chpl/scheduler/job/developer/attestation/CheckInReportDataCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import gov.healthit.chpl.attestation.domain.AttestationSubmission;
import gov.healthit.chpl.attestation.manager.AttestationManager;
import gov.healthit.chpl.attestation.service.AttestationCertificationBodyService;
import gov.healthit.chpl.certificationCriteria.CertificationCriterion;
import gov.healthit.chpl.changerequest.dao.DeveloperCertificationBodyMapDAO;
import gov.healthit.chpl.changerequest.domain.ChangeRequest;
import gov.healthit.chpl.changerequest.domain.ChangeRequestAttestationSubmission;
Expand All @@ -24,6 +25,7 @@
import gov.healthit.chpl.search.domain.ListingSearchResult;
import gov.healthit.chpl.search.domain.SearchRequest;
import gov.healthit.chpl.service.CertificationCriterionService;
import gov.healthit.chpl.service.CertificationCriterionService.Criteria2015;
import gov.healthit.chpl.service.realworldtesting.RealWorldTestingCriteriaService;
import gov.healthit.chpl.util.CertificationStatusUtil;
import lombok.extern.log4j.Log4j2;
Expand All @@ -41,6 +43,7 @@ public class CheckInReportDataCollector {
private CheckInReportSourceService checkInReportSourceService;
private CheckInReportValidation checkInReportValidation;
private AttestationCertificationBodyService attestationCertificationBodyService;
private CertificationCriterion g7, g9, g10;

private List<String> activeStatuses = CertificationStatusUtil.getActiveStatusNames();

Expand All @@ -63,6 +66,9 @@ public CheckInReportDataCollector(AttestationManager attestationManager,
this.checkInReportSourceService = checkInReportSourceService;
this.checkInReportValidation = checkInReportValidation;
this.attestationCertificationBodyService = attestationCertificationBodyService;
this.g7 = certificationCriterionService.get(Criteria2015.G_7);
this.g9 = certificationCriterionService.get(Criteria2015.G_9_CURES);
this.g10 = certificationCriterionService.get(Criteria2015.G_10);
}

public List<CheckInReport> collect(List<Long> acbIds) throws EntityRetrievalException {
Expand Down Expand Up @@ -163,11 +169,14 @@ private CheckInReport addResponses(CheckInReport checkInReport, Form form) {
}

private CheckInReport addComplianceInformation(CheckInReport checkInReport, Developer developer, List<ListingSearchResult> allActiveListingsForDeveloper) {
checkInReport.setTotalSurveillances(getTotalSurveillances(developer, allActiveListingsForDeveloper, LOGGER));
checkInReport.setTotalSurveillanceNonconformities(getTotalSurveillanceNonconformities(developer, allActiveListingsForDeveloper, LOGGER));
checkInReport.setOpenSurveillanceNonconformities(getOpenSurveillanceNonconformities(developer, allActiveListingsForDeveloper, LOGGER));
checkInReport.setTotalSurveillances(getTotalSurveillances(allActiveListingsForDeveloper));
checkInReport.setTotalSurveillanceNonconformities(getTotalSurveillanceNonconformities(allActiveListingsForDeveloper));
checkInReport.setOpenSurveillanceNonconformities(getOpenSurveillanceNonconformities(allActiveListingsForDeveloper));
checkInReport.setTotalDirectReviewNonconformities(getTotalDirectReviewNonconformities(developer, LOGGER));
checkInReport.setOpenDirectReviewNonconformities(getOpenDirectReviewNonconformities(developer, LOGGER));
checkInReport.setAttestsG7(getAnyListingForDeveloperAttestsCriterion(allActiveListingsForDeveloper, g7));
checkInReport.setAttestsG9(getAnyListingForDeveloperAttestsCriterion(allActiveListingsForDeveloper, g9));
checkInReport.setAttestsG10(getAnyListingForDeveloperAttestsCriterion(allActiveListingsForDeveloper, g10));
return checkInReport;
}

Expand Down Expand Up @@ -197,24 +206,32 @@ private String getAttestationOptionalResponse(Form form, Long conditionId) {
return form.formatOptionalResponsesForCondition(conditionId);
}

private Long getTotalSurveillances(Developer developer, List<ListingSearchResult> allActiveListingsForDeveloper, Logger logger) {
private Long getTotalSurveillances(List<ListingSearchResult> allActiveListingsForDeveloper) {
return allActiveListingsForDeveloper.stream()
.map(listing -> addSurveillanceCount(listing))
.collect(Collectors.summingLong(Long::longValue));
}

private Long getTotalSurveillanceNonconformities(Developer developer, List<ListingSearchResult> allActiveListingsForDeveloper, Logger logger) {
private Long getTotalSurveillanceNonconformities(List<ListingSearchResult> allActiveListingsForDeveloper) {
return allActiveListingsForDeveloper.stream()
.map(listing -> addOpenAndClosedNonconformityCount(listing))
.collect(Collectors.summingLong(Long::longValue));
}

private Long getOpenSurveillanceNonconformities(Developer developer, List<ListingSearchResult> allActiveListingsForDeveloper, Logger logger) {
private Long getOpenSurveillanceNonconformities(List<ListingSearchResult> allActiveListingsForDeveloper) {
return allActiveListingsForDeveloper.stream()
.map(listing -> listing.getOpenSurveillanceNonConformityCount())
.collect(Collectors.summingLong(Long::longValue));
}

private Boolean getAnyListingForDeveloperAttestsCriterion(List<ListingSearchResult> allActiveListingsForDeveloper, CertificationCriterion criterionToCheck) {
return allActiveListingsForDeveloper.stream()
.flatMap(listing -> listing.getCriteriaMet().stream())
.filter(criterion -> criterion.getId().equals(criterionToCheck.getId()))
.findAny()
.isPresent();
}

private Long getTotalDirectReviewNonconformities(Developer developer, Logger logger) {
return directReviewSearchService.getDeveloperDirectReviews(developer.getId(), logger).stream()
.flatMap(dr -> dr.getNonConformities().stream())
Expand Down