From d6fae7c673f9480385c49d4e302545b1e83d62d5 Mon Sep 17 00:00:00 2001 From: Justin McKelvy <60718638+Capt-Mac@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:17:13 -0600 Subject: [PATCH] fix bug on hapifhirdal searchbyurl to account for version (#5087) * fix bug on hapifhirdal searchbyurl to account for version * update return type to bundleIterable, update test to validate * add clinical-reasoning 3.0.0-PRE5 * added test comments, updated search, explicit variables * add example comment to search cases * fix typo * spotless apply edits --------- Co-authored-by: justin.mckelvy --- .../ca/uhn/fhir/cr/common/HapiFhirDal.java | 30 +- .../ca/uhn/fhir/cr/r4/HapiFhirDalR4Test.java | 26 ++ .../cr/r4/Bundle-HapiFhirDalTestLibrary.json | 301 ++++++++++++++++++ pom.xml | 2 +- 4 files changed, 354 insertions(+), 5 deletions(-) create mode 100644 hapi-fhir-storage-cr/src/test/resources/ca/uhn/fhir/cr/r4/Bundle-HapiFhirDalTestLibrary.json diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java index c83f1fb2b9d..c5ef4652067 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java @@ -21,7 +21,10 @@ package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.api.server.SystemRequestDetails; +import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.UriParam; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; @@ -74,9 +77,28 @@ public class HapiFhirDal implements FhirDal { @Override public Iterable searchByUrl(String theResourceType, String theUrl) { - var b = this.myDaoRegistry - .getResourceDao(theResourceType) - .search(new SearchParameterMap().add("url", new UriParam(theUrl)), myRequestDetails); - return new BundleIterable(myRequestDetails, b); + // version example "http://content.smilecdr.com/fhir/dqm/Library/ImmunizationStatusRoutine|2.0.1" + if (theUrl.contains("|")) { + String[] urlSplit = theUrl.split("\\|"); + String urlBase = urlSplit[0]; + String urlVersion = urlSplit[1]; + + IBundleProvider versionResource = this.myDaoRegistry + .getResourceDao(theResourceType) + .search( + SearchParameterMap.newSynchronous() + .add("url", new UriParam(urlBase)) + .add("version", new TokenParam(urlVersion)), + new SystemRequestDetails()); + return new BundleIterable(myRequestDetails, versionResource); + } else { + // standard example "http://content.smilecdr.com/fhir/dqm/Library/ImmunizationStatusRoutine" + IBundleProvider standardResource = this.myDaoRegistry + .getResourceDao(theResourceType) + .search( + SearchParameterMap.newSynchronous().add("url", new UriParam(theUrl)), + new SystemRequestDetails()); + return new BundleIterable(myRequestDetails, standardResource); + } } } diff --git a/hapi-fhir-storage-cr/src/test/java/ca/uhn/fhir/cr/r4/HapiFhirDalR4Test.java b/hapi-fhir-storage-cr/src/test/java/ca/uhn/fhir/cr/r4/HapiFhirDalR4Test.java index 6647b80c15b..3a4589c3508 100644 --- a/hapi-fhir-storage-cr/src/test/java/ca/uhn/fhir/cr/r4/HapiFhirDalR4Test.java +++ b/hapi-fhir-storage-cr/src/test/java/ca/uhn/fhir/cr/r4/HapiFhirDalR4Test.java @@ -3,12 +3,18 @@ package ca.uhn.fhir.cr.r4; import ca.uhn.fhir.cr.BaseCrR4Test; import ca.uhn.fhir.cr.common.HapiFhirDal; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; +import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringExtension; +import java.util.Iterator; + import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * This class tests the functionality of HapiFhirDal operations inside the cr module */ @@ -37,4 +43,24 @@ public class HapiFhirDalR4Test extends BaseCrR4Test { assertEquals(63, counter, "Patient search results don't match available resources"); } + @Test + void canSearchVersionURL(){ + // load measure resource with Library url containing "|", this is the only component of test resource used. + loadBundle("ca/uhn/fhir/cr/r4/Bundle-HapiFhirDalTestLibrary.json"); + HapiFhirDal hapiFhirDal = new HapiFhirDal(this.getDaoRegistry(), null); + + // library url from loaded measure resource + String url = "http://content.smilecdr.com/fhir/dqm/Library/ImmunizationStatusRoutine|2.0.1"; + // search for resource given url + Iterable result = hapiFhirDal.searchByUrl("Library", url); + Iterator resultIter = result.iterator(); + // validate Iterable contains a resource + assertTrue(resultIter.hasNext()); + // get resource + IBaseResource finalResult = resultIter.next(); + // validate resource exists + assertNotNull(finalResult); + } + + } diff --git a/hapi-fhir-storage-cr/src/test/resources/ca/uhn/fhir/cr/r4/Bundle-HapiFhirDalTestLibrary.json b/hapi-fhir-storage-cr/src/test/resources/ca/uhn/fhir/cr/r4/Bundle-HapiFhirDalTestLibrary.json new file mode 100644 index 00000000000..10ccb219e2c --- /dev/null +++ b/hapi-fhir-storage-cr/src/test/resources/ca/uhn/fhir/cr/r4/Bundle-HapiFhirDalTestLibrary.json @@ -0,0 +1,301 @@ +{ + "resourceType": "Bundle", + "id": "bundle-hapifhirdaltest", + "type": "transaction", + "entry": [ + { + "fullUrl": "urn:uuid:61ebe359-bfdc-4613-8bf2-c5e300940000", + "resource": { + "resourceType": "Library", + "id": "ImmunizationStatusRoutine", + "extension": [ + { + "url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-softwaresystem", + "valueReference": { + "reference": "Device/cqf-tooling" + } + } + ], + "url": "http://content.smilecdr.com/fhir/dqm/Library/ImmunizationStatusRoutine", + "version": "2.0.1", + "name": "ImmunizationStatusRoutine", + "title": "Library - Immunization Status for Patients Starting Immunization in Infancy", + "status": "draft", + "type": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/library-type", + "code": "logic-library" + } + ] + }, + "description": "Percentage of population that is fully vaccinated based on the routine schedule of the Publicly Funded Immunization Schedules for Ontario – June 2022 (Page 3)", + "jurisdiction": [ + { + "coding": [ + { + "system": "urn:iso:std:iso:3166", + "version": "4.0.1", + "code": "US", + "display": "United States of America" + } + ], + "text": "United States of America" + } + ], + "relatedArtifact": [ + { + "type": "depends-on", + "display": "FHIR model information", + "resource": "http://fhir.org/guides/cqf/common/Library/FHIR-ModelInfo|4.0.1" + }, + { + "type": "depends-on", + "display": "Library FHIRHelpers", + "resource": "http://content.smilecdr.com/fhir/dqm/Library/FHIRHelpers|4.0.1" + }, + { + "type": "depends-on", + "display": "Library FC", + "resource": "http://content.smilecdr.com/fhir/dqm/Library/FHIRCommon|4.0.1" + } + ], + "parameter": [ + { + "name": "Measurement Period", + "use": "in", + "min": 0, + "max": "1", + "type": "Period" + }, + { + "name": "Patient", + "use": "out", + "min": 0, + "max": "1", + "type": "Patient" + }, + { + "name": "Practitioner", + "use": "out", + "min": 0, + "max": "1", + "type": "Practitioner" + }, + { + "name": "Qualifying Encounters During Measurement Period", + "use": "out", + "min": 0, + "max": "*", + "type": "Encounter" + }, + { + "name": "Initial Population", + "use": "out", + "min": 0, + "max": "1", + "type": "boolean" + }, + { + "name": "Denominator", + "use": "out", + "min": 0, + "max": "1", + "type": "boolean" + }, + { + "name": "Numerator", + "use": "out", + "min": 0, + "max": "1", + "type": "boolean" + } + ], + "dataRequirement": [ + { + "type": "Patient", + "profile": [ + "http://hl7.org/fhir/StructureDefinition/Patient" + ] + } + ], + "content": [ + { + "contentType": "text/cql", + "data": "/* ******************************************************************************************* */
/* Copyright (C) 2014 - 2022 Smile CDR, Inc.
/*
/* Licensed under the Apache License, Version 2.0 (the "License");
/* you may not use this file except in compliance with the License.
/* You may obtain a copy of the License at
/*
/*      http://www.apache.org/licenses/LICENSE-2.0
/*
/* Unless required by applicable law or agreed to in writing, software
/* distributed under the License is distributed on an "AS IS" BASIS,
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/* See the License for the specific language governing permissions and
/* limitations under the License.
/* ****************************************************************************************** */

library ImmunizationStatusRoutine

using FHIR version '4.0.1'

include FHIRHelpers version '4.0.1' called FHIRHelpers
include FHIRCommon called FC

valueset "DTaP_IPV_Hib Vaccine": 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.464.1003.196.11.1212'
valueset "Pneu_C_13 Vaccine": 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.464.1003.1158'
valueset "Rot_1 Vaccine": 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.464.1003.196.11.1232'
valueset "Men_C_C Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Men-C-C'
valueset "MMR Vaccine": 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.464.1003.196.11.1235'
valueset "Var Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Var'
valueset "MMRV Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-MMRV'
valueset "Tdap_IPV Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Tdap-IPV'
valueset "HB Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-HB'
valueset "Men_C_ACYW Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Men-C-ACYW'
valueset "HPV_9 Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-HPV-9'
valueset "Tdap Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Tdap'
valueset "Td Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Td'
valueset "Pneu_P_23 Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-Pneu-P-23'
valueset "HZ Vaccine": 'http://hl7.org/fhir/ValueSet/vaccine-HZ'


parameter "Measurement Period" default Interval[@2022-09-16T00:00:00.000, @2022-09-16T00:00:00.000]
context Patient

define "Initial Population":
	AgeInMonthsAt(date from start of "Measurement Period") >= 2
	and exists ("Qualifying Encounters")

define "Denominator":
	"Initial Population"

define "Qualifying Encounters":
	[Encounter] ValidEncounter
	   	where ValidEncounter.status  = 'finished'

define "Numerator":
	"Fully Routine Vaccinated"

define "Fully Routine Vaccinated":
	"Four DTaP_IPV_Hib Vaccinations"
	and
	"Three Pneu_C_13 Vaccinations"
	and
	"Two Rot_1 Vaccinations"
	and
	"One Men_C_C Vaccination"
	and
	"One MMR Vaccination"
	and
	"One Var Vaccination"
	and
	"One MMRV Vaccination"
	and
	"One Tdap_IPV Vaccination"
	and
	"One HB Vaccination"
	and
	"One Men_C_ACYW Vaccination"
	and
	"One HPV_9 Vaccination"
	and
	"One HZ Vaccination"
	and
	"One Pneu_P_23 Vaccination"
	and
	"Two Tdap Vaccinations"
	and
	"One Td Vaccination"

define "DTaP_IPV_Hib Vaccination 2 Months":
	[Immunization: "DTaP_IPV_Hib Vaccine"] DTaP_IPV_HibVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) <= 2
					)
		where DTaP_IPV_HibVaccination.status  = 'completed'

