diff --git a/examples/browser/cql4browsers.js b/examples/browser/cql4browsers.js index b969ee813..b592b7c9b 100644 --- a/examples/browser/cql4browsers.js +++ b/examples/browser/cql4browsers.js @@ -8697,6 +8697,7 @@ function deepCompareKeysAndValues(a, b, comparisonFunction) { const comparisonResult = comparisonFunction(a[key], b[key]); if (comparisonResult === null) { shouldReturnNull = true; + return true; } return comparisonResult; }); @@ -8704,7 +8705,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 cf48221f5..90be76601 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" : "676", + "r" : "703", "s" : [ { "value" : [ "","library TestSnippet version '1'" ] } ] @@ -853,7 +856,7 @@ module.exports['Equal'] = { } }, { "localId" : "277", - "name" : "EqDateTimes", + "name" : "UncertTuplesWithNullFieldOnFirstOne", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { @@ -861,18 +864,357 @@ module.exports['Equal'] = { "s" : { "r" : "277", "s" : [ { - "value" : [ "","define ","EqDateTimes",": " ] + "value" : [ "","define ","UncertTuplesWithNullFieldOnFirstOne",": " ] }, { "r" : "278", "s" : [ { - "r" : "289", + "r" : "279", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "r" : "280", + "value" : [ "a",": ","null" ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "281", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + }, { + "value" : [ " ","="," " ] + }, { + "r" : "282", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "283", + "s" : [ { + "value" : [ "'Hello'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "284", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + } ] + } ] + } + } ], + "expression" : { + "localId" : "278", + "type" : "Equal", + "signature" : [ ], + "operand" : [ { + "localId" : "279", + "type" : "Tuple", + "element" : [ { + "name" : "a", + "value" : { + "localId" : "280", + "type" : "Null" + } + }, { + "name" : "b", + "value" : { + "localId" : "281", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + } ] + }, { + "localId" : "282", + "type" : "Tuple", + "element" : [ { + "name" : "a", + "value" : { + "localId" : "283", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Hello", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "284", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + } ] + } ] + } + }, { + "localId" : "286", + "name" : "UneqTuplesWithNullFieldOnOne", + "context" : "Patient", + "accessLevel" : "Public", + "annotation" : [ { + "type" : "Annotation", + "s" : { + "r" : "286", + "s" : [ { + "value" : [ "","define ","UneqTuplesWithNullFieldOnOne",": " ] + }, { + "r" : "287", + "s" : [ { + "r" : "288", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "289", + "s" : [ { + "value" : [ "'Hello'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "r" : "290", + "value" : [ "b",": ","null" ] + } ] + }, { + "value" : [ "}" ] + } ] + }, { + "value" : [ " ","="," " ] + }, { + "r" : "291", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "292", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "293", + "s" : [ { + "value" : [ "'null'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + } ] + } ] + } + } ], + "expression" : { + "localId" : "287", + "type" : "Equal", + "signature" : [ ], + "operand" : [ { + "localId" : "288", + "type" : "Tuple", + "element" : [ { + "name" : "a", + "value" : { + "localId" : "289", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Hello", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "290", + "type" : "Null" + } + } ] + }, { + "localId" : "291", + "type" : "Tuple", + "element" : [ { + "name" : "a", + "value" : { + "localId" : "292", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "293", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "null", + "type" : "Literal" + } + } ] + } ] + } + }, { + "localId" : "295", + "name" : "UneqTuplesWithNullFieldOnFirstOne", + "context" : "Patient", + "accessLevel" : "Public", + "annotation" : [ { + "type" : "Annotation", + "s" : { + "r" : "295", + "s" : [ { + "value" : [ "","define ","UneqTuplesWithNullFieldOnFirstOne",": " ] + }, { + "r" : "296", + "s" : [ { + "r" : "297", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "r" : "298", + "value" : [ "a",": ","null" ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "299", + "s" : [ { + "value" : [ "'Hello'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + }, { + "value" : [ " ","="," " ] + }, { + "r" : "300", + "s" : [ { + "value" : [ "Tuple{" ] + }, { + "s" : [ { + "value" : [ "a",": " ] + }, { + "r" : "301", + "s" : [ { + "value" : [ "'null'" ] + } ] + } ] + }, { + "value" : [ ", " ] + }, { + "s" : [ { + "value" : [ "b",": " ] + }, { + "r" : "302", + "s" : [ { + "value" : [ "'Goodbye'" ] + } ] + } ] + }, { + "value" : [ "}" ] + } ] + } ] + } ] + } + } ], + "expression" : { + "localId" : "296", + "type" : "Equal", + "signature" : [ ], + "operand" : [ { + "localId" : "297", + "type" : "Tuple", + "element" : [ { + "name" : "a", + "value" : { + "localId" : "298", + "type" : "Null" + } + }, { + "name" : "b", + "value" : { + "localId" : "299", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Hello", + "type" : "Literal" + } + } ] + }, { + "localId" : "300", + "type" : "Tuple", + "element" : [ { + "name" : "a", + "value" : { + "localId" : "301", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "null", + "type" : "Literal" + } + }, { + "name" : "b", + "value" : { + "localId" : "302", + "valueType" : "{urn:hl7-org:elm-types:r1}String", + "value" : "Goodbye", + "type" : "Literal" + } + } ] + } ] + } + }, { + "localId" : "304", + "name" : "EqDateTimes", + "context" : "Patient", + "accessLevel" : "Public", + "annotation" : [ { + "type" : "Annotation", + "s" : { + "r" : "304", + "s" : [ { + "value" : [ "","define ","EqDateTimes",": " ] + }, { + "r" : "305", + "s" : [ { + "r" : "316", "s" : [ { - "r" : "279", + "r" : "306", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "286", + "r" : "313", "s" : [ { - "r" : "286", + "r" : "313", "value" : [ "+","1.0" ] } ] }, { @@ -881,14 +1223,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "300", + "r" : "327", "s" : [ { - "r" : "290", + "r" : "317", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "297", + "r" : "324", "s" : [ { - "r" : "297", + "r" : "324", "value" : [ "+","1.0" ] } ] }, { @@ -899,109 +1241,109 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "278", + "localId" : "305", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "289", + "localId" : "316", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "279", + "localId" : "306", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "280", + "localId" : "307", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "281", + "localId" : "308", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "282", + "localId" : "309", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "283", + "localId" : "310", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "284", + "localId" : "311", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "285", + "localId" : "312", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "286", + "localId" : "313", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "300", + "localId" : "327", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "290", + "localId" : "317", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "291", + "localId" : "318", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "292", + "localId" : "319", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "293", + "localId" : "320", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "294", + "localId" : "321", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "295", + "localId" : "322", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "296", + "localId" : "323", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "297", + "localId" : "324", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" @@ -1009,27 +1351,27 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "302", + "localId" : "329", "name" : "UneqDateTimes", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "302", + "r" : "329", "s" : [ { "value" : [ "","define ","UneqDateTimes",": " ] }, { - "r" : "303", + "r" : "330", "s" : [ { - "r" : "314", + "r" : "341", "s" : [ { - "r" : "304", + "r" : "331", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "311", + "r" : "338", "s" : [ { - "r" : "311", + "r" : "338", "value" : [ "+","1.0" ] } ] }, { @@ -1038,14 +1380,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "325", + "r" : "352", "s" : [ { - "r" : "315", + "r" : "342", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","201",", " ] }, { - "r" : "322", + "r" : "349", "s" : [ { - "r" : "322", + "r" : "349", "value" : [ "+","1.0" ] } ] }, { @@ -1056,109 +1398,109 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "303", + "localId" : "330", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "314", + "localId" : "341", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "304", + "localId" : "331", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "305", + "localId" : "332", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "306", + "localId" : "333", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "307", + "localId" : "334", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "308", + "localId" : "335", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "309", + "localId" : "336", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "310", + "localId" : "337", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "311", + "localId" : "338", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "325", + "localId" : "352", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "315", + "localId" : "342", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "316", + "localId" : "343", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "317", + "localId" : "344", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "318", + "localId" : "345", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "319", + "localId" : "346", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "320", + "localId" : "347", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "321", + "localId" : "348", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "201", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "322", + "localId" : "349", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" @@ -1166,27 +1508,27 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "327", + "localId" : "354", "name" : "EqDateTimesTZ", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "327", + "r" : "354", "s" : [ { "value" : [ "","define ","EqDateTimesTZ",": " ] }, { - "r" : "328", + "r" : "355", "s" : [ { - "r" : "339", + "r" : "366", "s" : [ { - "r" : "329", + "r" : "356", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","23",", ","30",", ","25",", ","200",", " ] }, { - "r" : "336", + "r" : "363", "s" : [ { - "r" : "336", + "r" : "363", "value" : [ "+","1.0" ] } ] }, { @@ -1195,14 +1537,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "350", + "r" : "377", "s" : [ { - "r" : "340", + "r" : "367", "value" : [ "DateTime","(","2000",", ","3",", ","16",", ","2",", ","30",", ","25",", ","200",", " ] }, { - "r" : "347", + "r" : "374", "s" : [ { - "r" : "347", + "r" : "374", "value" : [ "+","4.0" ] } ] }, { @@ -1213,109 +1555,109 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "328", + "localId" : "355", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "339", + "localId" : "366", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "329", + "localId" : "356", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "330", + "localId" : "357", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "331", + "localId" : "358", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "332", + "localId" : "359", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "23", "type" : "Literal" }, "minute" : { - "localId" : "333", + "localId" : "360", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "334", + "localId" : "361", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "335", + "localId" : "362", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "336", + "localId" : "363", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "350", + "localId" : "377", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "340", + "localId" : "367", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "341", + "localId" : "368", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "342", + "localId" : "369", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "16", "type" : "Literal" }, "hour" : { - "localId" : "343", + "localId" : "370", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2", "type" : "Literal" }, "minute" : { - "localId" : "344", + "localId" : "371", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "345", + "localId" : "372", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "346", + "localId" : "373", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "347", + "localId" : "374", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "4.0", "type" : "Literal" @@ -1323,27 +1665,27 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "352", + "localId" : "379", "name" : "UneqDateTimesTZ", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "352", + "r" : "379", "s" : [ { "value" : [ "","define ","UneqDateTimesTZ",": " ] }, { - "r" : "353", + "r" : "380", "s" : [ { - "r" : "364", + "r" : "391", "s" : [ { - "r" : "354", + "r" : "381", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "361", + "r" : "388", "s" : [ { - "r" : "361", + "r" : "388", "value" : [ "+","1.0" ] } ] }, { @@ -1352,14 +1694,14 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "375", + "r" : "402", "s" : [ { - "r" : "365", + "r" : "392", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","200",", " ] }, { - "r" : "372", + "r" : "399", "s" : [ { - "r" : "372", + "r" : "399", "value" : [ "+","2.0" ] } ] }, { @@ -1370,109 +1712,109 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "353", + "localId" : "380", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "364", + "localId" : "391", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "354", + "localId" : "381", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "355", + "localId" : "382", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "356", + "localId" : "383", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "357", + "localId" : "384", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "358", + "localId" : "385", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "359", + "localId" : "386", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "360", + "localId" : "387", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "361", + "localId" : "388", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "1.0", "type" : "Literal" } }, { - "localId" : "375", + "localId" : "402", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "365", + "localId" : "392", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "366", + "localId" : "393", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "367", + "localId" : "394", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "368", + "localId" : "395", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "369", + "localId" : "396", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "370", + "localId" : "397", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "371", + "localId" : "398", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "200", "type" : "Literal" }, "timezoneOffset" : { - "localId" : "372", + "localId" : "399", "valueType" : "{urn:hl7-org:elm-types:r1}Decimal", "value" : "2.0", "type" : "Literal" @@ -1480,30 +1822,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "377", + "localId" : "404", "name" : "EqDateTimesNullMs", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "377", + "r" : "404", "s" : [ { "value" : [ "","define ","EqDateTimesNullMs",": " ] }, { - "r" : "378", + "r" : "405", "s" : [ { - "r" : "388", + "r" : "415", "s" : [ { - "r" : "379", + "r" : "406", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","0",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "397", + "r" : "424", "s" : [ { - "r" : "389", + "r" : "416", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",")" ] } ] } ] @@ -1511,91 +1853,91 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "378", + "localId" : "405", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "388", + "localId" : "415", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "379", + "localId" : "406", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "380", + "localId" : "407", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "381", + "localId" : "408", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "382", + "localId" : "409", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "383", + "localId" : "410", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "384", + "localId" : "411", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "385", + "localId" : "412", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "0", "type" : "Literal" } }, { - "localId" : "397", + "localId" : "424", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "389", + "localId" : "416", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "390", + "localId" : "417", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "391", + "localId" : "418", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "392", + "localId" : "419", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "393", + "localId" : "420", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "394", + "localId" : "421", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" @@ -1603,30 +1945,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "399", + "localId" : "426", "name" : "EqDateTimesNullOtherMs", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "399", + "r" : "426", "s" : [ { "value" : [ "","define ","EqDateTimesNullOtherMs",": " ] }, { - "r" : "400", + "r" : "427", "s" : [ { - "r" : "409", + "r" : "436", "s" : [ { - "r" : "401", + "r" : "428", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "419", + "r" : "446", "s" : [ { - "r" : "410", + "r" : "437", "value" : [ "DateTime","(","2000",", ","3",", ","15",", ","13",", ","30",", ","25",", ","0",")" ] } ] } ] @@ -1634,91 +1976,91 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "400", + "localId" : "427", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "409", + "localId" : "436", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "401", + "localId" : "428", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "402", + "localId" : "429", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "403", + "localId" : "430", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "404", + "localId" : "431", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "405", + "localId" : "432", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "406", + "localId" : "433", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" } }, { - "localId" : "419", + "localId" : "446", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "410", + "localId" : "437", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "411", + "localId" : "438", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "412", + "localId" : "439", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" }, "hour" : { - "localId" : "413", + "localId" : "440", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "414", + "localId" : "441", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "30", "type" : "Literal" }, "second" : { - "localId" : "415", + "localId" : "442", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "25", "type" : "Literal" }, "millisecond" : { - "localId" : "416", + "localId" : "443", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "0", "type" : "Literal" @@ -1726,30 +2068,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "421", + "localId" : "448", "name" : "EqDateTimesOnlyDate", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "421", + "r" : "448", "s" : [ { "value" : [ "","define ","EqDateTimesOnlyDate",": " ] }, { - "r" : "422", + "r" : "449", "s" : [ { - "r" : "428", + "r" : "455", "s" : [ { - "r" : "423", + "r" : "450", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "434", + "r" : "461", "s" : [ { - "r" : "429", + "r" : "456", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] } ] @@ -1757,49 +2099,49 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "422", + "localId" : "449", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "428", + "localId" : "455", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "423", + "localId" : "450", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "424", + "localId" : "451", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "425", + "localId" : "452", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" } }, { - "localId" : "434", + "localId" : "461", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "429", + "localId" : "456", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "430", + "localId" : "457", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "431", + "localId" : "458", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" @@ -1807,30 +2149,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "436", + "localId" : "463", "name" : "UneqDateTimesOnlyDate", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "436", + "r" : "463", "s" : [ { "value" : [ "","define ","UneqDateTimesOnlyDate",": " ] }, { - "r" : "437", + "r" : "464", "s" : [ { - "r" : "443", + "r" : "470", "s" : [ { - "r" : "438", + "r" : "465", "value" : [ "DateTime","(","2000",", ","3",", ","14",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "449", + "r" : "476", "s" : [ { - "r" : "444", + "r" : "471", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] } ] @@ -1838,49 +2180,49 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "437", + "localId" : "464", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "443", + "localId" : "470", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "438", + "localId" : "465", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "439", + "localId" : "466", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "440", + "localId" : "467", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "14", "type" : "Literal" } }, { - "localId" : "449", + "localId" : "476", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "444", + "localId" : "471", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "445", + "localId" : "472", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "446", + "localId" : "473", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" @@ -1888,30 +2230,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "451", + "localId" : "478", "name" : "PossiblyEqDateTimesOnlyDateOnOne", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "451", + "r" : "478", "s" : [ { "value" : [ "","define ","PossiblyEqDateTimesOnlyDateOnOne",": " ] }, { - "r" : "452", + "r" : "479", "s" : [ { - "r" : "458", + "r" : "485", "s" : [ { - "r" : "453", + "r" : "480", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "467", + "r" : "494", "s" : [ { - "r" : "459", + "r" : "486", "value" : [ "DateTime","(","2000",", ","3",", ","13",", ","13",", ","43",", ","32",")" ] } ] } ] @@ -1919,67 +2261,67 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "452", + "localId" : "479", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "458", + "localId" : "485", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "453", + "localId" : "480", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "454", + "localId" : "481", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "455", + "localId" : "482", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } }, { - "localId" : "467", + "localId" : "494", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "459", + "localId" : "486", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "460", + "localId" : "487", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "461", + "localId" : "488", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "462", + "localId" : "489", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "minute" : { - "localId" : "463", + "localId" : "490", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "43", "type" : "Literal" }, "second" : { - "localId" : "464", + "localId" : "491", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "32", "type" : "Literal" @@ -1987,30 +2329,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "469", + "localId" : "496", "name" : "UneqDateTimesOnlyDateOnOne", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "469", + "r" : "496", "s" : [ { "value" : [ "","define ","UneqDateTimesOnlyDateOnOne",": " ] }, { - "r" : "470", + "r" : "497", "s" : [ { - "r" : "479", + "r" : "506", "s" : [ { - "r" : "471", + "r" : "498", "value" : [ "DateTime","(","2000",", ","4",", ","13",", ","12",", ","43",", ","32",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "485", + "r" : "512", "s" : [ { - "r" : "480", + "r" : "507", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -2018,67 +2360,67 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "470", + "localId" : "497", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "479", + "localId" : "506", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "471", + "localId" : "498", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "472", + "localId" : "499", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" }, "day" : { - "localId" : "473", + "localId" : "500", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "474", + "localId" : "501", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "12", "type" : "Literal" }, "minute" : { - "localId" : "475", + "localId" : "502", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "43", "type" : "Literal" }, "second" : { - "localId" : "476", + "localId" : "503", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "32", "type" : "Literal" } }, { - "localId" : "485", + "localId" : "512", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "480", + "localId" : "507", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "481", + "localId" : "508", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "482", + "localId" : "509", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" @@ -2086,30 +2428,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "487", + "localId" : "514", "name" : "PossiblyEqualDateTimes", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "487", + "r" : "514", "s" : [ { "value" : [ "","define ","PossiblyEqualDateTimes",": " ] }, { - "r" : "488", + "r" : "515", "s" : [ { - "r" : "494", + "r" : "521", "s" : [ { - "r" : "489", + "r" : "516", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "498", + "r" : "525", "s" : [ { - "r" : "495", + "r" : "522", "value" : [ "DateTime","(","2000",")" ] } ] } ] @@ -2117,37 +2459,37 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "488", + "localId" : "515", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "494", + "localId" : "521", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "489", + "localId" : "516", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "490", + "localId" : "517", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "491", + "localId" : "518", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" } }, { - "localId" : "498", + "localId" : "525", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "495", + "localId" : "522", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" @@ -2155,30 +2497,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "500", + "localId" : "527", "name" : "ImpossiblyEqualDateTimes", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "500", + "r" : "527", "s" : [ { "value" : [ "","define ","ImpossiblyEqualDateTimes",": " ] }, { - "r" : "501", + "r" : "528", "s" : [ { - "r" : "507", + "r" : "534", "s" : [ { - "r" : "502", + "r" : "529", "value" : [ "DateTime","(","2000",", ","3",", ","15",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "512", + "r" : "539", "s" : [ { - "r" : "508", + "r" : "535", "value" : [ "DateTime","(","2000",", ","4",")" ] } ] } ] @@ -2186,43 +2528,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "501", + "localId" : "528", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "507", + "localId" : "534", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "502", + "localId" : "529", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "503", + "localId" : "530", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "504", + "localId" : "531", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "15", "type" : "Literal" } }, { - "localId" : "512", + "localId" : "539", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "508", + "localId" : "535", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "509", + "localId" : "536", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" @@ -2230,30 +2572,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "514", + "localId" : "541", "name" : "DateAndDateTimeTrue", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "514", + "r" : "541", "s" : [ { "value" : [ "","define ","DateAndDateTimeTrue",": " ] }, { - "r" : "515", + "r" : "542", "s" : [ { - "r" : "521", + "r" : "548", "s" : [ { - "r" : "516", + "r" : "543", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "527", + "r" : "554", "s" : [ { - "r" : "522", + "r" : "549", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -2261,54 +2603,54 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "515", + "localId" : "542", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "529", + "localId" : "556", "type" : "ToDateTime", "signature" : [ ], "operand" : { - "localId" : "521", + "localId" : "548", "type" : "Date", "signature" : [ ], "year" : { - "localId" : "516", + "localId" : "543", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "517", + "localId" : "544", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "518", + "localId" : "545", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } } }, { - "localId" : "527", + "localId" : "554", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "522", + "localId" : "549", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "523", + "localId" : "550", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "524", + "localId" : "551", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" @@ -2316,30 +2658,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "531", + "localId" : "558", "name" : "DateAndDateTimeNotEqual", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "531", + "r" : "558", "s" : [ { "value" : [ "","define ","DateAndDateTimeNotEqual",": " ] }, { - "r" : "532", + "r" : "559", "s" : [ { - "r" : "538", + "r" : "565", "s" : [ { - "r" : "533", + "r" : "560", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "544", + "r" : "571", "s" : [ { - "r" : "539", + "r" : "566", "value" : [ "DateTime","(","2000",", ","3",", ","12",")" ] } ] } ] @@ -2347,54 +2689,54 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "532", + "localId" : "559", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "546", + "localId" : "573", "type" : "ToDateTime", "signature" : [ ], "operand" : { - "localId" : "538", + "localId" : "565", "type" : "Date", "signature" : [ ], "year" : { - "localId" : "533", + "localId" : "560", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "534", + "localId" : "561", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "535", + "localId" : "562", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } } }, { - "localId" : "544", + "localId" : "571", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "539", + "localId" : "566", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "540", + "localId" : "567", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "541", + "localId" : "568", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "12", "type" : "Literal" @@ -2402,30 +2744,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "548", + "localId" : "575", "name" : "DateAndDateTimeUncertainNull", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "548", + "r" : "575", "s" : [ { "value" : [ "","define ","DateAndDateTimeUncertainNull",": " ] }, { - "r" : "549", + "r" : "576", "s" : [ { - "r" : "555", + "r" : "582", "s" : [ { - "r" : "550", + "r" : "577", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "564", + "r" : "591", "s" : [ { - "r" : "556", + "r" : "583", "value" : [ "DateTime","(","2000",", ","3",", ","13",", ","2",", ","4",", ","23",")" ] } ] } ] @@ -2433,72 +2775,72 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "549", + "localId" : "576", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "566", + "localId" : "593", "type" : "ToDateTime", "signature" : [ ], "operand" : { - "localId" : "555", + "localId" : "582", "type" : "Date", "signature" : [ ], "year" : { - "localId" : "550", + "localId" : "577", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "551", + "localId" : "578", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "552", + "localId" : "579", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } } }, { - "localId" : "564", + "localId" : "591", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "556", + "localId" : "583", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "557", + "localId" : "584", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "558", + "localId" : "585", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "559", + "localId" : "586", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2", "type" : "Literal" }, "minute" : { - "localId" : "560", + "localId" : "587", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" }, "second" : { - "localId" : "561", + "localId" : "588", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "23", "type" : "Literal" @@ -2506,30 +2848,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "568", + "localId" : "595", "name" : "DateTimeAndDateTrue", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "568", + "r" : "595", "s" : [ { "value" : [ "","define ","DateTimeAndDateTrue",": " ] }, { - "r" : "569", + "r" : "596", "s" : [ { - "r" : "575", + "r" : "602", "s" : [ { - "r" : "570", + "r" : "597", "value" : [ "DateTime","(","2000",", ","3",", ","13",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "581", + "r" : "608", "s" : [ { - "r" : "576", + "r" : "603", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -2537,53 +2879,53 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "569", + "localId" : "596", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "575", + "localId" : "602", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "570", + "localId" : "597", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "571", + "localId" : "598", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "572", + "localId" : "599", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" } }, { - "localId" : "583", + "localId" : "610", "type" : "ToDateTime", "signature" : [ ], "operand" : { - "localId" : "581", + "localId" : "608", "type" : "Date", "signature" : [ ], "year" : { - "localId" : "576", + "localId" : "603", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "577", + "localId" : "604", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "578", + "localId" : "605", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" @@ -2592,30 +2934,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "585", + "localId" : "612", "name" : "DateTimeAndDateNotEqual", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "585", + "r" : "612", "s" : [ { "value" : [ "","define ","DateTimeAndDateNotEqual",": " ] }, { - "r" : "586", + "r" : "613", "s" : [ { - "r" : "592", + "r" : "619", "s" : [ { - "r" : "587", + "r" : "614", "value" : [ "DateTime","(","2000",", ","3",", ","12",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "598", + "r" : "625", "s" : [ { - "r" : "593", + "r" : "620", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -2623,53 +2965,53 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "586", + "localId" : "613", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "592", + "localId" : "619", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "587", + "localId" : "614", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "588", + "localId" : "615", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "589", + "localId" : "616", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "12", "type" : "Literal" } }, { - "localId" : "600", + "localId" : "627", "type" : "ToDateTime", "signature" : [ ], "operand" : { - "localId" : "598", + "localId" : "625", "type" : "Date", "signature" : [ ], "year" : { - "localId" : "593", + "localId" : "620", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "594", + "localId" : "621", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "595", + "localId" : "622", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" @@ -2678,30 +3020,30 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "602", + "localId" : "629", "name" : "DateTimeAndDateUncertainNull", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "602", + "r" : "629", "s" : [ { "value" : [ "","define ","DateTimeAndDateUncertainNull",": " ] }, { - "r" : "603", + "r" : "630", "s" : [ { - "r" : "612", + "r" : "639", "s" : [ { - "r" : "604", + "r" : "631", "value" : [ "DateTime","(","2000",", ","3",", ","13",", ","2",", ","4",", ","23",")" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "618", + "r" : "645", "s" : [ { - "r" : "613", + "r" : "640", "value" : [ "Date","(","2000",", ","3",", ","13",")" ] } ] } ] @@ -2709,71 +3051,71 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "603", + "localId" : "630", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "612", + "localId" : "639", "type" : "DateTime", "signature" : [ ], "year" : { - "localId" : "604", + "localId" : "631", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "605", + "localId" : "632", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "606", + "localId" : "633", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" }, "hour" : { - "localId" : "607", + "localId" : "634", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2", "type" : "Literal" }, "minute" : { - "localId" : "608", + "localId" : "635", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "4", "type" : "Literal" }, "second" : { - "localId" : "609", + "localId" : "636", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "23", "type" : "Literal" } }, { - "localId" : "620", + "localId" : "647", "type" : "ToDateTime", "signature" : [ ], "operand" : { - "localId" : "618", + "localId" : "645", "type" : "Date", "signature" : [ ], "year" : { - "localId" : "613", + "localId" : "640", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "2000", "type" : "Literal" }, "month" : { - "localId" : "614", + "localId" : "641", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "3", "type" : "Literal" }, "day" : { - "localId" : "615", + "localId" : "642", "valueType" : "{urn:hl7-org:elm-types:r1}Integer", "value" : "13", "type" : "Literal" @@ -2782,27 +3124,27 @@ module.exports['Equal'] = { } ] } }, { - "localId" : "622", + "localId" : "649", "name" : "AGtB_Quantity", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "622", + "r" : "649", "s" : [ { "value" : [ "","define ","AGtB_Quantity",": " ] }, { - "r" : "623", + "r" : "650", "s" : [ { - "r" : "624", + "r" : "651", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "625", + "r" : "652", "s" : [ { "value" : [ "4 ","'m'" ] } ] @@ -2811,43 +3153,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "623", + "localId" : "650", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "624", + "localId" : "651", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "625", + "localId" : "652", "value" : 4, "unit" : "m", "type" : "Quantity" } ] } }, { - "localId" : "627", + "localId" : "654", "name" : "AEqB_Quantity", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "627", + "r" : "654", "s" : [ { "value" : [ "","define ","AEqB_Quantity",": " ] }, { - "r" : "628", + "r" : "655", "s" : [ { - "r" : "629", + "r" : "656", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "630", + "r" : "657", "s" : [ { "value" : [ "5 ","'m'" ] } ] @@ -2856,43 +3198,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "628", + "localId" : "655", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "629", + "localId" : "656", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "630", + "localId" : "657", "value" : 5, "unit" : "m", "type" : "Quantity" } ] } }, { - "localId" : "632", + "localId" : "659", "name" : "ALtB_Quantity", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "632", + "r" : "659", "s" : [ { "value" : [ "","define ","ALtB_Quantity",": " ] }, { - "r" : "633", + "r" : "660", "s" : [ { - "r" : "634", + "r" : "661", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "635", + "r" : "662", "s" : [ { "value" : [ "6 ","'m'" ] } ] @@ -2901,43 +3243,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "633", + "localId" : "660", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "634", + "localId" : "661", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "635", + "localId" : "662", "value" : 6, "unit" : "m", "type" : "Quantity" } ] } }, { - "localId" : "637", + "localId" : "664", "name" : "AGtB_Quantity_diff", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "637", + "r" : "664", "s" : [ { "value" : [ "","define ","AGtB_Quantity_diff",": " ] }, { - "r" : "638", + "r" : "665", "s" : [ { - "r" : "639", + "r" : "666", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "640", + "r" : "667", "s" : [ { "value" : [ "5 ","'cm'" ] } ] @@ -2946,43 +3288,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "638", + "localId" : "665", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "639", + "localId" : "666", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "640", + "localId" : "667", "value" : 5, "unit" : "cm", "type" : "Quantity" } ] } }, { - "localId" : "642", + "localId" : "669", "name" : "AEqB_Quantity_diff", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "642", + "r" : "669", "s" : [ { "value" : [ "","define ","AEqB_Quantity_diff",": " ] }, { - "r" : "643", + "r" : "670", "s" : [ { - "r" : "644", + "r" : "671", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "645", + "r" : "672", "s" : [ { "value" : [ "500 ","'cm'" ] } ] @@ -2991,43 +3333,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "643", + "localId" : "670", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "644", + "localId" : "671", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "645", + "localId" : "672", "value" : 500, "unit" : "cm", "type" : "Quantity" } ] } }, { - "localId" : "647", + "localId" : "674", "name" : "ALtB_Quantity_diff", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "647", + "r" : "674", "s" : [ { "value" : [ "","define ","ALtB_Quantity_diff",": " ] }, { - "r" : "648", + "r" : "675", "s" : [ { - "r" : "649", + "r" : "676", "s" : [ { "value" : [ "5 ","'m'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "650", + "r" : "677", "s" : [ { "value" : [ "5 ","'km'" ] } ] @@ -3036,43 +3378,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "648", + "localId" : "675", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "649", + "localId" : "676", "value" : 5, "unit" : "m", "type" : "Quantity" }, { - "localId" : "650", + "localId" : "677", "value" : 5, "unit" : "km", "type" : "Quantity" } ] } }, { - "localId" : "652", + "localId" : "679", "name" : "AGtB_Quantity_incompatible", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "652", + "r" : "679", "s" : [ { "value" : [ "","define ","AGtB_Quantity_incompatible",": " ] }, { - "r" : "653", + "r" : "680", "s" : [ { - "r" : "654", + "r" : "681", "s" : [ { "value" : [ "5 ","'Cel'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "655", + "r" : "682", "s" : [ { "value" : [ "4 ","'m'" ] } ] @@ -3081,43 +3423,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "653", + "localId" : "680", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "654", + "localId" : "681", "value" : 5, "unit" : "Cel", "type" : "Quantity" }, { - "localId" : "655", + "localId" : "682", "value" : 4, "unit" : "m", "type" : "Quantity" } ] } }, { - "localId" : "657", + "localId" : "684", "name" : "AEqB_Quantity_incompatible", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "657", + "r" : "684", "s" : [ { "value" : [ "","define ","AEqB_Quantity_incompatible",": " ] }, { - "r" : "658", + "r" : "685", "s" : [ { - "r" : "659", + "r" : "686", "s" : [ { "value" : [ "5 ","'Cel'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "660", + "r" : "687", "s" : [ { "value" : [ "5 ","'m'" ] } ] @@ -3126,43 +3468,43 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "658", + "localId" : "685", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "659", + "localId" : "686", "value" : 5, "unit" : "Cel", "type" : "Quantity" }, { - "localId" : "660", + "localId" : "687", "value" : 5, "unit" : "m", "type" : "Quantity" } ] } }, { - "localId" : "662", + "localId" : "689", "name" : "ALtB_Quantity_incompatible", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "662", + "r" : "689", "s" : [ { "value" : [ "","define ","ALtB_Quantity_incompatible",": " ] }, { - "r" : "663", + "r" : "690", "s" : [ { - "r" : "664", + "r" : "691", "s" : [ { "value" : [ "5 ","'Cel'" ] } ] }, { "value" : [ " ","="," " ] }, { - "r" : "665", + "r" : "692", "s" : [ { "value" : [ "40 ","'m'" ] } ] @@ -3171,45 +3513,45 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "663", + "localId" : "690", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "664", + "localId" : "691", "value" : 5, "unit" : "Cel", "type" : "Quantity" }, { - "localId" : "665", + "localId" : "692", "value" : 40, "unit" : "m", "type" : "Quantity" } ] } }, { - "localId" : "667", + "localId" : "694", "name" : "EqRatios", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "667", + "r" : "694", "s" : [ { "value" : [ "","define ","EqRatios",": " ] }, { - "r" : "668", + "r" : "695", "s" : [ { - "r" : "671", + "r" : "698", "s" : [ { - "r" : "669", + "r" : "696", "s" : [ { "value" : [ "10 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "670", + "r" : "697", "s" : [ { "value" : [ "2 ","'dL'" ] } ] @@ -3217,16 +3559,16 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "674", + "r" : "701", "s" : [ { - "r" : "672", + "r" : "699", "s" : [ { "value" : [ "15 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "673", + "r" : "700", "s" : [ { "value" : [ "3 ","'dL'" ] } ] @@ -3236,61 +3578,61 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "668", + "localId" : "695", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "671", + "localId" : "698", "type" : "Ratio", "numerator" : { - "localId" : "669", + "localId" : "696", "value" : 10, "unit" : "mg" }, "denominator" : { - "localId" : "670", + "localId" : "697", "value" : 2, "unit" : "dL" } }, { - "localId" : "674", + "localId" : "701", "type" : "Ratio", "numerator" : { - "localId" : "672", + "localId" : "699", "value" : 15, "unit" : "mg" }, "denominator" : { - "localId" : "673", + "localId" : "700", "value" : 3, "unit" : "dL" } } ] } }, { - "localId" : "676", + "localId" : "703", "name" : "UneqRatios", "context" : "Patient", "accessLevel" : "Public", "annotation" : [ { "type" : "Annotation", "s" : { - "r" : "676", + "r" : "703", "s" : [ { "value" : [ "","define ","UneqRatios",": " ] }, { - "r" : "677", + "r" : "704", "s" : [ { - "r" : "680", + "r" : "707", "s" : [ { - "r" : "678", + "r" : "705", "s" : [ { "value" : [ "10 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "679", + "r" : "706", "s" : [ { "value" : [ "2 ","'dL'" ] } ] @@ -3298,16 +3640,16 @@ module.exports['Equal'] = { }, { "value" : [ " ","="," " ] }, { - "r" : "683", + "r" : "710", "s" : [ { - "r" : "681", + "r" : "708", "s" : [ { "value" : [ "15 ","'mg'" ] } ] }, { "value" : [ " : " ] }, { - "r" : "682", + "r" : "709", "s" : [ { "value" : [ "4 ","'dL'" ] } ] @@ -3317,32 +3659,32 @@ module.exports['Equal'] = { } } ], "expression" : { - "localId" : "677", + "localId" : "704", "type" : "Equal", "signature" : [ ], "operand" : [ { - "localId" : "680", + "localId" : "707", "type" : "Ratio", "numerator" : { - "localId" : "678", + "localId" : "705", "value" : 10, "unit" : "mg" }, "denominator" : { - "localId" : "679", + "localId" : "706", "value" : 2, "unit" : "dL" } }, { - "localId" : "683", + "localId" : "710", "type" : "Ratio", "numerator" : { - "localId" : "681", + "localId" : "708", "value" : 15, "unit" : "mg" }, "denominator" : { - "localId" : "682", + "localId" : "709", "value" : 4, "unit" : "dL" } diff --git a/test/util/comparison-test.ts b/test/util/comparison-test.ts index efd5f7907..94b08dbdb 100644 --- a/test/util/comparison-test.ts +++ b/test/util/comparison-test.ts @@ -68,6 +68,15 @@ 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: 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(); }); it('should detect equality/inequality for classes', () => {