Skip to content
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

Jump to bottom

#557: Fixed ToQuantity using "unit" rather than "code" element in FHI… #562

Merged
merged 1 commit into from
Sep 10, 2020
Merged

#557: Fixed ToQuantity using "unit" rather than "code" element in FHI… #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-1.0.2.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToInterval(range FHIR.Range):
if range is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-1.6.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToInterval(range FHIR.Range):
if range is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-1.8.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToInterval(range FHIR.Range):
if range is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-3.0.0.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToInterval(range FHIR.Range):
if range is null then
Expand Down
77 changes: 52 additions & 25 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-3.0.1.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToInterval(range FHIR.Range):
if range is null then
Expand All @@ -21,40 +24,64 @@ define function ToQuantity(quantity FHIR.Quantity):
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }

define function ToQuantity(quantity FHIR.Age):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToQuantity(quantity FHIR.Count):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToQuantity(quantity FHIR.Distance):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToQuantity(quantity FHIR.Duration):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToQuantity(quantity FHIR.Money):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToQuantity(quantity FHIR.SimpleQuantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToCode(coding FHIR.Coding):
if coding is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-3.2.0.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToInterval(range FHIR.Range):
if range is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-4.0.0.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToInterval(range FHIR.Range):
if range is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/FHIRHelpers-4.0.1.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToRatio(ratio FHIR.Ratio):
if ratio is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/QICoreHelpers-4.0.0.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToRatio(ratio FHIR.Ratio):
if ratio is null then
Expand Down
17 changes: 12 additions & 5 deletions Src/java/quick/src/main/resources/org/hl7/fhir/USCoreHelpers-3.1.0.cql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ define function ToInterval(period FHIR.Period):
if period is null then
null
else
Interval[period."start".value, period."end".value]
if period."start" is null then
Interval(period."start".value, period."end".value]
else
Interval[period."start".value, period."end".value]

define function ToQuantity(quantity FHIR.Quantity):
if quantity is null then
null
else
System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
case
when quantity is null then null
when quantity.value is null then null
when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org' then
System.Quantity { value: quantity.value.value, unit: quantity.code.value }
else
Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.code.value)
end

define function ToRatio(ratio FHIR.Ratio):
if ratio is null then
Expand Down