define "DTaP_IPV_Hib Vaccination 4 Months":
	[Immunization: "DTaP_IPV_Hib Vaccine"] DTaP_IPV_HibVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) > 2)
						and
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) <= 4)
					)
		where DTaP_IPV_HibVaccination.status  = 'completed'

define "DTaP_IPV_Hib Vaccination 6 Months":
	[Immunization: "DTaP_IPV_Hib Vaccine"] DTaP_IPV_HibVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) > 4)
							and
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) <= 6)
					)
		where DTaP_IPV_HibVaccination.status  = 'completed'

define "DTaP_IPV_Hib Vaccination 18 Months":
	[Immunization: "DTaP_IPV_Hib Vaccine"] DTaP_IPV_HibVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) > 6)
						and
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(DTaP_IPV_HibVaccination.occurrence)) <= 18)
					)
		where DTaP_IPV_HibVaccination.status  = 'completed'

define "Four DTaP_IPV_Hib Vaccinations":
	(exists("DTaP_IPV_Hib Vaccination 2 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 2))
	and
	(exists("DTaP_IPV_Hib Vaccination 4 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 4))
	and
	(exists("DTaP_IPV_Hib Vaccination 6 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 6))
	and
	(exists("DTaP_IPV_Hib Vaccination 18 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 18))

define "Pneu_C_13 Vaccination 2 Months":
	[Immunization: "Pneu_C_13 Vaccine"] Pneu_C_13Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInMonthsAt(FHIRHelpers.ToDateTime(Pneu_C_13Vaccination.occurrence)) <= 2
					)
		where Pneu_C_13Vaccination.status  = 'completed'

define "Pneu_C_13 Vaccination 4 Months":
	[Immunization: "Pneu_C_13 Vaccine"] Pneu_C_13Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(Pneu_C_13Vaccination.occurrence)) > 2)
						and
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(Pneu_C_13Vaccination.occurrence)) <= 4)
					)
		where Pneu_C_13Vaccination.status  = 'completed'

define "Pneu_C_13 Vaccination 12 Months":
	[Immunization: "Pneu_C_13 Vaccine"] Pneu_C_13Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(Pneu_C_13Vaccination.occurrence)) > 4)
						and
						(AgeInYearsAt(FHIRHelpers.ToDateTime(Pneu_C_13Vaccination.occurrence)) <= 1)
					)
		where Pneu_C_13Vaccination.status  = 'completed'

