-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor Measure logic into a service (#648)
- Loading branch information
Showing
6 changed files
with
336 additions
and
158 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,37 @@ | ||
| version: "2.4" | ||
| services: | ||
| # dqm: | ||
| # depends_on: | ||
| # - postgres | ||
| # image: alphora/cqf-ruler:testy | ||
| # ports: | ||
| # - 8080:8080 | ||
| # environment: | ||
| # - "spring.datasource.url=jdbc:postgresql://postgres:5432/postgres" | ||
| # - "spring.datasource.username=postgres" | ||
| # - "spring.datasource.password=" | ||
| # - "spring.datasource.driverClassName=org.postgresql.Driver" | ||
| # - "spring.jpa.properties.hibernate.dialect=ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect" | ||
| # - "spring.jpa.database-platform=ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect" | ||
| # - "hapi.fhir.bulk_export_enabled=false" | ||
| # - "spring.batch.job.enabled=false" | ||
|
|
||
| postgres: | ||
| image: postgres | ||
| image: "postgres" | ||
| ports: | ||
| - 5432:5432 | ||
| environment: | ||
| - "POSTGRES_HOST_AUTH_METHOD=trust" | ||
| POSTGRES_HOST_AUTH_METHOD: trust | ||
| healthcheck: | ||
| test: [ "CMD-SHELL", "pg_isready -U postgres" ] | ||
| interval: 10s | ||
| timeout: 5s | ||
| retries: 5 | ||
| ruler: | ||
| image: "alphora/cqf-ruler:0.7.1" | ||
| depends_on: | ||
| - postgres | ||
| ports: | ||
| - "8080:8080" | ||
| healthcheck: | ||
| test: | ||
| [ | ||
| "CMD", | ||
| "curl", | ||
| "-f", | ||
| "http://localhost:8080/fhir/metadata" | ||
| ] | ||
| interval: 90s | ||
| timeout: 5s | ||
| retries: 3 | ||
| start_period: 90s | ||
| environment: | ||
| - "spring.datasource.url=jdbc:postgresql://postgres:5432/postgres" | ||
| - "spring.datasource.username=postgres" | ||
| - "spring.datasource.password=" | ||
| - "spring.datasource.driverClassName=org.postgresql.Driver" | ||
| - "spring.jpa.properties.hibernate.dialect=ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect" |
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
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
114 changes: 114 additions & 0 deletions
114
plugin/cr/src/main/java/org/opencds/cqf/ruler/cr/dstu3/service/MeasureService.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package org.opencds.cqf.ruler.cr.dstu3.service; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import org.cqframework.cql.cql2elm.LibrarySourceProvider; | ||
| import org.hl7.fhir.dstu3.model.Bundle; | ||
| import org.hl7.fhir.dstu3.model.Endpoint; | ||
| import org.hl7.fhir.dstu3.model.Extension; | ||
| import org.hl7.fhir.dstu3.model.IdType; | ||
| import org.hl7.fhir.dstu3.model.Measure; | ||
| import org.hl7.fhir.dstu3.model.MeasureReport; | ||
| import org.hl7.fhir.dstu3.model.StringType; | ||
| import org.opencds.cqf.cql.engine.data.DataProvider; | ||
| import org.opencds.cqf.cql.engine.fhir.terminology.Dstu3FhirTerminologyProvider; | ||
| import org.opencds.cqf.cql.engine.terminology.TerminologyProvider; | ||
| import org.opencds.cqf.cql.evaluator.CqlOptions; | ||
| import org.opencds.cqf.cql.evaluator.builder.DataProviderFactory; | ||
| import org.opencds.cqf.cql.evaluator.fhir.dal.FhirDal; | ||
| import org.opencds.cqf.cql.evaluator.measure.MeasureEvaluationOptions; | ||
| import org.opencds.cqf.ruler.behavior.DaoRegistryUser; | ||
| import org.opencds.cqf.ruler.cql.JpaDataProviderFactory; | ||
| import org.opencds.cqf.ruler.cql.JpaFhirDalFactory; | ||
| import org.opencds.cqf.ruler.cql.JpaLibrarySourceProviderFactory; | ||
| import org.opencds.cqf.ruler.cql.JpaTerminologyProviderFactory; | ||
| import org.opencds.cqf.ruler.utility.Clients; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| import ca.uhn.fhir.jpa.api.dao.DaoRegistry; | ||
| import ca.uhn.fhir.rest.api.server.RequestDetails; | ||
| import ca.uhn.fhir.rest.client.api.IGenericClient; | ||
|
|
||
| public class MeasureService implements DaoRegistryUser { | ||
|
|
||
| @Autowired | ||
| private JpaTerminologyProviderFactory jpaTerminologyProviderFactory; | ||
|
|
||
| @Autowired | ||
| private JpaDataProviderFactory jpaDataProviderFactory; | ||
|
|
||
| @Autowired | ||
| private DataProviderFactory dataProviderFactory; | ||
|
|
||
| @Autowired | ||
| private JpaLibrarySourceProviderFactory libraryContentProviderFactory; | ||
|
|
||
| @Autowired | ||
| private JpaFhirDalFactory fhirDalFactory; | ||
|
|
||
| @Autowired | ||
| private Map<org.cqframework.cql.elm.execution.VersionedIdentifier, org.cqframework.cql.elm.execution.Library> globalLibraryCache; | ||
|
|
||
| @Autowired | ||
| private CqlOptions cqlOptions; | ||
|
|
||
| @Autowired | ||
| private MeasureEvaluationOptions measureEvaluationOptions; | ||
|
|
||
| @Autowired | ||
| private DaoRegistry daoRegistry; | ||
|
|
||
| private RequestDetails requestDetails; | ||
|
|
||
| public void setRequestDetails(RequestDetails requestDetails) { | ||
| this.requestDetails = requestDetails; | ||
| } | ||
|
|
||
| public MeasureReport evaluateMeasure(IdType theId, | ||
| String periodStart, | ||
| String periodEnd, | ||
| String reportType, | ||
| String patient, | ||
| String practitioner, | ||
| String lastReceivedOn, | ||
| String productLine, | ||
| Bundle additionalData, | ||
| Endpoint terminologyEndpoint) { | ||
|
|
||
| Measure measure = read(theId, requestDetails); | ||
|
|
||
| TerminologyProvider terminologyProvider; | ||
|
|
||
| if (terminologyEndpoint != null) { | ||
| IGenericClient client = Clients.forEndpoint(getFhirContext(), terminologyEndpoint); | ||
| terminologyProvider = new Dstu3FhirTerminologyProvider(client); | ||
| } else { | ||
| terminologyProvider = this.jpaTerminologyProviderFactory.create(requestDetails); | ||
| } | ||
|
|
||
| DataProvider dataProvider = this.jpaDataProviderFactory.create(requestDetails, terminologyProvider); | ||
| LibrarySourceProvider libraryContentProvider = this.libraryContentProviderFactory.create(requestDetails); | ||
| FhirDal fhirDal = this.fhirDalFactory.create(requestDetails); | ||
|
|
||
| org.opencds.cqf.cql.evaluator.measure.dstu3.Dstu3MeasureProcessor measureProcessor = new org.opencds.cqf.cql.evaluator.measure.dstu3.Dstu3MeasureProcessor( | ||
| null, dataProviderFactory, null, null, null, terminologyProvider, libraryContentProvider, dataProvider, | ||
| fhirDal, measureEvaluationOptions, cqlOptions, globalLibraryCache); | ||
|
|
||
| MeasureReport report = measureProcessor.evaluateMeasure(measure.getUrl(), periodStart, periodEnd, reportType, | ||
| patient, null, lastReceivedOn, null, null, null, additionalData); | ||
|
|
||
| if (productLine != null) { | ||
| Extension ext = new Extension(); | ||
| ext.setUrl("http://hl7.org/fhir/us/cqframework/cqfmeasures/StructureDefinition/cqfm-productLine"); | ||
| ext.setValue(new StringType(productLine)); | ||
| report.addExtension(ext); | ||
| } | ||
|
|
||
| return report; | ||
| } | ||
|
|
||
| @Override | ||
| public DaoRegistry getDaoRegistry() { | ||
| return this.daoRegistry; | ||
| } | ||
| } |
Oops, something went wrong.