Fixed issue with DT08 cql for the scheduled due date and updated maps…

….http to use the output directory instead of fsh-generated for the questionnaire example.
WorldHealthOrganization · Sep 29, 2023 · 108e10d · 108e10d
1 parent d4639b7
commit 108e10d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/input/cql/IMMZDT08.cql b/input/cql/IMMZDT08.cql
@@ -37,7 +37,7 @@ define "Provision of the MCV dose":
 	and IMMZCom."Current Patient Age In Years" < 15
 
 define "Schedule Due Date for MCV dose":
-	if "Expected Due Date for MCV dose" > IMMZCom."Date of Latest Live Attenuated Vaccine" + 4 weeks
+	if IMMZCom."Date of Latest Live Attenuated Vaccine" is null or "Expected Due Date for MCV dose" > IMMZCom."Date of Latest Live Attenuated Vaccine" + 4 weeks
 	then "Expected Due Date for MCV dose"
 	else IMMZCom."Date of Latest Live Attenuated Vaccine" + 4 weeks
 

diff --git a/tools/maps.http b/tools/maps.http
@@ -60,4 +60,4 @@ POST {{host}}/StructureMap/$transform?source=http://fhir.org/guides/who/smart-im
 Accept: application/fhir+json;fhirVersion=4.0
 Content-Type: application/fhir+json;fhirVersion=4.0
 
-< ../fsh-generated/resources/QuestionnaireResponse-Example.IMMZ.C.QuestionnaireResponse.1.json
+< ../output/QuestionnaireResponse-Example.IMMZ.C.QuestionnaireResponse.1.json