define "Three Pneu_C_13 Vaccinations":
	(exists("Pneu_C_13 Vaccination 2 Months") or AgeInMonthsAt(date from start of "Measurement Period") < 2)
	and
	(exists("Pneu_C_13 Vaccination 4 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 4))
	and
	(exists("Pneu_C_13 Vaccination 12 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 12))

define "Rot_1 Vaccination 2 Months":
	[Immunization: "Rot_1 Vaccine"] Rot_1Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInMonthsAt(FHIRHelpers.ToDateTime(Rot_1Vaccination.occurrence)) <= 2
					)
		where Rot_1Vaccination.status  = 'completed'

define "Rot_1 Vaccination 4 Months":
	[Immunization: "Rot_1 Vaccine"] Rot_1Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInMonthsAt(FHIRHelpers.ToDateTime(Rot_1Vaccination.occurrence)) > 2)
							and (AgeInMonthsAt(FHIRHelpers.ToDateTime(Rot_1Vaccination.occurrence)) <= 4)
					)
		where Rot_1Vaccination.status  = 'completed'


define "Two Rot_1 Vaccinations":
	(exists("Rot_1 Vaccination 2 Months") or AgeInMonthsAt(date from start of "Measurement Period") < 2)
	and
	(exists("Rot_1 Vaccination 4 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 4))

define "Men_C_C Vaccination 1 Year":
	[Immunization: "Men_C_C Vaccine"] Men_C_CVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(Men_C_CVaccination.occurrence)) <= 1
					)
		where	Men_C_CVaccination.status  = 'completed'

define "One Men_C_C Vaccination":
	(exists("Men_C_C Vaccination 1 Year") or (AgeInYearsAt(date from start of "Measurement Period")  < 1))

define "MMR Vaccination 1 Year":
	[Immunization: "MMR Vaccine"] MMRVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(MMRVaccination.occurrence)) <= 1
					)
			where MMRVaccination.status  = 'completed'

