diff --git a/examples/browser/cql4browsers.js b/examples/browser/cql4browsers.js index 3793edcb8..712da90a2 100644 --- a/examples/browser/cql4browsers.js +++ b/examples/browser/cql4browsers.js @@ -8755,6 +8755,7 @@ function deepCompareKeysAndValues(a, b, comparisonFunction) { const comparisonResult = comparisonFunction(a[key], b[key]); if (comparisonResult === null) { shouldReturnNull = true; + return true; } return comparisonResult; }); @@ -8762,7 +8763,7 @@ function deepCompareKeysAndValues(a, b, comparisonFunction) { else { finalComparisonResult = false; } - if (shouldReturnNull) { + if (finalComparisonResult && shouldReturnNull) { return null; } return finalComparisonResult; diff --git a/src/util/comparison.ts b/src/util/comparison.ts index 34bd08baa..1d0b5f179 100644 --- a/src/util/comparison.ts +++ b/src/util/comparison.ts @@ -165,6 +165,7 @@ function deepCompareKeysAndValues(a: any, b: any, comparisonFunction: any) { const comparisonResult = comparisonFunction(a[key], b[key]); if (comparisonResult === null) { shouldReturnNull = true; + return true; } return comparisonResult; }); @@ -172,7 +173,7 @@ function deepCompareKeysAndValues(a: any, b: any, comparisonFunction: any) { finalComparisonResult = false; } - if (shouldReturnNull) { + if (finalComparisonResult && shouldReturnNull) { return null; } return finalComparisonResult; diff --git a/test/elm/comparison/comparison-test.ts b/test/elm/comparison/comparison-test.ts index 9548b2fa0..11854de6a 100644 --- a/test/elm/comparison/comparison-test.ts +++ b/test/elm/comparison/comparison-test.ts @@ -36,6 +36,12 @@ describe('Equal', () => { it('should identify uncertian tuples with same fields but one has a null field', async function () { should(await this.uncertTuplesWithNullFieldOnOne.exec(this.ctx)).be.null(); + should(await this.uncertTuplesWithNullFieldOnFirstOne.exec(this.ctx)).be.null(); + }); + + it('should identify unequal tuples with different values but one has a null field', async function () { + should(await this.uneqTuplesWithNullFieldOnOne.exec(this.ctx)).be.false(); + should(await this.uneqTuplesWithNullFieldOnFirstOne.exec(this.ctx)).be.false(); }); it('should identify equal/unequal DateTimes in same timezone', async function () { diff --git a/test/elm/comparison/data.cql b/test/elm/comparison/data.cql index 8dab8c424..20201d905 100644 --- a/test/elm/comparison/data.cql +++ b/test/elm/comparison/data.cql @@ -7,6 +7,9 @@ define UneqTuples: Tuple{a: 1, b: Tuple{c: 1}} = Tuple{a: 1, b: Tuple{c: -1}} define EqTuplesWithNullFields: Tuple{a: 'Hello', b: null} = Tuple{a: 'Hello', b: null} define UneqTuplesWithNullFields: Tuple{a: 'Hello', b: null} = Tuple{a: 'Goodbye', b: null} define UncertTuplesWithNullFieldOnOne: Tuple{a: 'Hello', b: null} = Tuple{a: 'Hello', b: 'null'} +define UncertTuplesWithNullFieldOnFirstOne: Tuple{a: null, b: 'Goodbye'} = Tuple{a: 'Hello', b: 'Goodbye'} +define UneqTuplesWithNullFieldOnOne: Tuple{a: 'Hello', b: null} = Tuple{a: 'Goodbye', b: 'null'} +define UneqTuplesWithNullFieldOnFirstOne: Tuple{a: null, b: 'Hello'} = Tuple{a: 'null', b: 'Goodbye'} define EqDateTimes: DateTime(2000, 3, 15, 13, 30, 25, 200, +1.0) = DateTime(2000, 3, 15, 13, 30, 25, 200, +1.0) define UneqDateTimes: DateTime(2000, 3, 15, 13, 30, 25, 200, +1.0) = DateTime(2000, 3, 15, 13, 30, 25, 201, +1.0) define EqDateTimesTZ: DateTime(2000, 3, 15, 23, 30, 25, 200, +1.0) = DateTime(2000, 3, 16, 2, 30, 25, 200, +4.0) diff --git a/test/elm/comparison/data.js b/test/elm/comparison/data.js index 30ca75b24..2223dbc29 100644 --- a/test/elm/comparison/data.js +++ b/test/elm/comparison/data.js @@ -20,6 +20,9 @@ define UneqTuples: Tuple{a: 1, b: Tuple{c: 1}} = Tuple{a: 1, b: Tuple{c: -1}} define EqTuplesWithNullFields: Tuple{a: 'Hello', b: null} = Tuple{a: 'Hello', b: null} define UneqTuplesWithNullFields: Tuple{a: 'Hello', b: null} = Tuple{a: 'Goodbye', b: null} define UncertTuplesWithNullFieldOnOne: Tuple{a: 'Hello', b: null} = Tuple{a: 'Hello', b: 'null'} +define UncertTuplesWithNullFieldOnFirstOne: Tuple{a: null, b: 'Goodbye'} = Tuple{a: 'Hello', b: 'Goodbye'} +define UneqTuplesWithNullFieldOnOne: Tuple{a: 'Hello', b: null} = Tuple{a: 'Goodbye', b: 'null'} +define UneqTuplesWithNullFieldOnFirstOne: Tuple{a: null, b: 'Hello'} = Tuple{a: 'null', b: 'Goodbye'} define EqDateTimes: DateTime(2000, 3, 15, 13, 30, 25, 200, +1.0) = DateTime(2000, 3, 15, 13, 30, 25, 200, +1.0) define UneqDateTimes: DateTime(2000, 3, 15, 13, 30, 25, 200, +1.0) = DateTime(2000, 3, 15, 13, 30, 25, 201, +1.0) define EqDateTimesTZ: DateTime(2000, 3, 15, 23, 30, 25, 200, +1.0) = DateTime(2000, 3, 16, 2, 30, 25, 200, +4.0) @@ -62,7 +65,7 @@ module.exports['Equal'] = { }, { "type" : "Annotation", "s" : { - "r" : "1215", + "r" : "1302", "s" : [ { "value" : [ "","library TestSnippet version '1'" ] } ] @@ -1451,26 +1454,629 @@ module.exports['Equal'] = { }, { "localId" : "412", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", + "name" : "UncertTuplesWithNullFieldOnFirstOne", + "context" : "Patient", + "accessLevel" : "Public", + "annotation" : [ { + "type" : "Annotation", + "s" : { + "r" : "412", + "s" : [ { + "value" : [ "","define ","UncertTuplesWithNullFieldOnFirstOne",": " ] + }, { + "r" : "413", + "s" : [ { + "r" : "414", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "r" : "415", + "value" : [ "a",": ","null" ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "416", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + }, { + "value" : [ " ","="," " ] + }, { + "r" : "422", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "423", + "s" : [ { + "value" : [ "'Hello'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "424", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + } ] + } ] + } + } ], + "expression" : { + "localId" : "413", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", + "type" : "Equal", + "signature" : [ { + "localId" : "430", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "431", + "name" : "a", + "elementType" : { + "localId" : "432", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "433", + "name" : "b", + "elementType" : { + "localId" : "434", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, { + "localId" : "435", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "436", + "name" : "a", + "elementType" : { + "localId" : "437", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "438", + "name" : "b", + "elementType" : { + "localId" : "439", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + } ], + "operand" : [ { + "localId" : "414", + "type" : "Tuple", + "resultTypeSpecifier" : { + "localId" : "417", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "418", + "name" : "a", + "elementType" : { + "localId" : "419", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "420", + "name" : "b", + "elementType" : { + "localId" : "421", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, + "element" : [ { + "name" : "a", + "value" : { + "localId" : "415", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "Null" + } + }, { + "name" : "b", + "value" : { + "localId" : "416", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + } ] + }, { + "localId" : "422", + "type" : "Tuple", + "resultTypeSpecifier" : { + "localId" : "425", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "426", + "name" : "a", + "elementType" : { + "localId" : "427", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "428", + "name" : "b", + "elementType" : { + "localId" : "429", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, + "element" : [ { + "name" : "a", + "value" : { + "localId" : "423", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Hello", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "424", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + } ] + } ] + } + }, { + "localId" : "441", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", + "name" : "UneqTuplesWithNullFieldOnOne", + "context" : "Patient", + "accessLevel" : "Public", + "annotation" : [ { + "type" : "Annotation", + "s" : { + "r" : "441", + "s" : [ { + "value" : [ "","define ","UneqTuplesWithNullFieldOnOne",": " ] + }, { + "r" : "442", + "s" : [ { + "r" : "443", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "444", + "s" : [ { + "value" : [ "'Hello'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "r" : "445", + "value" : [ "b",": ","null" ] + } ] + }, { + "value" : [ "}" ] + } ] + }, { + "value" : [ " ","="," " ] + }, { + "r" : "451", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "452", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "453", + "s" : [ { + "value" : [ "'null'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + } ] + } ] + } + } ], + "expression" : { + "localId" : "442", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", + "type" : "Equal", + "signature" : [ { + "localId" : "459", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "460", + "name" : "a", + "elementType" : { + "localId" : "461", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "462", + "name" : "b", + "elementType" : { + "localId" : "463", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + } ] + }, { + "localId" : "464", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "465", + "name" : "a", + "elementType" : { + "localId" : "466", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "467", + "name" : "b", + "elementType" : { + "localId" : "468", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + } ] + } ], + "operand" : [ { + "localId" : "443", + "type" : "Tuple", + "resultTypeSpecifier" : { + "localId" : "446", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "447", + "name" : "a", + "elementType" : { + "localId" : "448", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "449", + "name" : "b", + "elementType" : { + "localId" : "450", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + } ] + }, + "element" : [ { + "name" : "a", + "value" : { + "localId" : "444", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Hello", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "445", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "Null" + } + } ] + }, { + "localId" : "451", + "type" : "Tuple", + "resultTypeSpecifier" : { + "localId" : "454", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "455", + "name" : "a", + "elementType" : { + "localId" : "456", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "457", + "name" : "b", + "elementType" : { + "localId" : "458", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, + "element" : [ { + "name" : "a", + "value" : { + "localId" : "452", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "453", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "null", + "type" : "Literal" + } + } ] + } ] + } + }, { + "localId" : "470", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", + "name" : "UneqTuplesWithNullFieldOnFirstOne", + "context" : "Patient", + "accessLevel" : "Public", + "annotation" : [ { + "type" : "Annotation", + "s" : { + "r" : "470", + "s" : [ { + "value" : [ "","define ","UneqTuplesWithNullFieldOnFirstOne",": " ] + }, { + "r" : "471", + "s" : [ { + "r" : "472", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "r" : "473", + "value" : [ "a",": ","null" ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "474", + "s" : [ { + "value" : [ "'Hello'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + }, { + "value" : [ " ","="," " ] + }, { + "r" : "480", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "481", + "s" : [ { + "value" : [ "'null'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "482", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + } ] + } ] + } + } ], + "expression" : { + "localId" : "471", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", + "type" : "Equal", + "signature" : [ { + "localId" : "488", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "489", + "name" : "a", + "elementType" : { + "localId" : "490", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "491", + "name" : "b", + "elementType" : { + "localId" : "492", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, { + "localId" : "493", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "494", + "name" : "a", + "elementType" : { + "localId" : "495", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "496", + "name" : "b", + "elementType" : { + "localId" : "497", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + } ], + "operand" : [ { + "localId" : "472", + "type" : "Tuple", + "resultTypeSpecifier" : { + "localId" : "475", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "476", + "name" : "a", + "elementType" : { + "localId" : "477", + "name" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "478", + "name" : "b", + "elementType" : { + "localId" : "479", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, + "element" : [ { + "name" : "a", + "value" : { + "localId" : "473", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any", + "type" : "Null" + } + }, { + "name" : "b", + "value" : { + "localId" : "474", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Hello", + "type" : "Literal" + } + } ] + }, { + "localId" : "480", + "type" : "Tuple", + "resultTypeSpecifier" : { + "localId" : "483", + "type" : "TupleTypeSpecifier", + "element" : [ { + "localId" : "484", + "name" : "a", + "elementType" : { + "localId" : "485", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + }, { + "localId" : "486", + "name" : "b", + "elementType" : { + "localId" : "487", + "name" : "{urn:hl7-org:elm-types:r1}String", + "type" : "NamedTypeSpecifier" + } + } ] + }, + "element" : [ { + "name" : "a", + "value" : { + "localId" : "481", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "null", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "482", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}String", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + } ] + } ] + } + }, { + "localId" : "499", + "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "EqDateTimes", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "412", + "r" : "499", "s" : [ { "value" : [ "","define ","EqDateTimes",": " ] }, { - "r" : "413", + "r" : "500", "s" : [ { - "r" : "432", + "r" : "519", "s" : [ { - "r" : "414", + "r" : "501", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "421", + "r" : "508", "s" : [ { - "r" : "421", + "r" : "508", "value" : [ "+","1.0" ] } ] }, { @@ -1479,14 +2085,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "459", + "r" : "546", "s" : [ { - "r" : "441", + "r" : "528", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "448", + "r" : "535", "s" : [ { - "r" : "448", + "r" : "535", "value" : [ "+","1.0" ] } ] }, { @@ -1497,199 +2103,199 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "413", + "localId" : "500", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "468", + "localId" : "555", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "469", + "localId" : "556", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "432", + "localId" : "519", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "433", + "localId" : "520", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "434", + "localId" : "521", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "435", + "localId" : "522", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "436", + "localId" : "523", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "437", + "localId" : "524", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "438", + "localId" : "525", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "439", + "localId" : "526", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "440", + "localId" : "527", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "414", + "localId" : "501", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "415", + "localId" : "502", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "416", + "localId" : "503", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "417", + "localId" : "504", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "418", + "localId" : "505", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "419", + "localId" : "506", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "420", + "localId" : "507", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "421", + "localId" : "508", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "459", + "localId" : "546", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "460", + "localId" : "547", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "461", + "localId" : "548", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "462", + "localId" : "549", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "463", + "localId" : "550", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "464", + "localId" : "551", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "465", + "localId" : "552", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "466", + "localId" : "553", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "467", + "localId" : "554", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "441", + "localId" : "528", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "442", + "localId" : "529", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "443", + "localId" : "530", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "444", + "localId" : "531", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "445", + "localId" : "532", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "446", + "localId" : "533", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "447", + "localId" : "534", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "448", + "localId" : "535", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", @@ -1698,7 +2304,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "471", + "localId" : "558", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "UneqDateTimes", "context" : "Patient", @@ -1706,20 +2312,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "471", + "r" : "558", "s" : [ { "value" : [ "","define ","UneqDateTimes",": " ] }, { - "r" : "472", + "r" : "559", "s" : [ { - "r" : "491", + "r" : "578", "s" : [ { - "r" : "473", + "r" : "560", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "480", + "r" : "567", "s" : [ { - "r" : "480", + "r" : "567", "value" : [ "+","1.0" ] } ] }, { @@ -1728,14 +2334,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "518", + "r" : "605", "s" : [ { - "r" : "500", + "r" : "587", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","201",", " ] }, { - "r" : "507", + "r" : "594", "s" : [ { - "r" : "507", + "r" : "594", "value" : [ "+","1.0" ] } ] }, { @@ -1746,199 +2352,199 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "472", + "localId" : "559", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "527", + "localId" : "614", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "528", + "localId" : "615", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "491", + "localId" : "578", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "492", + "localId" : "579", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "493", + "localId" : "580", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "494", + "localId" : "581", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "495", + "localId" : "582", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "496", + "localId" : "583", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "497", + "localId" : "584", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "498", + "localId" : "585", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "499", + "localId" : "586", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "473", + "localId" : "560", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "474", + "localId" : "561", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "475", + "localId" : "562", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "476", + "localId" : "563", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "477", + "localId" : "564", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "478", + "localId" : "565", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "479", + "localId" : "566", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "480", + "localId" : "567", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "518", + "localId" : "605", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "519", + "localId" : "606", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "520", + "localId" : "607", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "521", + "localId" : "608", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "522", + "localId" : "609", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "523", + "localId" : "610", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "524", + "localId" : "611", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "525", + "localId" : "612", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "526", + "localId" : "613", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "500", + "localId" : "587", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "501", + "localId" : "588", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "502", + "localId" : "589", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "503", + "localId" : "590", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "504", + "localId" : "591", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "505", + "localId" : "592", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "506", + "localId" : "593", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "201", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "507", + "localId" : "594", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", @@ -1947,7 +2553,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "530", + "localId" : "617", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "EqDateTimesTZ", "context" : "Patient", @@ -1955,20 +2561,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "530", + "r" : "617", "s" : [ { "value" : [ "","define ","EqDateTimesTZ",": " ] }, { - "r" : "531", + "r" : "618", "s" : [ { - "r" : "550", + "r" : "637", "s" : [ { - "r" : "532", + "r" : "619", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","23",", ","30",", ","25",", ","200",", " ] }, { - "r" : "539", + "r" : "626", "s" : [ { - "r" : "539", + "r" : "626", "value" : [ "+","1.0" ] } ] }, { @@ -1977,14 +2583,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "577", + "r" : "664", "s" : [ { - "r" : "559", + "r" : "646", "value" : [ "DateTime","(","2000",", ","3",", ","16",", ","2",", ","30",", ","25",", ","200",", " ] }, { - "r" : "566", + "r" : "653", "s" : [ { - "r" : "566", + "r" : "653", "value" : [ "+","4.0" ] } ] }, { @@ -1995,199 +2601,199 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "531", + "localId" : "618", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "586", + "localId" : "673", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "587", + "localId" : "674", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "550", + "localId" : "637", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "551", + "localId" : "638", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "552", + "localId" : "639", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "553", + "localId" : "640", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "554", + "localId" : "641", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "555", + "localId" : "642", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "556", + "localId" : "643", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "557", + "localId" : "644", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "558", + "localId" : "645", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "532", + "localId" : "619", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "533", + "localId" : "620", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "534", + "localId" : "621", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "535", + "localId" : "622", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "23", "type" : "Literal" }, "minute" : { - "localId" : "536", + "localId" : "623", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "537", + "localId" : "624", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "538", + "localId" : "625", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "539", + "localId" : "626", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "577", + "localId" : "664", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "578", + "localId" : "665", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "579", + "localId" : "666", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "580", + "localId" : "667", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "581", + "localId" : "668", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "582", + "localId" : "669", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "583", + "localId" : "670", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "584", + "localId" : "671", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "585", + "localId" : "672", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "559", + "localId" : "646", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "560", + "localId" : "647", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "561", + "localId" : "648", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "16", "type" : "Literal" }, "hour" : { - "localId" : "562", + "localId" : "649", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2", "type" : "Literal" }, "minute" : { - "localId" : "563", + "localId" : "650", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "564", + "localId" : "651", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "565", + "localId" : "652", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "566", + "localId" : "653", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "4.0", @@ -2196,7 +2802,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "589", + "localId" : "676", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "UneqDateTimesTZ", "context" : "Patient", @@ -2204,20 +2810,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "589", + "r" : "676", "s" : [ { "value" : [ "","define ","UneqDateTimesTZ",": " ] }, { - "r" : "590", + "r" : "677", "s" : [ { - "r" : "609", + "r" : "696", "s" : [ { - "r" : "591", + "r" : "678", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "598", + "r" : "685", "s" : [ { - "r" : "598", + "r" : "685", "value" : [ "+","1.0" ] } ] }, { @@ -2226,14 +2832,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "636", + "r" : "723", "s" : [ { - "r" : "618", + "r" : "705", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "625", + "r" : "712", "s" : [ { - "r" : "625", + "r" : "712", "value" : [ "+","2.0" ] } ] }, { @@ -2244,199 +2850,199 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "590", + "localId" : "677", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "645", + "localId" : "732", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "646", + "localId" : "733", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "609", + "localId" : "696", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "610", + "localId" : "697", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "611", + "localId" : "698", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "612", + "localId" : "699", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "613", + "localId" : "700", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "614", + "localId" : "701", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "615", + "localId" : "702", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "616", + "localId" : "703", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "617", + "localId" : "704", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "591", + "localId" : "678", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "592", + "localId" : "679", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "593", + "localId" : "680", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "594", + "localId" : "681", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "595", + "localId" : "682", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "596", + "localId" : "683", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "597", + "localId" : "684", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "598", + "localId" : "685", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "636", + "localId" : "723", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "637", + "localId" : "724", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "638", + "localId" : "725", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "639", + "localId" : "726", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "640", + "localId" : "727", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "641", + "localId" : "728", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "642", + "localId" : "729", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "643", + "localId" : "730", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "644", + "localId" : "731", "name" : "{urn:hl7-org:elm-types:r1}Decimal", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "618", + "localId" : "705", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "619", + "localId" : "706", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "620", + "localId" : "707", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "621", + "localId" : "708", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "622", + "localId" : "709", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "623", + "localId" : "710", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "624", + "localId" : "711", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "625", + "localId" : "712", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "2.0", @@ -2445,7 +3051,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "648", + "localId" : "735", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "EqDateTimesNullMs", "context" : "Patient", @@ -2453,23 +3059,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "648", + "r" : "735", "s" : [ { "value" : [ "","define ","EqDateTimesNullMs",": " ] }, { - "r" : "649", + "r" : "736", "s" : [ { - "r" : "666", + "r" : "753", "s" : [ { - "r" : "650", + "r" : "737", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","0",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "688", + "r" : "775", "s" : [ { - "r" : "674", + "r" : "761", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",")" ] } ] } ] @@ -2477,166 +3083,166 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "649", + "localId" : "736", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "695", + "localId" : "782", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "696", + "localId" : "783", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "666", + "localId" : "753", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "667", + "localId" : "754", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "668", + "localId" : "755", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "669", + "localId" : "756", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "670", + "localId" : "757", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "671", + "localId" : "758", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "672", + "localId" : "759", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "673", + "localId" : "760", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "650", + "localId" : "737", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "651", + "localId" : "738", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "652", + "localId" : "739", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "653", + "localId" : "740", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "654", + "localId" : "741", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "655", + "localId" : "742", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "656", + "localId" : "743", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "0", "type" : "Literal" } }, { - "localId" : "688", + "localId" : "775", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "689", + "localId" : "776", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "690", + "localId" : "777", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "691", + "localId" : "778", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "692", + "localId" : "779", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "693", + "localId" : "780", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "694", + "localId" : "781", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "674", + "localId" : "761", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "675", + "localId" : "762", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "676", + "localId" : "763", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "677", + "localId" : "764", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "678", + "localId" : "765", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "679", + "localId" : "766", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", @@ -2645,7 +3251,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "698", + "localId" : "785", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "EqDateTimesNullOtherMs", "context" : "Patient", @@ -2653,23 +3259,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "698", + "r" : "785", "s" : [ { "value" : [ "","define ","EqDateTimesNullOtherMs",": " ] }, { - "r" : "699", + "r" : "786", "s" : [ { - "r" : "714", + "r" : "801", "s" : [ { - "r" : "700", + "r" : "787", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "737", + "r" : "824", "s" : [ { - "r" : "721", + "r" : "808", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","0",")" ] } ] } ] @@ -2677,166 +3283,166 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "699", + "localId" : "786", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "745", + "localId" : "832", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "746", + "localId" : "833", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "714", + "localId" : "801", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "715", + "localId" : "802", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "716", + "localId" : "803", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "717", + "localId" : "804", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "718", + "localId" : "805", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "719", + "localId" : "806", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "720", + "localId" : "807", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "700", + "localId" : "787", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "701", + "localId" : "788", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "702", + "localId" : "789", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "703", + "localId" : "790", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "704", + "localId" : "791", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "705", + "localId" : "792", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" } }, { - "localId" : "737", + "localId" : "824", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "738", + "localId" : "825", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "739", + "localId" : "826", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "740", + "localId" : "827", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "741", + "localId" : "828", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "742", + "localId" : "829", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "743", + "localId" : "830", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "744", + "localId" : "831", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "721", + "localId" : "808", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "722", + "localId" : "809", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "723", + "localId" : "810", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "724", + "localId" : "811", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "725", + "localId" : "812", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "726", + "localId" : "813", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "727", + "localId" : "814", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "0", @@ -2845,7 +3451,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "748", + "localId" : "835", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "EqDateTimesOnlyDate", "context" : "Patient", @@ -2853,23 +3459,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "748", + "r" : "835", "s" : [ { "value" : [ "","define ","EqDateTimesOnlyDate",": " ] }, { - "r" : "749", + "r" : "836", "s" : [ { - "r" : "758", + "r" : "845", "s" : [ { - "r" : "750", + "r" : "837", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "770", + "r" : "857", "s" : [ { - "r" : "762", + "r" : "849", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] } ] @@ -2877,89 +3483,89 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "749", + "localId" : "836", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "774", + "localId" : "861", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "775", + "localId" : "862", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "758", + "localId" : "845", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "759", + "localId" : "846", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "760", + "localId" : "847", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "761", + "localId" : "848", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "750", + "localId" : "837", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "751", + "localId" : "838", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "752", + "localId" : "839", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" } }, { - "localId" : "770", + "localId" : "857", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "771", + "localId" : "858", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "772", + "localId" : "859", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "773", + "localId" : "860", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "762", + "localId" : "849", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "763", + "localId" : "850", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "764", + "localId" : "851", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", @@ -2968,7 +3574,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "777", + "localId" : "864", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "UneqDateTimesOnlyDate", "context" : "Patient", @@ -2976,23 +3582,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "777", + "r" : "864", "s" : [ { "value" : [ "","define ","UneqDateTimesOnlyDate",": " ] }, { - "r" : "778", + "r" : "865", "s" : [ { - "r" : "787", + "r" : "874", "s" : [ { - "r" : "779", + "r" : "866", "value" : [ "DateTime","(","2000",", ","3",", ","14",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "799", + "r" : "886", "s" : [ { - "r" : "791", + "r" : "878", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] } ] @@ -3000,89 +3606,89 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "778", + "localId" : "865", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "803", + "localId" : "890", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "804", + "localId" : "891", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "787", + "localId" : "874", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "788", + "localId" : "875", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "789", + "localId" : "876", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "790", + "localId" : "877", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "779", + "localId" : "866", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "780", + "localId" : "867", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "781", + "localId" : "868", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "14", "type" : "Literal" } }, { - "localId" : "799", + "localId" : "886", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "800", + "localId" : "887", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "801", + "localId" : "888", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "802", + "localId" : "889", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "791", + "localId" : "878", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "792", + "localId" : "879", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "793", + "localId" : "880", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", @@ -3091,7 +3697,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "806", + "localId" : "893", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "PossiblyEqDateTimesOnlyDateOnOne", "context" : "Patient", @@ -3099,23 +3705,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "806", + "r" : "893", "s" : [ { "value" : [ "","define ","PossiblyEqDateTimesOnlyDateOnOne",": " ] }, { - "r" : "807", + "r" : "894", "s" : [ { - "r" : "816", + "r" : "903", "s" : [ { - "r" : "808", + "r" : "895", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "834", + "r" : "921", "s" : [ { - "r" : "820", + "r" : "907", "value" : [ "DateTime","(","2000",", ","3",", ","13",", ","13",", ","43",", ","32",")" ] } ] } ] @@ -3123,122 +3729,122 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "807", + "localId" : "894", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "841", + "localId" : "928", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "842", + "localId" : "929", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "816", + "localId" : "903", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "817", + "localId" : "904", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "818", + "localId" : "905", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "819", + "localId" : "906", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "808", + "localId" : "895", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "809", + "localId" : "896", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "810", + "localId" : "897", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } }, { - "localId" : "834", + "localId" : "921", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "835", + "localId" : "922", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "836", + "localId" : "923", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "837", + "localId" : "924", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "838", + "localId" : "925", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "839", + "localId" : "926", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "840", + "localId" : "927", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "820", + "localId" : "907", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "821", + "localId" : "908", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "822", + "localId" : "909", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "823", + "localId" : "910", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "824", + "localId" : "911", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "43", "type" : "Literal" }, "second" : { - "localId" : "825", + "localId" : "912", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "32", @@ -3247,7 +3853,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "844", + "localId" : "931", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "UneqDateTimesOnlyDateOnOne", "context" : "Patient", @@ -3255,23 +3861,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "844", + "r" : "931", "s" : [ { "value" : [ "","define ","UneqDateTimesOnlyDateOnOne",": " ] }, { - "r" : "845", + "r" : "932", "s" : [ { - "r" : "860", + "r" : "947", "s" : [ { - "r" : "846", + "r" : "933", "value" : [ "DateTime","(","2000",", ","4",", ","13",", ","12",", ","43",", ","32",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "875", + "r" : "962", "s" : [ { - "r" : "867", + "r" : "954", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -3279,122 +3885,122 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "845", + "localId" : "932", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "879", + "localId" : "966", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "880", + "localId" : "967", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "860", + "localId" : "947", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "861", + "localId" : "948", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "862", + "localId" : "949", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "863", + "localId" : "950", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "864", + "localId" : "951", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "865", + "localId" : "952", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "866", + "localId" : "953", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "846", + "localId" : "933", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "847", + "localId" : "934", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" }, "day" : { - "localId" : "848", + "localId" : "935", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "849", + "localId" : "936", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "12", "type" : "Literal" }, "minute" : { - "localId" : "850", + "localId" : "937", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "43", "type" : "Literal" }, "second" : { - "localId" : "851", + "localId" : "938", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "32", "type" : "Literal" } }, { - "localId" : "875", + "localId" : "962", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "876", + "localId" : "963", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "877", + "localId" : "964", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "878", + "localId" : "965", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "867", + "localId" : "954", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "868", + "localId" : "955", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "869", + "localId" : "956", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -3403,7 +4009,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "882", + "localId" : "969", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "PossiblyEqualDateTimes", "context" : "Patient", @@ -3411,23 +4017,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "882", + "r" : "969", "s" : [ { "value" : [ "","define ","PossiblyEqualDateTimes",": " ] }, { - "r" : "883", + "r" : "970", "s" : [ { - "r" : "892", + "r" : "979", "s" : [ { - "r" : "884", + "r" : "971", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "900", + "r" : "987", "s" : [ { - "r" : "896", + "r" : "983", "value" : [ "DateTime","(","2000",")" ] } ] } ] @@ -3435,67 +4041,67 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "883", + "localId" : "970", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "902", + "localId" : "989", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "903", + "localId" : "990", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "892", + "localId" : "979", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "893", + "localId" : "980", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "894", + "localId" : "981", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "895", + "localId" : "982", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "884", + "localId" : "971", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "885", + "localId" : "972", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "886", + "localId" : "973", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" } }, { - "localId" : "900", + "localId" : "987", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "901", + "localId" : "988", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "896", + "localId" : "983", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", @@ -3504,7 +4110,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "905", + "localId" : "992", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "ImpossiblyEqualDateTimes", "context" : "Patient", @@ -3512,23 +4118,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "905", + "r" : "992", "s" : [ { "value" : [ "","define ","ImpossiblyEqualDateTimes",": " ] }, { - "r" : "906", + "r" : "993", "s" : [ { - "r" : "915", + "r" : "1002", "s" : [ { - "r" : "907", + "r" : "994", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "925", + "r" : "1012", "s" : [ { - "r" : "919", + "r" : "1006", "value" : [ "DateTime","(","2000",", ","4",")" ] } ] } ] @@ -3536,78 +4142,78 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "906", + "localId" : "993", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "928", + "localId" : "1015", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "929", + "localId" : "1016", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "915", + "localId" : "1002", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "916", + "localId" : "1003", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "917", + "localId" : "1004", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "918", + "localId" : "1005", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "907", + "localId" : "994", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "908", + "localId" : "995", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "909", + "localId" : "996", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" } }, { - "localId" : "925", + "localId" : "1012", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "926", + "localId" : "1013", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "927", + "localId" : "1014", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "919", + "localId" : "1006", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "920", + "localId" : "1007", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", @@ -3616,7 +4222,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "931", + "localId" : "1018", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "DateAndDateTimeTrue", "context" : "Patient", @@ -3624,23 +4230,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "931", + "r" : "1018", "s" : [ { "value" : [ "","define ","DateAndDateTimeTrue",": " ] }, { - "r" : "932", + "r" : "1019", "s" : [ { - "r" : "941", + "r" : "1028", "s" : [ { - "r" : "933", + "r" : "1020", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "953", + "r" : "1040", "s" : [ { - "r" : "945", + "r" : "1032", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -3648,59 +4254,59 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "932", + "localId" : "1019", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "960", + "localId" : "1047", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "961", + "localId" : "1048", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "958", + "localId" : "1045", "type" : "ToDateTime", "signature" : [ { - "localId" : "959", + "localId" : "1046", "name" : "{urn:hl7-org:elm-types:r1}Date", "type" : "NamedTypeSpecifier" } ], "operand" : { - "localId" : "941", + "localId" : "1028", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date", "type" : "Date", "signature" : [ { - "localId" : "942", + "localId" : "1029", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "943", + "localId" : "1030", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "944", + "localId" : "1031", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "933", + "localId" : "1020", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "934", + "localId" : "1021", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "935", + "localId" : "1022", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -3708,38 +4314,38 @@ module.exports['Equal'] = { } } }, { - "localId" : "953", + "localId" : "1040", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "954", + "localId" : "1041", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "955", + "localId" : "1042", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "956", + "localId" : "1043", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "945", + "localId" : "1032", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "946", + "localId" : "1033", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "947", + "localId" : "1034", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -3748,7 +4354,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "963", + "localId" : "1050", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "DateAndDateTimeNotEqual", "context" : "Patient", @@ -3756,23 +4362,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "963", + "r" : "1050", "s" : [ { "value" : [ "","define ","DateAndDateTimeNotEqual",": " ] }, { - "r" : "964", + "r" : "1051", "s" : [ { - "r" : "973", + "r" : "1060", "s" : [ { - "r" : "965", + "r" : "1052", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "985", + "r" : "1072", "s" : [ { - "r" : "977", + "r" : "1064", "value" : [ "DateTime","(","2000",", ","3",", ","12",")" ] } ] } ] @@ -3780,59 +4386,59 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "964", + "localId" : "1051", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "992", + "localId" : "1079", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "993", + "localId" : "1080", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "990", + "localId" : "1077", "type" : "ToDateTime", "signature" : [ { - "localId" : "991", + "localId" : "1078", "name" : "{urn:hl7-org:elm-types:r1}Date", "type" : "NamedTypeSpecifier" } ], "operand" : { - "localId" : "973", + "localId" : "1060", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date", "type" : "Date", "signature" : [ { - "localId" : "974", + "localId" : "1061", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "975", + "localId" : "1062", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "976", + "localId" : "1063", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "965", + "localId" : "1052", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "966", + "localId" : "1053", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "967", + "localId" : "1054", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -3840,38 +4446,38 @@ module.exports['Equal'] = { } } }, { - "localId" : "985", + "localId" : "1072", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "986", + "localId" : "1073", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "987", + "localId" : "1074", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "988", + "localId" : "1075", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "977", + "localId" : "1064", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "978", + "localId" : "1065", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "979", + "localId" : "1066", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "12", @@ -3880,7 +4486,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "995", + "localId" : "1082", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "DateAndDateTimeUncertainNull", "context" : "Patient", @@ -3888,23 +4494,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "995", + "r" : "1082", "s" : [ { "value" : [ "","define ","DateAndDateTimeUncertainNull",": " ] }, { - "r" : "996", + "r" : "1083", "s" : [ { - "r" : "1005", + "r" : "1092", "s" : [ { - "r" : "997", + "r" : "1084", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1023", + "r" : "1110", "s" : [ { - "r" : "1009", + "r" : "1096", "value" : [ "DateTime","(","2000",", ","3",", ","13",", ","2",", ","4",", ","23",")" ] } ] } ] @@ -3912,59 +4518,59 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "996", + "localId" : "1083", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1033", + "localId" : "1120", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "1034", + "localId" : "1121", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1031", + "localId" : "1118", "type" : "ToDateTime", "signature" : [ { - "localId" : "1032", + "localId" : "1119", "name" : "{urn:hl7-org:elm-types:r1}Date", "type" : "NamedTypeSpecifier" } ], "operand" : { - "localId" : "1005", + "localId" : "1092", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date", "type" : "Date", "signature" : [ { - "localId" : "1006", + "localId" : "1093", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1007", + "localId" : "1094", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1008", + "localId" : "1095", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "997", + "localId" : "1084", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "998", + "localId" : "1085", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "999", + "localId" : "1086", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -3972,71 +4578,71 @@ module.exports['Equal'] = { } } }, { - "localId" : "1023", + "localId" : "1110", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "1024", + "localId" : "1111", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1025", + "localId" : "1112", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1026", + "localId" : "1113", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1027", + "localId" : "1114", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1028", + "localId" : "1115", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1029", + "localId" : "1116", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1009", + "localId" : "1096", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1010", + "localId" : "1097", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1011", + "localId" : "1098", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "1012", + "localId" : "1099", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2", "type" : "Literal" }, "minute" : { - "localId" : "1013", + "localId" : "1100", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" }, "second" : { - "localId" : "1014", + "localId" : "1101", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "23", @@ -4045,7 +4651,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1036", + "localId" : "1123", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "DateTimeAndDateTrue", "context" : "Patient", @@ -4053,23 +4659,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1036", + "r" : "1123", "s" : [ { "value" : [ "","define ","DateTimeAndDateTrue",": " ] }, { - "r" : "1037", + "r" : "1124", "s" : [ { - "r" : "1046", + "r" : "1133", "s" : [ { - "r" : "1038", + "r" : "1125", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1058", + "r" : "1145", "s" : [ { - "r" : "1050", + "r" : "1137", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -4077,97 +4683,97 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1037", + "localId" : "1124", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1065", + "localId" : "1152", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "1066", + "localId" : "1153", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1046", + "localId" : "1133", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "1047", + "localId" : "1134", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1048", + "localId" : "1135", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1049", + "localId" : "1136", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1038", + "localId" : "1125", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1039", + "localId" : "1126", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1040", + "localId" : "1127", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } }, { - "localId" : "1063", + "localId" : "1150", "type" : "ToDateTime", "signature" : [ { - "localId" : "1064", + "localId" : "1151", "name" : "{urn:hl7-org:elm-types:r1}Date", "type" : "NamedTypeSpecifier" } ], "operand" : { - "localId" : "1058", + "localId" : "1145", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date", "type" : "Date", "signature" : [ { - "localId" : "1059", + "localId" : "1146", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1060", + "localId" : "1147", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1061", + "localId" : "1148", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1050", + "localId" : "1137", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1051", + "localId" : "1138", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1052", + "localId" : "1139", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -4177,7 +4783,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1068", + "localId" : "1155", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "DateTimeAndDateNotEqual", "context" : "Patient", @@ -4185,23 +4791,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1068", + "r" : "1155", "s" : [ { "value" : [ "","define ","DateTimeAndDateNotEqual",": " ] }, { - "r" : "1069", + "r" : "1156", "s" : [ { - "r" : "1078", + "r" : "1165", "s" : [ { - "r" : "1070", + "r" : "1157", "value" : [ "DateTime","(","2000",", ","3",", ","12",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1090", + "r" : "1177", "s" : [ { - "r" : "1082", + "r" : "1169", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -4209,97 +4815,97 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1069", + "localId" : "1156", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1097", + "localId" : "1184", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "1098", + "localId" : "1185", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1078", + "localId" : "1165", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "1079", + "localId" : "1166", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1080", + "localId" : "1167", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1081", + "localId" : "1168", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1070", + "localId" : "1157", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1071", + "localId" : "1158", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1072", + "localId" : "1159", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "12", "type" : "Literal" } }, { - "localId" : "1095", + "localId" : "1182", "type" : "ToDateTime", "signature" : [ { - "localId" : "1096", + "localId" : "1183", "name" : "{urn:hl7-org:elm-types:r1}Date", "type" : "NamedTypeSpecifier" } ], "operand" : { - "localId" : "1090", + "localId" : "1177", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date", "type" : "Date", "signature" : [ { - "localId" : "1091", + "localId" : "1178", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1092", + "localId" : "1179", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1093", + "localId" : "1180", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1082", + "localId" : "1169", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1083", + "localId" : "1170", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1084", + "localId" : "1171", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -4309,7 +4915,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1100", + "localId" : "1187", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "DateTimeAndDateUncertainNull", "context" : "Patient", @@ -4317,23 +4923,23 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1100", + "r" : "1187", "s" : [ { "value" : [ "","define ","DateTimeAndDateUncertainNull",": " ] }, { - "r" : "1101", + "r" : "1188", "s" : [ { - "r" : "1116", + "r" : "1203", "s" : [ { - "r" : "1102", + "r" : "1189", "value" : [ "DateTime","(","2000",", ","3",", ","13",", ","2",", ","4",", ","23",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1131", + "r" : "1218", "s" : [ { - "r" : "1123", + "r" : "1210", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -4341,130 +4947,130 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1101", + "localId" : "1188", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1138", + "localId" : "1225", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" }, { - "localId" : "1139", + "localId" : "1226", "name" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1116", + "localId" : "1203", "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime", "type" : "DateTime", "signature" : [ { - "localId" : "1117", + "localId" : "1204", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1118", + "localId" : "1205", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1119", + "localId" : "1206", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1120", + "localId" : "1207", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1121", + "localId" : "1208", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1122", + "localId" : "1209", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1102", + "localId" : "1189", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1103", + "localId" : "1190", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1104", + "localId" : "1191", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "1105", + "localId" : "1192", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2", "type" : "Literal" }, "minute" : { - "localId" : "1106", + "localId" : "1193", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" }, "second" : { - "localId" : "1107", + "localId" : "1194", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "23", "type" : "Literal" } }, { - "localId" : "1136", + "localId" : "1223", "type" : "ToDateTime", "signature" : [ { - "localId" : "1137", + "localId" : "1224", "name" : "{urn:hl7-org:elm-types:r1}Date", "type" : "NamedTypeSpecifier" } ], "operand" : { - "localId" : "1131", + "localId" : "1218", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date", "type" : "Date", "signature" : [ { - "localId" : "1132", + "localId" : "1219", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1133", + "localId" : "1220", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" }, { - "localId" : "1134", + "localId" : "1221", "name" : "{urn:hl7-org:elm-types:r1}Integer", "type" : "NamedTypeSpecifier" } ], "year" : { - "localId" : "1123", + "localId" : "1210", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "1124", + "localId" : "1211", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "1125", + "localId" : "1212", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", @@ -4474,7 +5080,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1141", + "localId" : "1228", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "AGtB_Quantity", "context" : "Patient", @@ -4482,20 +5088,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1141", + "r" : "1228", "s" : [ { "value" : [ "","define ","AGtB_Quantity",": " ] }, { - "r" : "1142", + "r" : "1229", "s" : [ { - "r" : "1143", + "r" : "1230", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1144", + "r" : "1231", "s" : [ { "value" : [ "4 ","'m'" ] } ] @@ -4504,26 +5110,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1142", + "localId" : "1229", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1145", + "localId" : "1232", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1146", + "localId" : "1233", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1143", + "localId" : "1230", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "1144", + "localId" : "1231", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 4, "unit" : "m", @@ -4531,7 +5137,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1148", + "localId" : "1235", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "AEqB_Quantity", "context" : "Patient", @@ -4539,20 +5145,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1148", + "r" : "1235", "s" : [ { "value" : [ "","define ","AEqB_Quantity",": " ] }, { - "r" : "1149", + "r" : "1236", "s" : [ { - "r" : "1150", + "r" : "1237", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1151", + "r" : "1238", "s" : [ { "value" : [ "5 ","'m'" ] } ] @@ -4561,26 +5167,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1149", + "localId" : "1236", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1152", + "localId" : "1239", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1153", + "localId" : "1240", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1150", + "localId" : "1237", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "1151", + "localId" : "1238", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", @@ -4588,7 +5194,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1155", + "localId" : "1242", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "ALtB_Quantity", "context" : "Patient", @@ -4596,20 +5202,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1155", + "r" : "1242", "s" : [ { "value" : [ "","define ","ALtB_Quantity",": " ] }, { - "r" : "1156", + "r" : "1243", "s" : [ { - "r" : "1157", + "r" : "1244", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1158", + "r" : "1245", "s" : [ { "value" : [ "6 ","'m'" ] } ] @@ -4618,26 +5224,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1156", + "localId" : "1243", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1159", + "localId" : "1246", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1160", + "localId" : "1247", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1157", + "localId" : "1244", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "1158", + "localId" : "1245", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 6, "unit" : "m", @@ -4645,7 +5251,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1162", + "localId" : "1249", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "AGtB_Quantity_diff", "context" : "Patient", @@ -4653,20 +5259,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1162", + "r" : "1249", "s" : [ { "value" : [ "","define ","AGtB_Quantity_diff",": " ] }, { - "r" : "1163", + "r" : "1250", "s" : [ { - "r" : "1164", + "r" : "1251", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1165", + "r" : "1252", "s" : [ { "value" : [ "5 ","'cm'" ] } ] @@ -4675,26 +5281,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1163", + "localId" : "1250", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1166", + "localId" : "1253", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1167", + "localId" : "1254", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1164", + "localId" : "1251", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "1165", + "localId" : "1252", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "cm", @@ -4702,7 +5308,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1169", + "localId" : "1256", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "AEqB_Quantity_diff", "context" : "Patient", @@ -4710,20 +5316,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1169", + "r" : "1256", "s" : [ { "value" : [ "","define ","AEqB_Quantity_diff",": " ] }, { - "r" : "1170", + "r" : "1257", "s" : [ { - "r" : "1171", + "r" : "1258", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1172", + "r" : "1259", "s" : [ { "value" : [ "500 ","'cm'" ] } ] @@ -4732,26 +5338,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1170", + "localId" : "1257", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1173", + "localId" : "1260", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1174", + "localId" : "1261", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1171", + "localId" : "1258", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "1172", + "localId" : "1259", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 500, "unit" : "cm", @@ -4759,7 +5365,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1176", + "localId" : "1263", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "ALtB_Quantity_diff", "context" : "Patient", @@ -4767,20 +5373,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1176", + "r" : "1263", "s" : [ { "value" : [ "","define ","ALtB_Quantity_diff",": " ] }, { - "r" : "1177", + "r" : "1264", "s" : [ { - "r" : "1178", + "r" : "1265", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1179", + "r" : "1266", "s" : [ { "value" : [ "5 ","'km'" ] } ] @@ -4789,26 +5395,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1177", + "localId" : "1264", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1180", + "localId" : "1267", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1181", + "localId" : "1268", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1178", + "localId" : "1265", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "1179", + "localId" : "1266", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "km", @@ -4816,7 +5422,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1183", + "localId" : "1270", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "AGtB_Quantity_incompatible", "context" : "Patient", @@ -4824,20 +5430,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1183", + "r" : "1270", "s" : [ { "value" : [ "","define ","AGtB_Quantity_incompatible",": " ] }, { - "r" : "1184", + "r" : "1271", "s" : [ { - "r" : "1185", + "r" : "1272", "s" : [ { "value" : [ "5 ","'Cel'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1186", + "r" : "1273", "s" : [ { "value" : [ "4 ","'m'" ] } ] @@ -4846,26 +5452,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1184", + "localId" : "1271", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1187", + "localId" : "1274", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1188", + "localId" : "1275", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1185", + "localId" : "1272", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "Cel", "type" : "Quantity" }, { - "localId" : "1186", + "localId" : "1273", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 4, "unit" : "m", @@ -4873,7 +5479,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1190", + "localId" : "1277", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "AEqB_Quantity_incompatible", "context" : "Patient", @@ -4881,20 +5487,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1190", + "r" : "1277", "s" : [ { "value" : [ "","define ","AEqB_Quantity_incompatible",": " ] }, { - "r" : "1191", + "r" : "1278", "s" : [ { - "r" : "1192", + "r" : "1279", "s" : [ { "value" : [ "5 ","'Cel'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1193", + "r" : "1280", "s" : [ { "value" : [ "5 ","'m'" ] } ] @@ -4903,26 +5509,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1191", + "localId" : "1278", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1194", + "localId" : "1281", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1195", + "localId" : "1282", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1192", + "localId" : "1279", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "Cel", "type" : "Quantity" }, { - "localId" : "1193", + "localId" : "1280", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "m", @@ -4930,7 +5536,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1197", + "localId" : "1284", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "ALtB_Quantity_incompatible", "context" : "Patient", @@ -4938,20 +5544,20 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1197", + "r" : "1284", "s" : [ { "value" : [ "","define ","ALtB_Quantity_incompatible",": " ] }, { - "r" : "1198", + "r" : "1285", "s" : [ { - "r" : "1199", + "r" : "1286", "s" : [ { "value" : [ "5 ","'Cel'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "1200", + "r" : "1287", "s" : [ { "value" : [ "40 ","'m'" ] } ] @@ -4960,26 +5566,26 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1198", + "localId" : "1285", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1201", + "localId" : "1288", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" }, { - "localId" : "1202", + "localId" : "1289", "name" : "{urn:hl7-org:elm-types:r1}Quantity", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1199", + "localId" : "1286", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 5, "unit" : "Cel", "type" : "Quantity" }, { - "localId" : "1200", + "localId" : "1287", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 40, "unit" : "m", @@ -4987,7 +5593,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1204", + "localId" : "1291", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "EqRatios", "context" : "Patient", @@ -4995,22 +5601,22 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1204", + "r" : "1291", "s" : [ { "value" : [ "","define ","EqRatios",": " ] }, { - "r" : "1205", + "r" : "1292", "s" : [ { - "r" : "1208", + "r" : "1295", "s" : [ { - "r" : "1206", + "r" : "1293", "s" : [ { "value" : [ "10 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "1207", + "r" : "1294", "s" : [ { "value" : [ "2 ","'dL'" ] } ] @@ -5018,16 +5624,16 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "1211", + "r" : "1298", "s" : [ { - "r" : "1209", + "r" : "1296", "s" : [ { "value" : [ "15 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "1210", + "r" : "1297", "s" : [ { "value" : [ "3 ","'dL'" ] } ] @@ -5037,46 +5643,46 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1205", + "localId" : "1292", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1212", + "localId" : "1299", "name" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "NamedTypeSpecifier" }, { - "localId" : "1213", + "localId" : "1300", "name" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1208", + "localId" : "1295", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "Ratio", "numerator" : { - "localId" : "1206", + "localId" : "1293", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 10, "unit" : "mg" }, "denominator" : { - "localId" : "1207", + "localId" : "1294", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 2, "unit" : "dL" } }, { - "localId" : "1211", + "localId" : "1298", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "Ratio", "numerator" : { - "localId" : "1209", + "localId" : "1296", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 15, "unit" : "mg" }, "denominator" : { - "localId" : "1210", + "localId" : "1297", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 3, "unit" : "dL" @@ -5084,7 +5690,7 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "1215", + "localId" : "1302", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "UneqRatios", "context" : "Patient", @@ -5092,22 +5698,22 @@ module.exports['Equal'] = { "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "1215", + "r" : "1302", "s" : [ { "value" : [ "","define ","UneqRatios",": " ] }, { - "r" : "1216", + "r" : "1303", "s" : [ { - "r" : "1219", + "r" : "1306", "s" : [ { - "r" : "1217", + "r" : "1304", "s" : [ { "value" : [ "10 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "1218", + "r" : "1305", "s" : [ { "value" : [ "2 ","'dL'" ] } ] @@ -5115,16 +5721,16 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "1222", + "r" : "1309", "s" : [ { - "r" : "1220", + "r" : "1307", "s" : [ { "value" : [ "15 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "1221", + "r" : "1308", "s" : [ { "value" : [ "4 ","'dL'" ] } ] @@ -5134,46 +5740,46 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "1216", + "localId" : "1303", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "type" : "Equal", "signature" : [ { - "localId" : "1223", + "localId" : "1310", "name" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "NamedTypeSpecifier" }, { - "localId" : "1224", + "localId" : "1311", "name" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "NamedTypeSpecifier" } ], "operand" : [ { - "localId" : "1219", + "localId" : "1306", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "Ratio", "numerator" : { - "localId" : "1217", + "localId" : "1304", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 10, "unit" : "mg" }, "denominator" : { - "localId" : "1218", + "localId" : "1305", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 2, "unit" : "dL" } }, { - "localId" : "1222", + "localId" : "1309", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio", "type" : "Ratio", "numerator" : { - "localId" : "1220", + "localId" : "1307", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 15, "unit" : "mg" }, "denominator" : { - "localId" : "1221", + "localId" : "1308", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity", "value" : 4, "unit" : "dL" diff --git a/test/util/comparison-test.ts b/test/util/comparison-test.ts index efd5f7907..7b7473da0 100644 --- a/test/util/comparison-test.ts +++ b/test/util/comparison-test.ts @@ -68,6 +68,23 @@ describe('equals', () => { ).should.be.true(); equals({ a: [1, 2, 3], b: [4, 5, 6] }, { a: [1, 2, 3], b: [4, 5, 6] }).should.be.true(); equals({ a: [1, 2, 3], b: [4, 5, 6] }, { a: [3, 2, 1], b: [6, 5, 4] }).should.be.false(); + equals({ a: 1, b: null, c: 'sea' }, { a: 1, b: null, c: 'sea' }).should.be.true(); + equals({ a: 1, b: null, c: 'sea' }, { a: 1, b: null, c: 'see' }).should.be.false(); + equals({ a: 1, b: 'bee', c: null }, { a: 1, b: 'bee', c: null }).should.be.true(); + equals({ a: 1, b: 'bee', c: null }, { a: 1, b: 'bea', c: null }).should.be.false(); + equals({ a: null, b: 'bee', c: 'sea' }, { a: null, b: 'bee', c: 'sea' }).should.be.true(); + equals({ a: null, b: 'bee', c: 'sea' }, { a: null, b: 'bee', c: 'see' }).should.be.false(); + equals({ a: 1, b: null, c: 'sea' }, { a: 2, b: null, c: 'sea' }).should.be.false(); + equals({ a: 1, b: null, c: 'sea' }, { a: 1, b: 'bee', c: 'see' }).should.be.false(); + equals({ a: 1, b: 'bee', c: 'sea' }, { a: 1, b: null, c: 'see' }).should.be.false(); + equals({ a: 2, b: null, c: 'sea' }, { a: 1, b: 'bee', c: 'sea' }).should.be.false(); + equals({ a: 2, b: 'bee', c: 'sea' }, { a: 1, b: null, c: 'sea' }).should.be.false(); + should(equals({ a: 1, b: null, c: 'sea' }, { a: 1, b: 'bee', c: 'sea' })).be.null(); + should(equals({ a: 1, b: 'bee', c: 'sea' }, { a: 1, b: null, c: 'sea' })).be.null(); + should(equals({ a: 1, b: 'bee', c: 'sea' }, { a: 1, b: 'bee', c: null })).be.null(); + should(equals({ a: 1, b: 'bee', c: null }, { a: 1, b: 'bee', c: 'sea' })).be.null(); + should(equals({ a: null, b: 'bee', c: 'sea' }, { a: 1, b: 'bee', c: 'sea' })).be.null(); + should(equals({ a: 1, b: 'bee', c: 'sea' }, { a: null, b: 'bee', c: 'sea' })).be.null(); }); it('should detect equality/inequality for classes', () => {