honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#3729 renaming patient-list to subject-list (#3730) 

* #3729 renaming patient-list to subject-list

* #3729 adding changelog

* #3729 updating changelog

* #3729

renaming patient to subject

* #3729 fixing tests

Co-authored-by: Anna <anna@MacBook-Pro.local>
This commit is contained in:
alackerbauer 2022-07-06 09:19:39 +02:00 committed by GitHub
parent 616a126fad
commit 835ec1b870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3729-renaming-outdated-measure-type-subject-list.yaml Normal file
View File

@ -0,0 +1,4 @@
---
type: fix
issue: 3729
title: "The patient-list type was renamed to subject-list for a CQL measure in R4."

2
hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluation.java
View File

@ -99,7 +99,7 @@ public class MeasureEvaluation {
}
public MeasureReport evaluateSubjectListMeasure(Measure measure, Context context, String practitionerRef, RequestDetails theRequestDetails) {
logger.info("Generating patient-list report");
logger.info("Generating subject-list report");
List<Patient> patients = practitionerRef == null ? getAllPatients(theRequestDetails) : getPractitionerPatients(practitionerRef, theRequestDetails);
boolean isSingle = false;

9
hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/MeasureOperationsProvider.java
View File

@ -103,9 +103,9 @@ public class MeasureOperationsProvider {
seed.getMeasurementPeriod());
if (reportType != null) {
switch (reportType) {
case "patient":
return evaluator.evaluatePatientMeasure(seed.getMeasure(), seed.getContext(), patientRef,practitionerRef, theRequestDetails);
case "patient-list":
case "subject":
return evaluator.evaluatePatientMeasure(seed.getMeasure(), seed.getContext(), patientRef, practitionerRef, theRequestDetails);
case "subject-list":
return evaluator.evaluateSubjectListMeasure(seed.getMeasure(), seed.getContext(), practitionerRef, theRequestDetails);
case "population":
return evaluator.evaluatePopulationMeasure(seed.getMeasure(), seed.getContext(), practitionerRef, theRequestDetails);
@ -114,8 +114,9 @@ public class MeasureOperationsProvider {
}
}
// default report type is patient
// default report type is subject
MeasureReport report = evaluator.evaluatePatientMeasure(seed.getMeasure(), seed.getContext(), patientRef, practitionerRef, theRequestDetails);
if (productLine != null) {
Extension ext = new Extension();
ext.setUrl("http://hl7.org/fhir/us/cqframework/cqfmeasures/StructureDefinition/cqfm-productLine");

2
hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/r4/CqlMeasureEvaluationR4ImmunizationTest.java
View File

@ -103,7 +103,7 @@ public class CqlMeasureEvaluationR4ImmunizationTest extends BaseCqlR4Test {
return this.myMeasureOperationsProvider.evaluateMeasure(new IdType("Measure", measureId),
periodStart, periodEnd, null,
"patient", patientId,
"subject", patientId,
null, thePractitionerRef, null, null, null, null, myRequestDetails);
}

2
hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/r4/CqlMeasureEvaluationR4Test.java
View File

@ -63,7 +63,7 @@ public class CqlMeasureEvaluationR4Test extends BaseCqlR4Test {
MeasureReport actual = this.myMeasureOperationsProvider.evaluateMeasure(new IdType("Measure", measureId),
periodStart, periodEnd, null,
// TODO: These are all individual reports
"patient", patientId,
"subject", patientId,
// TODO: Generalize these parameters into a Parameters resource
null, null, null, null, null, null, myRequestDetails);

4
hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/r4/CqlProviderR4Test.java
View File

@ -50,7 +50,7 @@ public class CqlProviderR4Test extends BaseCqlR4Test implements CqlProviderTestB
loadResource("r4/hedis-ig/measure-asf.json", myRequestDetails);
myPartitionHelper.clear();
MeasureReport report = myMeasureOperationsProvider.evaluateMeasure(measureId, periodStart, periodEnd, measure, "patient",
MeasureReport report = myMeasureOperationsProvider.evaluateMeasure(measureId, periodStart, periodEnd, measure, "subject",
patient, null, null, null, null, null, null, myRequestDetails);
// Assert it worked
@ -67,7 +67,7 @@ public class CqlProviderR4Test extends BaseCqlR4Test implements CqlProviderTestB
loadResource("r4/hedis-ig/measure-asf.json", myRequestDetails);
myPartitionHelper.clear();
MeasureReport report = myMeasureOperationsProvider.evaluateMeasure(measureId, null, null, measure, "patient",
MeasureReport report = myMeasureOperationsProvider.evaluateMeasure(measureId, null, null, measure, "subject",
patient, null, null, null, null, null, null, myRequestDetails);
// Assert it worked