define "One MMR Vaccination":
	(exists("MMR Vaccination 1 Year") or (AgeInYearsAt(date from start of "Measurement Period")  < 1))

define "Var Vaccination 15 Months":
	[Immunization: "Var Vaccine"] VarVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInMonthsAt(FHIRHelpers.ToDateTime(VarVaccination.occurrence)) <= 15
					)
		where VarVaccination.status  = 'completed'

define "One Var Vaccination":
	(exists("Var Vaccination 15 Months") or (AgeInMonthsAt(date from start of "Measurement Period") < 15))


define "MMRV Vaccination 4 Years":
	[Immunization: "MMRV Vaccine"] MMRVVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(MMRVVaccination.occurrence)) <= 4
					)
			where MMRVVaccination.status  = 'completed'

define "One MMRV Vaccination":
	(exists("MMRV Vaccination 4 Years") or (AgeInYearsAt(date from start of "Measurement Period") < 4))

define "Tdap_IPV Vaccination 4 Years":
	[Immunization: "Tdap_IPV Vaccine"] Tdap_IPVVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(Tdap_IPVVaccination.occurrence)) <= 4
					)
		where	Tdap_IPVVaccination.status  = 'completed'

define "One Tdap_IPV Vaccination":
	(exists("Tdap_IPV Vaccination 4 Years") or (AgeInYearsAt(date from start of "Measurement Period") < 4))

define "HB Vaccination Grade 7":
	[Immunization: "HB Vaccine"] HBVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(HBVaccination.occurrence)) <= 12
					)
		where HBVaccination.status  = 'completed'

define "One HB Vaccination":
	(exists("HB Vaccination Grade 7") or (AgeInYearsAt(date from start of "Measurement Period") < 12))

define "Men_C_ACYW Vaccination Grade 7":
	[Immunization: "Men_C_ACYW Vaccine"] Men_C_ACYWVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(Men_C_ACYWVaccination.occurrence)) <= 12
					)
		where	Men_C_ACYWVaccination.status  = 'completed'

