From 7b912766258123b039e37d724c1e7e841518f2a1 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Wed, 23 Nov 2022 15:42:15 +0100 Subject: [PATCH 01/10] Changes after updating BMMs to the latest version --- .../Foundation_types/Cardinality.json | 30 ++ .../Release-1.1.0/Foundation_types/Date.json | 1 + .../Foundation_types/Date_time.json | 1 + .../Foundation_types/Duration.json | 1 + .../Multiplicity_interval.json | 40 +++ .../Foundation_types/Terminology_code.json | 3 +- .../Release-1.1.0/Foundation_types/Time.json | 1 + .../Resource/RESOURCE_ANNOTATIONS.json | 22 ++ .../Resource/RESOURCE_DESCRIPTION.json | 33 ++- .../Resource/RESOURCE_DESCRIPTION_ITEM.json | 6 +- .../Resource/TRANSLATION_DETAILS.json | 3 + .../Common/RESOURCE_DESCRIPTION_ITEM.json | 3 +- .../Release-1.0.3/Composition/ACTIVITY.json | 3 +- .../Release-1.0.3/Data_types/DV_QUANTITY.json | 1 - .../RM/Release-1.0.4/Common/FOLDER.json | 68 ----- .../Release-1.0.4/Composition/ACTIVITY.json | 3 +- .../Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 5 +- .../Ehr_extract/GENERIC_CONTENT_ITEM.json | 5 +- .../Release-1.1.0/Composition/ACTIVITY.json | 3 +- .../Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 5 +- .../Ehr_extract/GENERIC_CONTENT_ITEM.json | 5 +- components/openehr_rm_1.0.3_all.json | 7 +- components/openehr_rm_1.0.4_all.json | 264 ++++++++---------- components/openehr_rm_1.1.0_all.json | 196 +++++++------ 24 files changed, 367 insertions(+), 342 deletions(-) create mode 100644 components/BASE/Release-1.1.0/Foundation_types/Cardinality.json create mode 100644 components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json create mode 100644 components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json diff --git a/components/BASE/Release-1.1.0/Foundation_types/Cardinality.json b/components/BASE/Release-1.1.0/Foundation_types/Cardinality.json new file mode 100644 index 0000000..8d42db5 --- /dev/null +++ b/components/BASE/Release-1.1.0/Foundation_types/Cardinality.json @@ -0,0 +1,30 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Cardinality.json", + "definitions": { + "CARDINALITY": { + "type": "object", + "required": [ + "is_ordered", + "is_unique", + "interval" + ], + "properties": { + "is_ordered": { + "type": "boolean" + }, + "is_unique": { + "type": "boolean" + }, + "interval": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json#/definitions/MULTIPLICITY_INTERVAL" + }, + "_type": { + "type": "string", + "const": "CARDINALITY" + } + }, + "additionalProperties": false + } + } +} \ No newline at end of file diff --git a/components/BASE/Release-1.1.0/Foundation_types/Date.json b/components/BASE/Release-1.1.0/Foundation_types/Date.json index 843f496..6b22261 100644 --- a/components/BASE/Release-1.1.0/Foundation_types/Date.json +++ b/components/BASE/Release-1.1.0/Foundation_types/Date.json @@ -5,6 +5,7 @@ "DATE": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/BASE/Release-1.1.0/Foundation_types/Date_time.json b/components/BASE/Release-1.1.0/Foundation_types/Date_time.json index 6a5a5b6..761ea99 100644 --- a/components/BASE/Release-1.1.0/Foundation_types/Date_time.json +++ b/components/BASE/Release-1.1.0/Foundation_types/Date_time.json @@ -5,6 +5,7 @@ "DATE_TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/BASE/Release-1.1.0/Foundation_types/Duration.json b/components/BASE/Release-1.1.0/Foundation_types/Duration.json index 2a50c97..d7ebe7b 100644 --- a/components/BASE/Release-1.1.0/Foundation_types/Duration.json +++ b/components/BASE/Release-1.1.0/Foundation_types/Duration.json @@ -5,6 +5,7 @@ "DURATION": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json b/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json new file mode 100644 index 0000000..b2b5e42 --- /dev/null +++ b/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json @@ -0,0 +1,40 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json", + "definitions": { + "MULTIPLICITY_INTERVAL": { + "type": "object", + "required": [ + "lower_unbounded", + "upper_unbounded", + "lower_included", + "upper_included" + ], + "properties": { + "lower": { + "type": "object" + }, + "upper": { + "type": "object" + }, + "lower_unbounded": { + "type": "boolean" + }, + "upper_unbounded": { + "type": "boolean" + }, + "lower_included": { + "type": "boolean" + }, + "upper_included": { + "type": "boolean" + }, + "_type": { + "type": "string", + "const": "MULTIPLICITY_INTERVAL" + } + }, + "additionalProperties": false + } + } +} \ No newline at end of file diff --git a/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json b/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json index 0444d14..b8f1441 100644 --- a/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json +++ b/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json @@ -6,8 +6,7 @@ "type": "object", "required": [ "terminology_id", - "code_string", - "uri" + "code_string" ], "properties": { "terminology_id": { diff --git a/components/BASE/Release-1.1.0/Foundation_types/Time.json b/components/BASE/Release-1.1.0/Foundation_types/Time.json index 96c936e..2272c13 100644 --- a/components/BASE/Release-1.1.0/Foundation_types/Time.json +++ b/components/BASE/Release-1.1.0/Foundation_types/Time.json @@ -5,6 +5,7 @@ "TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json new file mode 100644 index 0000000..0a3831b --- /dev/null +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json @@ -0,0 +1,22 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json", + "definitions": { + "RESOURCE_ANNOTATIONS": { + "type": "object", + "required": [ + "documentation" + ], + "properties": { + "documentation": { + "type": "object" + }, + "_type": { + "type": "string", + "const": "RESOURCE_ANNOTATIONS" + } + }, + "additionalProperties": false + } + } +} \ No newline at end of file diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json index b635955..01ffd6d 100644 --- a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json @@ -7,25 +7,48 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", - "details" + "parent_resource" ], "properties": { "original_author": { "type": "object" }, + "original_namespace": { + "type": "string" + }, "other_contributors": { "type": "array", "items": { "type": "string" } }, + "custodian_namespace": { + "type": "string" + }, + "custodian_organisation": { + "type": "string" + }, + "copyright": { + "type": "string" + }, + "licence": { + "type": "string" + }, "lifecycle_state": { "type": "string" }, "resource_package_uri": { "type": "string" }, + "ip_acknowledgements": { + "type": "object" + }, + "references": { + "type": "object" + }, + "conversion_details": { + "type": "object" + }, "other_details": { "type": "object" }, @@ -33,11 +56,7 @@ "type": "object" }, "details": { - "type": "array", - "items": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json#/definitions/RESOURCE_DESCRIPTION_ITEM" - }, - "minItems": 1 + "type": "object" }, "_type": { "type": "string", diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json index 3526955..cfa3d1d 100644 --- a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json @@ -6,8 +6,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -28,9 +27,6 @@ "misuse": { "type": "string" }, - "copyright": { - "type": "string" - }, "original_resource_uri": { "type": "array", "items": { diff --git a/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json b/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json index 5d362c8..ab8aaf7 100644 --- a/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json +++ b/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json @@ -18,6 +18,9 @@ "accreditation": { "type": "string" }, + "version_last_translated": { + "type": "string" + }, "other_details": { "type": "object" }, diff --git a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json index 4fb731a..dacc388 100644 --- a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json +++ b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json @@ -6,8 +6,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { diff --git a/components/RM/Release-1.0.3/Composition/ACTIVITY.json b/components/RM/Release-1.0.3/Composition/ACTIVITY.json index adc96ed..c98f4ac 100644 --- a/components/RM/Release-1.0.3/Composition/ACTIVITY.json +++ b/components/RM/Release-1.0.3/Composition/ACTIVITY.json @@ -8,7 +8,8 @@ "archetype_node_id", "name", "description", - "timing" + "timing", + "action_archetype_id" ], "properties": { "uid": { diff --git a/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json b/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json index d4aadd6..e5c4978 100644 --- a/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json +++ b/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json @@ -6,7 +6,6 @@ "type": "object", "required": [ "magnitude", - "property", "units" ], "properties": { diff --git a/components/RM/Release-1.0.4/Common/FOLDER.json b/components/RM/Release-1.0.4/Common/FOLDER.json index 61f8b6d..145cbc0 100644 --- a/components/RM/Release-1.0.4/Common/FOLDER.json +++ b/components/RM/Release-1.0.4/Common/FOLDER.json @@ -223,74 +223,6 @@ ] } }, - "details": { - "allOf": [ - { - "required": [ - "_type" - ], - "properties": { - "_type": { - "type": "string", - "enum": [ - "ITEM_SINGLE", - "ITEM_TREE", - "ITEM_LIST", - "ITEM_TABLE" - ] - } - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_SINGLE" - } - } - }, - "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_SINGLE.json#/definitions/ITEM_SINGLE" - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_TREE" - } - } - }, - "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_TREE.json#/definitions/ITEM_TREE" - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_LIST" - } - } - }, - "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_LIST.json#/definitions/ITEM_LIST" - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_TABLE" - } - } - }, - "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" - } - } - ] - }, "_type": { "type": "string", "const": "FOLDER" diff --git a/components/RM/Release-1.0.4/Composition/ACTIVITY.json b/components/RM/Release-1.0.4/Composition/ACTIVITY.json index 81685b5..ba77f98 100644 --- a/components/RM/Release-1.0.4/Composition/ACTIVITY.json +++ b/components/RM/Release-1.0.4/Composition/ACTIVITY.json @@ -7,7 +7,8 @@ "required": [ "archetype_node_id", "name", - "description" + "description", + "action_archetype_id" ], "properties": { "uid": { diff --git a/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 5916b38..6be0487 100644 --- a/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,10 +18,7 @@ "type": "string" }, "other_ids": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "item_list": { "type": "array", diff --git a/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json b/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json index 7cbd77b..5757e2e 100644 --- a/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json +++ b/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json @@ -668,10 +668,7 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "_type": { "type": "string", diff --git a/components/RM/Release-1.1.0/Composition/ACTIVITY.json b/components/RM/Release-1.1.0/Composition/ACTIVITY.json index f56af50..32d279c 100644 --- a/components/RM/Release-1.1.0/Composition/ACTIVITY.json +++ b/components/RM/Release-1.1.0/Composition/ACTIVITY.json @@ -7,7 +7,8 @@ "required": [ "archetype_node_id", "name", - "description" + "description", + "action_archetype_id" ], "properties": { "uid": { diff --git a/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 99feba2..e7b1d58 100644 --- a/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,10 +18,7 @@ "type": "string" }, "other_ids": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "item_list": { "type": "array", diff --git a/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json b/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json index 40ac485..60ae21c 100644 --- a/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json +++ b/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json @@ -668,10 +668,7 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "_type": { "type": "string", diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index 00f881b..dc45502 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -5415,7 +5415,6 @@ "type": "object", "required": [ "magnitude", - "property", "units" ], "properties": { @@ -9043,8 +9042,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -16473,7 +16471,8 @@ "archetype_node_id", "name", "description", - "timing" + "timing", + "action_archetype_id" ], "properties": { "uid": { diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 34020f7..1ce2968 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -1075,50 +1075,6 @@ }, "additionalProperties": false }, - "ARCHETYPE_HRID": { - "type": "object", - "required": [ - "namespace", - "rm_publisher", - "rm_package", - "rm_class", - "concept_id", - "release_version", - "version_status", - "build_count" - ], - "properties": { - "namespace": { - "type": "string" - }, - "rm_publisher": { - "type": "string" - }, - "rm_package": { - "type": "string" - }, - "rm_class": { - "type": "string" - }, - "concept_id": { - "type": "string" - }, - "release_version": { - "type": "string" - }, - "version_status": { - "$ref": "#/definitions/VERSION_STATUS" - }, - "build_count": { - "type": "string" - }, - "_type": { - "type": "string", - "const": "ARCHETYPE_HRID" - } - }, - "additionalProperties": false - }, "PARTY_IDENTITY": { "type": "object", "required": [ @@ -3046,25 +3002,48 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", - "details" + "parent_resource" ], "properties": { "original_author": { "type": "object" }, + "original_namespace": { + "type": "string" + }, "other_contributors": { "type": "array", "items": { "type": "string" } }, + "custodian_namespace": { + "type": "string" + }, + "custodian_organisation": { + "type": "string" + }, + "copyright": { + "type": "string" + }, + "licence": { + "type": "string" + }, "lifecycle_state": { "type": "string" }, "resource_package_uri": { "type": "string" }, + "ip_acknowledgements": { + "type": "object" + }, + "references": { + "type": "object" + }, + "conversion_details": { + "type": "object" + }, "other_details": { "type": "object" }, @@ -3072,11 +3051,7 @@ "type": "object" }, "details": { - "type": "array", - "items": { - "$ref": "#/definitions/RESOURCE_DESCRIPTION_ITEM" - }, - "minItems": 1 + "type": "object" }, "_type": { "type": "string", @@ -3085,6 +3060,22 @@ }, "additionalProperties": false }, + "RESOURCE_ANNOTATIONS": { + "type": "object", + "required": [ + "documentation" + ], + "properties": { + "documentation": { + "type": "object" + }, + "_type": { + "type": "string", + "const": "RESOURCE_ANNOTATIONS" + } + }, + "additionalProperties": false + }, "EVALUATION": { "type": "object", "required": [ @@ -3855,22 +3846,6 @@ }, "additionalProperties": false }, - "ISO8601_TYPE": { - "type": "object", - "required": [ - ], - "properties": { - "value": { - "type": "string" - }, - "_type": { - "type": "string", - "const": "ISO8601_TYPE" - } - }, - "description": "Parent of ISO8601 types.", - "additionalProperties": false - }, "CONTRIBUTION": { "type": "object", "required": [ @@ -5958,8 +5933,7 @@ "type": "object", "required": [ "terminology_id", - "code_string", - "uri" + "code_string" ], "properties": { "terminology_id": { @@ -7016,10 +6990,7 @@ "type": "string" }, "other_ids": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "item_list": { "type": "array", @@ -8744,6 +8715,7 @@ "DURATION": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -9293,8 +9265,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -9315,9 +9286,6 @@ "misuse": { "type": "string" }, - "copyright": { - "type": "string" - }, "original_resource_uri": { "type": "array", "items": { @@ -10644,74 +10612,6 @@ ] } }, - "details": { - "allOf": [ - { - "required": [ - "_type" - ], - "properties": { - "_type": { - "type": "string", - "enum": [ - "ITEM_SINGLE", - "ITEM_TREE", - "ITEM_LIST", - "ITEM_TABLE" - ] - } - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_SINGLE" - } - } - }, - "then": { - "$ref": "#/definitions/ITEM_SINGLE" - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_TREE" - } - } - }, - "then": { - "$ref": "#/definitions/ITEM_TREE" - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_LIST" - } - } - }, - "then": { - "$ref": "#/definitions/ITEM_LIST" - } - }, - { - "if": { - "properties": { - "_type": { - "const": "ITEM_TABLE" - } - } - }, - "then": { - "$ref": "#/definitions/ITEM_TABLE" - } - } - ] - }, "_type": { "type": "string", "const": "FOLDER" @@ -11398,6 +11298,40 @@ }, "additionalProperties": false }, + "MULTIPLICITY_INTERVAL": { + "type": "object", + "required": [ + "lower_unbounded", + "upper_unbounded", + "lower_included", + "upper_included" + ], + "properties": { + "lower": { + "type": "object" + }, + "upper": { + "type": "object" + }, + "lower_unbounded": { + "type": "boolean" + }, + "upper_unbounded": { + "type": "boolean" + }, + "lower_included": { + "type": "boolean" + }, + "upper_included": { + "type": "boolean" + }, + "_type": { + "type": "string", + "const": "MULTIPLICITY_INTERVAL" + } + }, + "additionalProperties": false + }, "GENERIC_CONTENT_ITEM": { "type": "object", "required": [ @@ -12064,10 +11998,7 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "_type": { "type": "string", @@ -12079,6 +12010,7 @@ "DATE": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -13057,6 +12989,7 @@ "DATE_TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15006,6 +14939,30 @@ }, "additionalProperties": false }, + "CARDINALITY": { + "type": "object", + "required": [ + "is_ordered", + "is_unique", + "interval" + ], + "properties": { + "is_ordered": { + "type": "boolean" + }, + "is_unique": { + "type": "boolean" + }, + "interval": { + "$ref": "#/definitions/MULTIPLICITY_INTERVAL" + }, + "_type": { + "type": "string", + "const": "CARDINALITY" + } + }, + "additionalProperties": false + }, "TRANSLATION_DETAILS": { "type": "object", "required": [ @@ -15022,6 +14979,9 @@ "accreditation": { "type": "string" }, + "version_last_translated": { + "type": "string" + }, "other_details": { "type": "object" }, @@ -15398,6 +15358,7 @@ "TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -16731,7 +16692,8 @@ "required": [ "archetype_node_id", "name", - "description" + "description", + "action_archetype_id" ], "properties": { "uid": { diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index ed2b0a0..b86cbe4 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -1167,50 +1167,6 @@ }, "additionalProperties": false }, - "ARCHETYPE_HRID": { - "type": "object", - "required": [ - "namespace", - "rm_publisher", - "rm_package", - "rm_class", - "concept_id", - "release_version", - "version_status", - "build_count" - ], - "properties": { - "namespace": { - "type": "string" - }, - "rm_publisher": { - "type": "string" - }, - "rm_package": { - "type": "string" - }, - "rm_class": { - "type": "string" - }, - "concept_id": { - "type": "string" - }, - "release_version": { - "type": "string" - }, - "version_status": { - "$ref": "#/definitions/VERSION_STATUS" - }, - "build_count": { - "type": "string" - }, - "_type": { - "type": "string", - "const": "ARCHETYPE_HRID" - } - }, - "additionalProperties": false - }, "PARTY_IDENTITY": { "type": "object", "required": [ @@ -3138,25 +3094,48 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", - "details" + "parent_resource" ], "properties": { "original_author": { "type": "object" }, + "original_namespace": { + "type": "string" + }, "other_contributors": { "type": "array", "items": { "type": "string" } }, + "custodian_namespace": { + "type": "string" + }, + "custodian_organisation": { + "type": "string" + }, + "copyright": { + "type": "string" + }, + "licence": { + "type": "string" + }, "lifecycle_state": { "type": "string" }, "resource_package_uri": { "type": "string" }, + "ip_acknowledgements": { + "type": "object" + }, + "references": { + "type": "object" + }, + "conversion_details": { + "type": "object" + }, "other_details": { "type": "object" }, @@ -3164,11 +3143,7 @@ "type": "object" }, "details": { - "type": "array", - "items": { - "$ref": "#/definitions/RESOURCE_DESCRIPTION_ITEM" - }, - "minItems": 1 + "type": "object" }, "_type": { "type": "string", @@ -3177,6 +3152,22 @@ }, "additionalProperties": false }, + "RESOURCE_ANNOTATIONS": { + "type": "object", + "required": [ + "documentation" + ], + "properties": { + "documentation": { + "type": "object" + }, + "_type": { + "type": "string", + "const": "RESOURCE_ANNOTATIONS" + } + }, + "additionalProperties": false + }, "EVALUATION": { "type": "object", "required": [ @@ -3947,22 +3938,6 @@ }, "additionalProperties": false }, - "ISO8601_TYPE": { - "type": "object", - "required": [ - ], - "properties": { - "value": { - "type": "string" - }, - "_type": { - "type": "string", - "const": "ISO8601_TYPE" - } - }, - "description": "Parent of ISO8601 types.", - "additionalProperties": false - }, "CONTRIBUTION": { "type": "object", "required": [ @@ -6127,8 +6102,7 @@ "type": "object", "required": [ "terminology_id", - "code_string", - "uri" + "code_string" ], "properties": { "terminology_id": { @@ -7185,10 +7159,7 @@ "type": "string" }, "other_ids": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "item_list": { "type": "array", @@ -8982,6 +8953,7 @@ "DURATION": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -9531,8 +9503,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -9553,9 +9524,6 @@ "misuse": { "type": "string" }, - "copyright": { - "type": "string" - }, "original_resource_uri": { "type": "array", "items": { @@ -11636,6 +11604,40 @@ }, "additionalProperties": false }, + "MULTIPLICITY_INTERVAL": { + "type": "object", + "required": [ + "lower_unbounded", + "upper_unbounded", + "lower_included", + "upper_included" + ], + "properties": { + "lower": { + "type": "object" + }, + "upper": { + "type": "object" + }, + "lower_unbounded": { + "type": "boolean" + }, + "upper_unbounded": { + "type": "boolean" + }, + "lower_included": { + "type": "boolean" + }, + "upper_included": { + "type": "boolean" + }, + "_type": { + "type": "string", + "const": "MULTIPLICITY_INTERVAL" + } + }, + "additionalProperties": false + }, "GENERIC_CONTENT_ITEM": { "type": "object", "required": [ @@ -12302,10 +12304,7 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { - "type": "string" - } + "type": "object" }, "_type": { "type": "string", @@ -12317,6 +12316,7 @@ "DATE": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -13295,6 +13295,7 @@ "DATE_TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15277,6 +15278,30 @@ }, "additionalProperties": false }, + "CARDINALITY": { + "type": "object", + "required": [ + "is_ordered", + "is_unique", + "interval" + ], + "properties": { + "is_ordered": { + "type": "boolean" + }, + "is_unique": { + "type": "boolean" + }, + "interval": { + "$ref": "#/definitions/MULTIPLICITY_INTERVAL" + }, + "_type": { + "type": "string", + "const": "CARDINALITY" + } + }, + "additionalProperties": false + }, "TRANSLATION_DETAILS": { "type": "object", "required": [ @@ -15293,6 +15318,9 @@ "accreditation": { "type": "string" }, + "version_last_translated": { + "type": "string" + }, "other_details": { "type": "object" }, @@ -15669,6 +15697,7 @@ "TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -17002,7 +17031,8 @@ "required": [ "archetype_node_id", "name", - "description" + "description", + "action_archetype_id" ], "properties": { "uid": { From a4331c1fd7ec2c4c53506a29c828c53f22d0b811 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Wed, 23 Nov 2022 15:54:31 +0100 Subject: [PATCH 02/10] Add missing entry points to json schema --- components/RM/Release-1.0.3/main.json | 108 ++++++++++++++++++++++++-- components/RM/Release-1.0.4/main.json | 108 ++++++++++++++++++++++++-- components/RM/Release-1.1.0/main.json | 108 ++++++++++++++++++++++++-- components/openehr_rm_1.0.3_all.json | 108 ++++++++++++++++++++++++-- components/openehr_rm_1.0.4_all.json | 108 ++++++++++++++++++++++++-- components/openehr_rm_1.1.0_all.json | 108 ++++++++++++++++++++++++-- 6 files changed, 612 insertions(+), 36 deletions(-) diff --git a/components/RM/Release-1.0.3/main.json b/components/RM/Release-1.0.3/main.json index 5f87e79..ca4ecdb 100644 --- a/components/RM/Release-1.0.3/main.json +++ b/components/RM/Release-1.0.3/main.json @@ -155,36 +155,48 @@ "if": { "properties": { "_type": { - "const": "ADDRESS" + "const": "ROLE" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/ADDRESS.json#/definitions/ADDRESS" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/ROLE.json#/definitions/ROLE" } }, { "if": { "properties": { "_type": { - "const": "ROLE" + "const": "ORGANISATION" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/ROLE.json#/definitions/ROLE" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/ORGANISATION.json#/definitions/ORGANISATION" } }, { "if": { "properties": { "_type": { - "const": "ORGANISATION" + "const": "AGENT" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/ORGANISATION.json#/definitions/ORGANISATION" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/AGENT.json#/definitions/AGENT" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "GROUP" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Demographic/GROUP.json#/definitions/GROUP" } }, { @@ -270,6 +282,90 @@ "then": { "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Common/IMPORTED_VERSION.json#/definitions/IMPORTED_VERSION" } + }, + { + "if": { + "properties": { + "_type": { + "const": "HISTORY" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/HISTORY.json#/definitions/HISTORY" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_LIST" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/ITEM_LIST.json#/definitions/ITEM_LIST" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TREE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/ITEM_TREE.json#/definitions/ITEM_TREE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_SINGLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/ITEM_SINGLE.json#/definitions/ITEM_SINGLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ELEMENT" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_structures/ELEMENT.json#/definitions/ELEMENT" + } } ], "definitions": { diff --git a/components/RM/Release-1.0.4/main.json b/components/RM/Release-1.0.4/main.json index bb698ee..db5b2a9 100644 --- a/components/RM/Release-1.0.4/main.json +++ b/components/RM/Release-1.0.4/main.json @@ -155,36 +155,48 @@ "if": { "properties": { "_type": { - "const": "ADDRESS" + "const": "ROLE" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/ADDRESS.json#/definitions/ADDRESS" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/ROLE.json#/definitions/ROLE" } }, { "if": { "properties": { "_type": { - "const": "ROLE" + "const": "ORGANISATION" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/ROLE.json#/definitions/ROLE" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/ORGANISATION.json#/definitions/ORGANISATION" } }, { "if": { "properties": { "_type": { - "const": "ORGANISATION" + "const": "AGENT" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/ORGANISATION.json#/definitions/ORGANISATION" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/AGENT.json#/definitions/AGENT" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "GROUP" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Demographic/GROUP.json#/definitions/GROUP" } }, { @@ -270,6 +282,90 @@ "then": { "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Common/IMPORTED_VERSION.json#/definitions/IMPORTED_VERSION" } + }, + { + "if": { + "properties": { + "_type": { + "const": "HISTORY" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/HISTORY.json#/definitions/HISTORY" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_LIST" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_LIST.json#/definitions/ITEM_LIST" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TREE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_TREE.json#/definitions/ITEM_TREE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_SINGLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_SINGLE.json#/definitions/ITEM_SINGLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ELEMENT" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_structures/ELEMENT.json#/definitions/ELEMENT" + } } ], "definitions": { diff --git a/components/RM/Release-1.1.0/main.json b/components/RM/Release-1.1.0/main.json index c037335..c92e3e4 100644 --- a/components/RM/Release-1.1.0/main.json +++ b/components/RM/Release-1.1.0/main.json @@ -155,36 +155,48 @@ "if": { "properties": { "_type": { - "const": "ADDRESS" + "const": "ROLE" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/ADDRESS.json#/definitions/ADDRESS" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/ROLE.json#/definitions/ROLE" } }, { "if": { "properties": { "_type": { - "const": "ROLE" + "const": "ORGANISATION" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/ROLE.json#/definitions/ROLE" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/ORGANISATION.json#/definitions/ORGANISATION" } }, { "if": { "properties": { "_type": { - "const": "ORGANISATION" + "const": "AGENT" } } }, "then": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/ORGANISATION.json#/definitions/ORGANISATION" + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/AGENT.json#/definitions/AGENT" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "GROUP" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Demographic/GROUP.json#/definitions/GROUP" } }, { @@ -270,6 +282,90 @@ "then": { "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Common/IMPORTED_VERSION.json#/definitions/IMPORTED_VERSION" } + }, + { + "if": { + "properties": { + "_type": { + "const": "HISTORY" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/HISTORY.json#/definitions/HISTORY" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_LIST" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/ITEM_LIST.json#/definitions/ITEM_LIST" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TREE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/ITEM_TREE.json#/definitions/ITEM_TREE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_SINGLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/ITEM_SINGLE.json#/definitions/ITEM_SINGLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/ITEM_TABLE.json#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ELEMENT" + } + } + }, + "then": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_structures/ELEMENT.json#/definitions/ELEMENT" + } } ], "definitions": { diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index dc45502..552ba5b 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -155,36 +155,48 @@ "if": { "properties": { "_type": { - "const": "ADDRESS" + "const": "ROLE" } } }, "then": { - "$ref": "#/definitions/ADDRESS" + "$ref": "#/definitions/ROLE" } }, { "if": { "properties": { "_type": { - "const": "ROLE" + "const": "ORGANISATION" } } }, "then": { - "$ref": "#/definitions/ROLE" + "$ref": "#/definitions/ORGANISATION" } }, { "if": { "properties": { "_type": { - "const": "ORGANISATION" + "const": "AGENT" } } }, "then": { - "$ref": "#/definitions/ORGANISATION" + "$ref": "#/definitions/AGENT" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "GROUP" + } + } + }, + "then": { + "$ref": "#/definitions/GROUP" } }, { @@ -270,6 +282,90 @@ "then": { "$ref": "#/definitions/IMPORTED_VERSION" } + }, + { + "if": { + "properties": { + "_type": { + "const": "HISTORY" + } + } + }, + "then": { + "$ref": "#/definitions/HISTORY" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_LIST" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_LIST" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TREE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TREE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_SINGLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_SINGLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ELEMENT" + } + } + }, + "then": { + "$ref": "#/definitions/ELEMENT" + } } ], "definitions": { diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 1ce2968..d9d84c0 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -155,36 +155,48 @@ "if": { "properties": { "_type": { - "const": "ADDRESS" + "const": "ROLE" } } }, "then": { - "$ref": "#/definitions/ADDRESS" + "$ref": "#/definitions/ROLE" } }, { "if": { "properties": { "_type": { - "const": "ROLE" + "const": "ORGANISATION" } } }, "then": { - "$ref": "#/definitions/ROLE" + "$ref": "#/definitions/ORGANISATION" } }, { "if": { "properties": { "_type": { - "const": "ORGANISATION" + "const": "AGENT" } } }, "then": { - "$ref": "#/definitions/ORGANISATION" + "$ref": "#/definitions/AGENT" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "GROUP" + } + } + }, + "then": { + "$ref": "#/definitions/GROUP" } }, { @@ -270,6 +282,90 @@ "then": { "$ref": "#/definitions/IMPORTED_VERSION" } + }, + { + "if": { + "properties": { + "_type": { + "const": "HISTORY" + } + } + }, + "then": { + "$ref": "#/definitions/HISTORY" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_LIST" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_LIST" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TREE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TREE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_SINGLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_SINGLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ELEMENT" + } + } + }, + "then": { + "$ref": "#/definitions/ELEMENT" + } } ], "definitions": { diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index b86cbe4..88325fb 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -155,36 +155,48 @@ "if": { "properties": { "_type": { - "const": "ADDRESS" + "const": "ROLE" } } }, "then": { - "$ref": "#/definitions/ADDRESS" + "$ref": "#/definitions/ROLE" } }, { "if": { "properties": { "_type": { - "const": "ROLE" + "const": "ORGANISATION" } } }, "then": { - "$ref": "#/definitions/ROLE" + "$ref": "#/definitions/ORGANISATION" } }, { "if": { "properties": { "_type": { - "const": "ORGANISATION" + "const": "AGENT" } } }, "then": { - "$ref": "#/definitions/ORGANISATION" + "$ref": "#/definitions/AGENT" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "GROUP" + } + } + }, + "then": { + "$ref": "#/definitions/GROUP" } }, { @@ -270,6 +282,90 @@ "then": { "$ref": "#/definitions/IMPORTED_VERSION" } + }, + { + "if": { + "properties": { + "_type": { + "const": "HISTORY" + } + } + }, + "then": { + "$ref": "#/definitions/HISTORY" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_LIST" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_LIST" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TREE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TREE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_SINGLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_SINGLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ITEM_TABLE" + } + } + }, + "then": { + "$ref": "#/definitions/ITEM_TABLE" + } + }, + { + "if": { + "properties": { + "_type": { + "const": "ELEMENT" + } + } + }, + "then": { + "$ref": "#/definitions/ELEMENT" + } } ], "definitions": { From e2d3d05bbbc4a436050856d62326d6bc6bb6fa03 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Wed, 23 Nov 2022 16:00:02 +0100 Subject: [PATCH 03/10] Remove property attribute from DV_QUANTITY --- components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json | 3 --- components/RM/Release-1.0.4/Data_types/DV_QUANTITY.json | 3 --- components/RM/Release-1.1.0/Data_types/DV_QUANTITY.json | 3 --- components/openehr_rm_1.0.3_all.json | 3 --- components/openehr_rm_1.0.4_all.json | 3 --- components/openehr_rm_1.1.0_all.json | 3 --- 6 files changed, 18 deletions(-) diff --git a/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json b/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json index e5c4978..809acdc 100644 --- a/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json +++ b/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json @@ -33,9 +33,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_types/CODE_PHRASE.json#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, diff --git a/components/RM/Release-1.0.4/Data_types/DV_QUANTITY.json b/components/RM/Release-1.0.4/Data_types/DV_QUANTITY.json index 2434a74..9d4ac89 100644 --- a/components/RM/Release-1.0.4/Data_types/DV_QUANTITY.json +++ b/components/RM/Release-1.0.4/Data_types/DV_QUANTITY.json @@ -33,9 +33,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.4/Data_types/CODE_PHRASE.json#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, diff --git a/components/RM/Release-1.1.0/Data_types/DV_QUANTITY.json b/components/RM/Release-1.1.0/Data_types/DV_QUANTITY.json index 84c655d..e32692d 100644 --- a/components/RM/Release-1.1.0/Data_types/DV_QUANTITY.json +++ b/components/RM/Release-1.1.0/Data_types/DV_QUANTITY.json @@ -33,9 +33,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.1.0/Data_types/CODE_PHRASE.json#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index 552ba5b..8d1193d 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -5538,9 +5538,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index d9d84c0..3fa36b9 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -5572,9 +5572,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index 88325fb..369801a 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -5735,9 +5735,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, From b7ded78c0581fd4f024842bd7f3489c5458e2b1a Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Thu, 24 Nov 2022 13:36:51 +0100 Subject: [PATCH 04/10] Fix hash-references in json schema --- .../Resource/RESOURCE_ANNOTATIONS.json | 11 ++- .../Resource/RESOURCE_DESCRIPTION.json | 30 ++++++-- .../Resource/RESOURCE_DESCRIPTION_ITEM.json | 10 ++- .../Resource/TRANSLATION_DETAILS.json | 10 ++- .../Common/RESOURCE_DESCRIPTION.json | 10 ++- .../Common/RESOURCE_DESCRIPTION_ITEM.json | 10 ++- .../Common/TRANSLATION_DETAILS.json | 10 ++- .../Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 5 +- .../Ehr_extract/GENERIC_CONTENT_ITEM.json | 5 +- .../Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 5 +- .../Ehr_extract/GENERIC_CONTENT_ITEM.json | 5 +- .../Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 5 +- .../Ehr_extract/GENERIC_CONTENT_ITEM.json | 5 +- components/openehr_rm_1.0.3_all.json | 40 ++++++++--- components/openehr_rm_1.0.4_all.json | 71 +++++++++++++++---- components/openehr_rm_1.1.0_all.json | 71 +++++++++++++++---- 16 files changed, 246 insertions(+), 57 deletions(-) diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json index 0a3831b..d8a6ab0 100644 --- a/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json @@ -9,7 +9,16 @@ ], "properties": { "documentation": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } }, "_type": { "type": "string", diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json index 01ffd6d..07bceb1 100644 --- a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json @@ -11,7 +11,10 @@ ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "original_namespace": { "type": "string" @@ -41,22 +44,37 @@ "type": "string" }, "ip_acknowledgements": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "references": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "conversion_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "parent_resource": { "type": "object" }, "details": { - "type": "object" + "type": "object", + "additionalProperties": { + "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json#/definitions/RESOURCE_DESCRIPTION_ITEM" + } }, "_type": { "type": "string", diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json index cfa3d1d..b8506ee 100644 --- a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json @@ -30,11 +30,17 @@ "original_resource_uri": { "type": "array", "items": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json b/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json index ab8aaf7..6f41967 100644 --- a/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json +++ b/components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json @@ -13,7 +13,10 @@ "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json#/definitions/TERMINOLOGY_CODE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" @@ -22,7 +25,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json index b7722f8..da7c64f 100644 --- a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json +++ b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json @@ -12,7 +12,10 @@ ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_contributors": { "type": "array", @@ -27,7 +30,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "parent_resource": { "type": "object" diff --git a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json index dacc388..492bc3c 100644 --- a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json +++ b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION_ITEM.json @@ -33,11 +33,17 @@ "original_resource_uri": { "type": "array", "items": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/RM/Release-1.0.3/Common/TRANSLATION_DETAILS.json b/components/RM/Release-1.0.3/Common/TRANSLATION_DETAILS.json index eafd5e3..e6b1d52 100644 --- a/components/RM/Release-1.0.3/Common/TRANSLATION_DETAILS.json +++ b/components/RM/Release-1.0.3/Common/TRANSLATION_DETAILS.json @@ -13,13 +13,19 @@ "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/RM/Release-1.0.3/Data_types/CODE_PHRASE.json#/definitions/CODE_PHRASE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 4b3f810..b6dd6d3 100644 --- a/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,7 +18,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "item_list": { "type": "array", diff --git a/components/RM/Release-1.0.3/Ehr_extract/GENERIC_CONTENT_ITEM.json b/components/RM/Release-1.0.3/Ehr_extract/GENERIC_CONTENT_ITEM.json index 149bb51..a91029a 100644 --- a/components/RM/Release-1.0.3/Ehr_extract/GENERIC_CONTENT_ITEM.json +++ b/components/RM/Release-1.0.3/Ehr_extract/GENERIC_CONTENT_ITEM.json @@ -668,7 +668,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 6be0487..79534e7 100644 --- a/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,7 +18,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "item_list": { "type": "array", diff --git a/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json b/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json index 5757e2e..d9142d6 100644 --- a/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json +++ b/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json @@ -668,7 +668,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index e7b1d58..1d367a6 100644 --- a/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,7 +18,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "item_list": { "type": "array", diff --git a/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json b/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json index 60ae21c..f70b7d2 100644 --- a/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json +++ b/components/RM/Release-1.1.0/Ehr_extract/GENERIC_CONTENT_ITEM.json @@ -668,7 +668,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index 8d1193d..5f00e42 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -3073,7 +3073,10 @@ ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_contributors": { "type": "array", @@ -3088,7 +3091,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "parent_resource": { "type": "object" @@ -7016,7 +7022,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "item_list": { "type": "array", @@ -9162,11 +9171,17 @@ "original_resource_uri": { "type": "array", "items": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -11967,7 +11982,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -14865,13 +14883,19 @@ "$ref": "#/definitions/CODE_PHRASE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 3fa36b9..13df84a 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -3102,7 +3102,10 @@ ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "original_namespace": { "type": "string" @@ -3132,22 +3135,37 @@ "type": "string" }, "ip_acknowledgements": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "references": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "conversion_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "parent_resource": { "type": "object" }, "details": { - "type": "object" + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/RESOURCE_DESCRIPTION_ITEM" + } }, "_type": { "type": "string", @@ -3163,7 +3181,16 @@ ], "properties": { "documentation": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } }, "_type": { "type": "string", @@ -7083,7 +7110,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "item_list": { "type": "array", @@ -9382,11 +9412,17 @@ "original_resource_uri": { "type": "array", "items": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -12091,7 +12127,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -15067,7 +15106,10 @@ "$ref": "#/definitions/TERMINOLOGY_CODE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" @@ -15076,7 +15118,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index 369801a..5bb23ee 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -3194,7 +3194,10 @@ ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "original_namespace": { "type": "string" @@ -3224,22 +3227,37 @@ "type": "string" }, "ip_acknowledgements": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "references": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "conversion_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "parent_resource": { "type": "object" }, "details": { - "type": "object" + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/RESOURCE_DESCRIPTION_ITEM" + } }, "_type": { "type": "string", @@ -3255,7 +3273,16 @@ ], "properties": { "documentation": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } }, "_type": { "type": "string", @@ -7252,7 +7279,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "item_list": { "type": "array", @@ -9620,11 +9650,17 @@ "original_resource_uri": { "type": "array", "items": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } } }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -12397,7 +12433,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -15406,7 +15445,10 @@ "$ref": "#/definitions/TERMINOLOGY_CODE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" @@ -15415,7 +15457,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", From 194cc4750b295f32d599f915f9996c8b79b54ac7 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Thu, 24 Nov 2022 16:37:11 +0100 Subject: [PATCH 05/10] Remove two now unused types in BASE --- .../Base_types/ARCHETYPE_HRID.json | 50 ------------------- .../Foundation_types/Iso8601_type.json | 22 -------- 2 files changed, 72 deletions(-) delete mode 100644 components/BASE/Release-1.1.0/Base_types/ARCHETYPE_HRID.json delete mode 100644 components/BASE/Release-1.1.0/Foundation_types/Iso8601_type.json diff --git a/components/BASE/Release-1.1.0/Base_types/ARCHETYPE_HRID.json b/components/BASE/Release-1.1.0/Base_types/ARCHETYPE_HRID.json deleted file mode 100644 index 3f4902e..0000000 --- a/components/BASE/Release-1.1.0/Base_types/ARCHETYPE_HRID.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Base_types/ARCHETYPE_HRID.json", - "definitions": { - "ARCHETYPE_HRID": { - "type": "object", - "required": [ - "namespace", - "rm_publisher", - "rm_package", - "rm_class", - "concept_id", - "release_version", - "version_status", - "build_count" - ], - "properties": { - "namespace": { - "type": "string" - }, - "rm_publisher": { - "type": "string" - }, - "rm_package": { - "type": "string" - }, - "rm_class": { - "type": "string" - }, - "concept_id": { - "type": "string" - }, - "release_version": { - "type": "string" - }, - "version_status": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Base_types/VERSION_STATUS.json#/definitions/VERSION_STATUS" - }, - "build_count": { - "type": "string" - }, - "_type": { - "type": "string", - "const": "ARCHETYPE_HRID" - } - }, - "additionalProperties": false - } - } -} \ No newline at end of file diff --git a/components/BASE/Release-1.1.0/Foundation_types/Iso8601_type.json b/components/BASE/Release-1.1.0/Foundation_types/Iso8601_type.json deleted file mode 100644 index a44724d..0000000 --- a/components/BASE/Release-1.1.0/Foundation_types/Iso8601_type.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Iso8601_type.json", - "definitions": { - "ISO8601_TYPE": { - "type": "object", - "required": [ - ], - "properties": { - "value": { - "type": "string" - }, - "_type": { - "type": "string", - "const": "ISO8601_TYPE" - } - }, - "description": "Parent of ISO8601 types.", - "additionalProperties": false - } - } -} \ No newline at end of file From 517700d7c1cfee0c55cb087c202f005d04a02ff7 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Thu, 24 Nov 2022 16:45:37 +0100 Subject: [PATCH 06/10] Make DV_URI/DV_EHR_URI.value required --- components/RM/Release-1.0.3/Data_types/DV_EHR_URI.json | 1 + components/RM/Release-1.0.3/Data_types/DV_URI.json | 1 + components/RM/Release-1.0.4/Data_types/DV_EHR_URI.json | 1 + components/RM/Release-1.0.4/Data_types/DV_URI.json | 1 + components/RM/Release-1.1.0/Data_types/DV_EHR_URI.json | 1 + components/RM/Release-1.1.0/Data_types/DV_URI.json | 1 + components/openehr_rm_1.0.3_all.json | 2 ++ components/openehr_rm_1.0.4_all.json | 2 ++ components/openehr_rm_1.1.0_all.json | 2 ++ 9 files changed, 12 insertions(+) diff --git a/components/RM/Release-1.0.3/Data_types/DV_EHR_URI.json b/components/RM/Release-1.0.3/Data_types/DV_EHR_URI.json index 09eaa23..eb12f9c 100644 --- a/components/RM/Release-1.0.3/Data_types/DV_EHR_URI.json +++ b/components/RM/Release-1.0.3/Data_types/DV_EHR_URI.json @@ -5,6 +5,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/RM/Release-1.0.3/Data_types/DV_URI.json b/components/RM/Release-1.0.3/Data_types/DV_URI.json index 1cc05dd..67a2f79 100644 --- a/components/RM/Release-1.0.3/Data_types/DV_URI.json +++ b/components/RM/Release-1.0.3/Data_types/DV_URI.json @@ -5,6 +5,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/RM/Release-1.0.4/Data_types/DV_EHR_URI.json b/components/RM/Release-1.0.4/Data_types/DV_EHR_URI.json index 5d0e1a3..9c099e8 100644 --- a/components/RM/Release-1.0.4/Data_types/DV_EHR_URI.json +++ b/components/RM/Release-1.0.4/Data_types/DV_EHR_URI.json @@ -5,6 +5,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/RM/Release-1.0.4/Data_types/DV_URI.json b/components/RM/Release-1.0.4/Data_types/DV_URI.json index 80c23cf..82a9366 100644 --- a/components/RM/Release-1.0.4/Data_types/DV_URI.json +++ b/components/RM/Release-1.0.4/Data_types/DV_URI.json @@ -5,6 +5,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/RM/Release-1.1.0/Data_types/DV_EHR_URI.json b/components/RM/Release-1.1.0/Data_types/DV_EHR_URI.json index 3544b40..eade728 100644 --- a/components/RM/Release-1.1.0/Data_types/DV_EHR_URI.json +++ b/components/RM/Release-1.1.0/Data_types/DV_EHR_URI.json @@ -5,6 +5,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/RM/Release-1.1.0/Data_types/DV_URI.json b/components/RM/Release-1.1.0/Data_types/DV_URI.json index 944a912..ecc4b54 100644 --- a/components/RM/Release-1.1.0/Data_types/DV_URI.json +++ b/components/RM/Release-1.1.0/Data_types/DV_URI.json @@ -5,6 +5,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index 5f00e42..47d020b 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -13376,6 +13376,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15453,6 +15454,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 13df84a..7796f53 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -13555,6 +13555,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15696,6 +15697,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index 5bb23ee..15c1f52 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -13861,6 +13861,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -16035,6 +16036,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { From 163ccfcdef1bfd137f9518e1c0d99e706e3bc192 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Thu, 24 Nov 2022 16:51:08 +0100 Subject: [PATCH 07/10] Replace the URI class with a string formatted as uri-reference --- .../Foundation_types/Terminology_code.json | 3 ++- .../Release-1.1.0/Foundation_types/Uri.json | 17 ----------------- components/openehr_rm_1.0.4_all.json | 14 ++------------ components/openehr_rm_1.1.0_all.json | 14 ++------------ 4 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 components/BASE/Release-1.1.0/Foundation_types/Uri.json diff --git a/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json b/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json index b8f1441..a4b7e5c 100644 --- a/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json +++ b/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json @@ -19,7 +19,8 @@ "type": "string" }, "uri": { - "$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Uri.json#/definitions/URI" + "type": "string", + "format": "uri-reference" }, "_type": { "type": "string", diff --git a/components/BASE/Release-1.1.0/Foundation_types/Uri.json b/components/BASE/Release-1.1.0/Foundation_types/Uri.json deleted file mode 100644 index a2b352c..0000000 --- a/components/BASE/Release-1.1.0/Foundation_types/Uri.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Uri.json", - "definitions": { - "URI": { - "type": "object", - "required": [ - ], - "properties": { - "_type": { - "type": "string", - "const": "URI" - } - } - } - } -} \ No newline at end of file diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 7796f53..a48cb59 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -5899,17 +5899,6 @@ }, "additionalProperties": false }, - "URI": { - "type": "object", - "required": [ - ], - "properties": { - "_type": { - "type": "string", - "const": "URI" - } - } - }, "SYNC_EXTRACT": { "type": "object", "required": [ @@ -6066,7 +6055,8 @@ "type": "string" }, "uri": { - "$ref": "#/definitions/URI" + "type": "string", + "format": "uri-reference" }, "_type": { "type": "string", diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index 15c1f52..33b23b0 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -6068,17 +6068,6 @@ }, "additionalProperties": false }, - "URI": { - "type": "object", - "required": [ - ], - "properties": { - "_type": { - "type": "string", - "const": "URI" - } - } - }, "SYNC_EXTRACT": { "type": "object", "required": [ @@ -6235,7 +6224,8 @@ "type": "string" }, "uri": { - "$ref": "#/definitions/URI" + "type": "string", + "format": "uri-reference" }, "_type": { "type": "string", From 8dae5556cb98fdb7e1ad889d3efb355cfe1709aa Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Tue, 29 Nov 2022 16:01:39 +0100 Subject: [PATCH 08/10] Fix EXTRACT_ENTITY_MANIFEST.other_ids to be an array of strings --- .../RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 4 ++-- .../RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 4 ++-- .../RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json | 4 ++-- components/openehr_rm_1.0.3_all.json | 4 ++-- components/openehr_rm_1.0.4_all.json | 4 ++-- components/openehr_rm_1.1.0_all.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index b6dd6d3..059f998 100644 --- a/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,8 +18,8 @@ "type": "string" }, "other_ids": { - "type": "object", - "additionalProperties": { + "type": "array", + "items": { "type": "string" } }, diff --git a/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 79534e7..5916b38 100644 --- a/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.0.4/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,8 +18,8 @@ "type": "string" }, "other_ids": { - "type": "object", - "additionalProperties": { + "type": "array", + "items": { "type": "string" } }, diff --git a/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 1d367a6..99feba2 100644 --- a/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json +++ b/components/RM/Release-1.1.0/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json @@ -18,8 +18,8 @@ "type": "string" }, "other_ids": { - "type": "object", - "additionalProperties": { + "type": "array", + "items": { "type": "string" } }, diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index 47d020b..4b947fa 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -7022,8 +7022,8 @@ "type": "string" }, "other_ids": { - "type": "object", - "additionalProperties": { + "type": "array", + "items": { "type": "string" } }, diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index a48cb59..4768d8d 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -7100,8 +7100,8 @@ "type": "string" }, "other_ids": { - "type": "object", - "additionalProperties": { + "type": "array", + "items": { "type": "string" } }, diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index 33b23b0..b4c6409 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -7269,8 +7269,8 @@ "type": "string" }, "other_ids": { - "type": "object", - "additionalProperties": { + "type": "array", + "items": { "type": "string" } }, From 71ea8db618c73604deda99f4ba0e56687afc385d Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Tue, 29 Nov 2022 16:19:32 +0100 Subject: [PATCH 09/10] Remove CARDINALITY and MULTIPLICITY_INTERVAL from RM - they are AOM classes --- components/openehr_rm_1.0.4_all.json | 58 ---------------------------- components/openehr_rm_1.1.0_all.json | 58 ---------------------------- 2 files changed, 116 deletions(-) diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 4768d8d..02e09c2 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -11417,40 +11417,6 @@ }, "additionalProperties": false }, - "MULTIPLICITY_INTERVAL": { - "type": "object", - "required": [ - "lower_unbounded", - "upper_unbounded", - "lower_included", - "upper_included" - ], - "properties": { - "lower": { - "type": "object" - }, - "upper": { - "type": "object" - }, - "lower_unbounded": { - "type": "boolean" - }, - "upper_unbounded": { - "type": "boolean" - }, - "lower_included": { - "type": "boolean" - }, - "upper_included": { - "type": "boolean" - }, - "_type": { - "type": "string", - "const": "MULTIPLICITY_INTERVAL" - } - }, - "additionalProperties": false - }, "GENERIC_CONTENT_ITEM": { "type": "object", "required": [ @@ -15062,30 +15028,6 @@ }, "additionalProperties": false }, - "CARDINALITY": { - "type": "object", - "required": [ - "is_ordered", - "is_unique", - "interval" - ], - "properties": { - "is_ordered": { - "type": "boolean" - }, - "is_unique": { - "type": "boolean" - }, - "interval": { - "$ref": "#/definitions/MULTIPLICITY_INTERVAL" - }, - "_type": { - "type": "string", - "const": "CARDINALITY" - } - }, - "additionalProperties": false - }, "TRANSLATION_DETAILS": { "type": "object", "required": [ diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index b4c6409..e7713c6 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -11723,40 +11723,6 @@ }, "additionalProperties": false }, - "MULTIPLICITY_INTERVAL": { - "type": "object", - "required": [ - "lower_unbounded", - "upper_unbounded", - "lower_included", - "upper_included" - ], - "properties": { - "lower": { - "type": "object" - }, - "upper": { - "type": "object" - }, - "lower_unbounded": { - "type": "boolean" - }, - "upper_unbounded": { - "type": "boolean" - }, - "lower_included": { - "type": "boolean" - }, - "upper_included": { - "type": "boolean" - }, - "_type": { - "type": "string", - "const": "MULTIPLICITY_INTERVAL" - } - }, - "additionalProperties": false - }, "GENERIC_CONTENT_ITEM": { "type": "object", "required": [ @@ -15401,30 +15367,6 @@ }, "additionalProperties": false }, - "CARDINALITY": { - "type": "object", - "required": [ - "is_ordered", - "is_unique", - "interval" - ], - "properties": { - "is_ordered": { - "type": "boolean" - }, - "is_unique": { - "type": "boolean" - }, - "interval": { - "$ref": "#/definitions/MULTIPLICITY_INTERVAL" - }, - "_type": { - "type": "string", - "const": "CARDINALITY" - } - }, - "additionalProperties": false - }, "TRANSLATION_DETAILS": { "type": "object", "required": [ From 794e3a033ba54d020b3c0341e1eca5b741736ce3 Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Tue, 29 Nov 2022 16:24:09 +0100 Subject: [PATCH 10/10] Remove RESOURCE_DESCRIPTION.parent_resource from json schema --- .../BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json | 6 +----- .../RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json | 4 ---- components/openehr_rm_1.0.3_all.json | 4 ---- components/openehr_rm_1.0.4_all.json | 6 +----- components/openehr_rm_1.1.0_all.json | 6 +----- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json index 07bceb1..8fc6472 100644 --- a/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json @@ -6,8 +6,7 @@ "type": "object", "required": [ "original_author", - "lifecycle_state", - "parent_resource" + "lifecycle_state" ], "properties": { "original_author": { @@ -67,9 +66,6 @@ "type": "string" } }, - "parent_resource": { - "type": "object" - }, "details": { "type": "object", "additionalProperties": { diff --git a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json index da7c64f..deaceff 100644 --- a/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json +++ b/components/RM/Release-1.0.3/Common/RESOURCE_DESCRIPTION.json @@ -7,7 +7,6 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", "details" ], "properties": { @@ -35,9 +34,6 @@ "type": "string" } }, - "parent_resource": { - "type": "object" - }, "details": { "type": "array", "items": { diff --git a/components/openehr_rm_1.0.3_all.json b/components/openehr_rm_1.0.3_all.json index 4b947fa..ff317ff 100644 --- a/components/openehr_rm_1.0.3_all.json +++ b/components/openehr_rm_1.0.3_all.json @@ -3068,7 +3068,6 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", "details" ], "properties": { @@ -3096,9 +3095,6 @@ "type": "string" } }, - "parent_resource": { - "type": "object" - }, "details": { "type": "array", "items": { diff --git a/components/openehr_rm_1.0.4_all.json b/components/openehr_rm_1.0.4_all.json index 02e09c2..49b29eb 100644 --- a/components/openehr_rm_1.0.4_all.json +++ b/components/openehr_rm_1.0.4_all.json @@ -3097,8 +3097,7 @@ "type": "object", "required": [ "original_author", - "lifecycle_state", - "parent_resource" + "lifecycle_state" ], "properties": { "original_author": { @@ -3158,9 +3157,6 @@ "type": "string" } }, - "parent_resource": { - "type": "object" - }, "details": { "type": "object", "additionalProperties": { diff --git a/components/openehr_rm_1.1.0_all.json b/components/openehr_rm_1.1.0_all.json index e7713c6..58044c6 100644 --- a/components/openehr_rm_1.1.0_all.json +++ b/components/openehr_rm_1.1.0_all.json @@ -3189,8 +3189,7 @@ "type": "object", "required": [ "original_author", - "lifecycle_state", - "parent_resource" + "lifecycle_state" ], "properties": { "original_author": { @@ -3250,9 +3249,6 @@ "type": "string" } }, - "parent_resource": { - "type": "object" - }, "details": { "type": "object", "additionalProperties": {