define "One Men_C_ACYW Vaccination":
	(exists("Men_C_ACYW Vaccination Grade 7") or (AgeInYearsAt(date from start of "Measurement Period") < 12))

define "HPV_9 Vaccination Grade 7":
	[Immunization: "HPV_9 Vaccine"] HPV_9Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(HPV_9Vaccination.occurrence)) <= 12
					)
		where	HPV_9Vaccination.status  = 'completed'

define "One HPV_9 Vaccination":
	(exists("HPV_9 Vaccination Grade 7") or (AgeInYearsAt(date from start of "Measurement Period") < 12))

define "Tdap Vaccination 14 Years":
	[Immunization: "Tdap Vaccine"] TdapVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInYearsAt(FHIRHelpers.ToDateTime(TdapVaccination.occurrence)) >= 14)
							and (AgeInYearsAt(FHIRHelpers.ToDateTime(TdapVaccination.occurrence)) < 24)
					)
		where TdapVaccination.status  = 'completed'


define "Tdap Vaccination 24 Years":
	[Immunization: "Tdap Vaccine"] TdapVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
							(AgeInYearsAt(FHIRHelpers.ToDateTime(TdapVaccination.occurrence)) >= 24)
					)
		where	TdapVaccination.status  = 'completed'


define "Two Tdap Vaccinations":
	(exists("Tdap Vaccination 14 Years") or AgeInYearsAt(date from start of "Measurement Period") < 14)
	and
	(exists("Tdap Vaccination 24 Years") or (AgeInYearsAt(date from start of "Measurement Period") < 24))

define "Td Vaccination 34 Years":
	[Immunization: "Td Vaccine"] TdVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						(AgeInYearsAt(FHIRHelpers.ToDateTime(TdVaccination.occurrence)) >= 34)
							and
						(FHIRHelpers.ToDateTime(TdVaccination.occurrence) during Interval[date from start of "Measurement Period" - 10 years, date from start of "Measurement Period"])
					)
		where TdVaccination.status  = 'completed'

define "One Td Vaccination":
	(exists("Td Vaccination 34 Years") or (AgeInYearsAt(date from start of "Measurement Period") < 34))

define "HZ Vaccination Year 65":
	[Immunization: "HZ Vaccine"] HZVaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(HZVaccination.occurrence)) >= 65
					)
		where HZVaccination.status  = 'completed'

define "One HZ Vaccination":
	(exists("HZ Vaccination Year 65") or (AgeInYearsAt(date from start of "Measurement Period") < 65))

define "Pneu_P_23 Vaccination Year 65":
	[Immunization: "Pneu_P_23 Vaccine"] Pneu_P_23Vaccination
 		with "Qualifying Encounters" QualifyingEncounter
      		such that (
						AgeInYearsAt(FHIRHelpers.ToDateTime(Pneu_P_23Vaccination.occurrence)) >= 65
					)
		where Pneu_P_23Vaccination.status  = 'completed'

define "One Pneu_P_23 Vaccination":
	(exists("Pneu_P_23 Vaccination Year 65") or (AgeInYearsAt(date from start of "Measurement Period") < 65))

define function "Normalize Interval"(choice Choice<FHIR.dateTime, FHIR.Period, FHIR.Timing, FHIR.instant, FHIR.string, FHIR.Age, FHIR.Range> ):
  case
  	  when choice is FHIR.dateTime then
  	Interval[FHIRHelpers.ToDateTime(choice as FHIR.dateTime), FHIRHelpers.ToDateTime(choice as FHIR.dateTime)]
  		when choice is FHIR.Period then
  		FHIRHelpers.ToInterval(choice as FHIR.Period)
  		when choice is FHIR.instant then
  			Interval[FHIRHelpers.ToDateTime(choice as FHIR.instant), FHIRHelpers.ToDateTime(choice as FHIR.instant)]
  		when choice is FHIR.Age then
  		  Interval[FHIRHelpers.ToDate(Patient.birthDate) + FHIRHelpers.ToQuantity(choice as FHIR.Age),
  			  FHIRHelpers.ToDate(Patient.birthDate) + FHIRHelpers.ToQuantity(choice as FHIR.Age) + 1 year)
  		when choice is FHIR.Range then
  		  Interval[FHIRHelpers.ToDate(Patient.birthDate) + FHIRHelpers.ToQuantity((choice as FHIR.Range).low),
  			  FHIRHelpers.ToDate(Patient.birthDate) + FHIRHelpers.ToQuantity((choice as FHIR.Range).high) + 1 year)
  		when choice is FHIR.Timing then
  		  Message(null as Interval<DateTime>, true, '1', 'Error', 'Cannot compute a single interval from a Timing type')
    when choice is FHIR.string then
      Message(null as Interval<DateTime>, true, '1', 'Error', 'Cannot compute an interval from a String value')
  		else
  			null as Interval<DateTime>
  	end

define function "HasEnd"(period Interval<DateTime> ):
  not (
    end of period is null
      or
      end of period = maximum DateTime
  )

define function "Latest"(choice Choice<FHIR.dateTime, FHIR.Period, FHIR.Timing, FHIR.instant, FHIR.string, FHIR.Age, FHIR.Range> ):
  ("Normalize Interval"(choice)) period
    return
      if ( HasEnd(period)) then end of period
      else start of period
" + } + ] + }, + "request": { + "method": "PUT", + "url": "Library/ImmunizationStatusRoutine" + } + }, + { + "resource": { + "resourceType": "Measure", + "id": "ImmunizationStatusRoutine", + "url": "http://content.smilecdr.com/fhir/dqm/Measure/ImmunizationStatusRoutine", + "name": "Children-Immunization-Status-Routine", + "title": "Immunization Status for Patients Starting Immunization in Infancy", + "status": "active", + "experimental": true, + "date": "2022-08-07T07:41:37-07:00", + "publisher": "Smile CDR", + "contact": [ + { + "telecom": [ + { + "system": "url", + "value": "https://smilecdr.com" + } + ] + } + ], + "description": "Percentage of population that is fully vaccinated based on the routine schedule of the Publicly Funded Immunization Schedules for Ontario – June 2022 (Page 3)", + "useContext": [ + { + "code": { + "system": "http://terminology.hl7.org/CodeSystem/usage-context-type", + "version": "4.0.1", + "code": "program", + "display": "Program" + }, + "valueCodeableConcept": { + "text": "eligible-provider" + } + } + ], + "jurisdiction": [ + { + "coding": [ + { + "system": "urn:iso:std:iso:3166", + "version": "4.0.1", + "code": "CAN", + "display": "Canada" + } + ] + } + ], + "purpose": "Efficiency and Cost Reduction.", + "effectivePeriod": { + "start": "2022-01-01T00:00:00-07:00", + "end": "2022-12-31T23:59:59-07:00" + }, + "topic": [ + { + "coding": [ + { + "system": "http://loinc.org", + "code": "57024-2", + "display": "Health Quality Measure Document" + } + ] + } + ], + "library": [ + "http://content.smilecdr.com/fhir/dqm/Library/ImmunizationStatusRoutine|2.0.1" + ], + "scoring": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/measure-scoring", + "version": "4.0.1", + "code": "proportion", + "display": "Proportion" + } + ] + }, + "type": [ + { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/measure-type", + "version": "4.2.0", + "code": "process", + "display": "Process" + } + ] + } + ], + "improvementNotation": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/measure-improvement-notation", + "version": "0.1.0", + "code": "increase", + "display": "Increased score indicates improvement" + } + ] + }, + "group": [ + { + "id": "group-1", + "code": { + "coding": [ + { + "display": "group-1" + } + ] + }, + "population": [ + { + "id": "initial-population-1", + "code": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/measure-population", + "code": "initial-population", + "display": "Initial Population" + } + ] + }, + "criteria": { + "language": "text/cql-identifier", + "expression": "Initial Population" + } + }, + { + "id": "numerator", + "code": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/measure-population", + "code": "numerator", + "display": "Numerator" + } + ] + }, + "criteria": { + "language": "text/cql-identifier", + "expression": "Numerator" + } + }, + { + "id": "denominator", + "code": { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/measure-population", + "code": "denominator", + "display": "Denominator" + } + ] + }, + "criteria": { + "language": "text/cql-identifier", + "expression": "Initial Population" + } + } + ] + } + ] + }, + "request": { + "method": "PUT", + "url": "Measure/ImmunizationStatusRoutine" + } + } + ] +} diff --git a/pom.xml b/pom.xml index 15587093a10..228c3a27979 100644 --- a/pom.xml +++ b/pom.xml @@ -987,7 +987,7 @@ 1.28.4 - 3.0.0-PRE4 + 3.0.0-PRE5 5.4.1