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/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/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 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..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 @@ -6,8 +6,7 @@ "type": "object", "required": [ "terminology_id", - "code_string", - "uri" + "code_string" ], "properties": { "terminology_id": { @@ -20,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/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/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/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..d8a6ab0 --- /dev/null +++ b/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json @@ -0,0 +1,31 @@ +{ + "$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", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "_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..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,13 +6,17 @@ "type": "object", "required": [ "original_author", - "lifecycle_state", - "parent_resource", - "details" + "lifecycle_state" ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "original_namespace": { + "type": "string" }, "other_contributors": { "type": "array", @@ -20,24 +24,53 @@ "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" }, - "other_details": { - "type": "object" + "ip_acknowledgements": { + "type": "object", + "additionalProperties": { + "type": "string" + } }, - "parent_resource": { - "type": "object" + "references": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "conversion_details": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "other_details": { + "type": "object", + "additionalProperties": { + "type": "string" + } }, "details": { - "type": "array", - "items": { + "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" - }, - "minItems": 1 + } }, "_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..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 @@ -6,8 +6,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -28,17 +27,20 @@ "misuse": { "type": "string" }, - "copyright": { - "type": "string" - }, "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 5d362c8..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,13 +13,22 @@ "$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" }, + "version_last_translated": { + "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..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,12 +7,14 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", "details" ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_contributors": { "type": "array", @@ -27,10 +29,10 @@ "type": "string" }, "other_details": { - "type": "object" - }, - "parent_resource": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "details": { "type": "array", 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..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 @@ -6,8 +6,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -34,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/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_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_QUANTITY.json b/components/RM/Release-1.0.3/Data_types/DV_QUANTITY.json index d4aadd6..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 @@ -6,7 +6,6 @@ "type": "object", "required": [ "magnitude", - "property", "units" ], "properties": { @@ -34,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.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.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json b/components/RM/Release-1.0.3/Ehr_extract/EXTRACT_ENTITY_MANIFEST.json index 4b3f810..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,7 +18,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "array", + "items": { + "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.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/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/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_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.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.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json b/components/RM/Release-1.0.4/Ehr_extract/GENERIC_CONTENT_ITEM.json index 7cbd77b..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,8 +668,8 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { + "type": "object", + "additionalProperties": { "type": "string" } }, 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/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/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_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/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/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..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,8 +668,8 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { + "type": "object", + "additionalProperties": { "type": "string" } }, 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 00f881b..ff317ff 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": { @@ -2972,12 +3068,14 @@ "required": [ "original_author", "lifecycle_state", - "parent_resource", "details" ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "other_contributors": { "type": "array", @@ -2992,10 +3090,10 @@ "type": "string" }, "other_details": { - "type": "object" - }, - "parent_resource": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "details": { "type": "array", @@ -5415,7 +5513,6 @@ "type": "object", "required": [ "magnitude", - "property", "units" ], "properties": { @@ -5443,9 +5540,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, @@ -6924,7 +7018,10 @@ "type": "string" }, "other_ids": { - "type": "object" + "type": "array", + "items": { + "type": "string" + } }, "item_list": { "type": "array", @@ -9043,8 +9140,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -9071,11 +9167,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", @@ -11876,7 +11978,10 @@ "type": "string" }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -13267,6 +13372,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -14774,13 +14880,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", @@ -15338,6 +15450,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -16473,7 +16586,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..49b29eb 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": { @@ -1075,50 +1171,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": [ @@ -3045,13 +3097,17 @@ "type": "object", "required": [ "original_author", - "lifecycle_state", - "parent_resource", - "details" + "lifecycle_state" ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "original_namespace": { + "type": "string" }, "other_contributors": { "type": "array", @@ -3059,24 +3115,53 @@ "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" }, - "other_details": { - "type": "object" + "ip_acknowledgements": { + "type": "object", + "additionalProperties": { + "type": "string" + } }, - "parent_resource": { - "type": "object" + "references": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "conversion_details": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "other_details": { + "type": "object", + "additionalProperties": { + "type": "string" + } }, "details": { - "type": "array", - "items": { + "type": "object", + "additionalProperties": { "$ref": "#/definitions/RESOURCE_DESCRIPTION_ITEM" - }, - "minItems": 1 + } }, "_type": { "type": "string", @@ -3085,6 +3170,31 @@ }, "additionalProperties": false }, + "RESOURCE_ANNOTATIONS": { + "type": "object", + "required": [ + "documentation" + ], + "properties": { + "documentation": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "_type": { + "type": "string", + "const": "RESOURCE_ANNOTATIONS" + } + }, + "additionalProperties": false + }, "EVALUATION": { "type": "object", "required": [ @@ -3855,22 +3965,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": [ @@ -5501,9 +5595,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, @@ -5804,17 +5895,6 @@ }, "additionalProperties": false }, - "URI": { - "type": "object", - "required": [ - ], - "properties": { - "_type": { - "type": "string", - "const": "URI" - } - } - }, "SYNC_EXTRACT": { "type": "object", "required": [ @@ -5958,8 +6038,7 @@ "type": "object", "required": [ "terminology_id", - "code_string", - "uri" + "code_string" ], "properties": { "terminology_id": { @@ -5972,7 +6051,8 @@ "type": "string" }, "uri": { - "$ref": "#/definitions/URI" + "type": "string", + "format": "uri-reference" }, "_type": { "type": "string", @@ -8744,6 +8824,7 @@ "DURATION": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -9293,8 +9374,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -9315,17 +9395,20 @@ "misuse": { "type": "string" }, - "copyright": { - "type": "string" - }, "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", @@ -10644,74 +10727,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" @@ -12064,8 +12079,8 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { + "type": "object", + "additionalProperties": { "type": "string" } }, @@ -12079,6 +12094,7 @@ "DATE": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -13057,6 +13073,7 @@ "DATE_TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -13490,6 +13507,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15017,13 +15035,22 @@ "$ref": "#/definitions/TERMINOLOGY_CODE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" }, + "version_last_translated": { + "type": "string" + }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -15398,6 +15425,7 @@ "TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15597,6 +15625,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -16731,7 +16760,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..58044c6 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": { @@ -1167,50 +1263,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": [ @@ -3137,13 +3189,17 @@ "type": "object", "required": [ "original_author", - "lifecycle_state", - "parent_resource", - "details" + "lifecycle_state" ], "properties": { "original_author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "original_namespace": { + "type": "string" }, "other_contributors": { "type": "array", @@ -3151,24 +3207,53 @@ "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" }, - "other_details": { - "type": "object" + "ip_acknowledgements": { + "type": "object", + "additionalProperties": { + "type": "string" + } }, - "parent_resource": { - "type": "object" + "references": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "conversion_details": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "other_details": { + "type": "object", + "additionalProperties": { + "type": "string" + } }, "details": { - "type": "array", - "items": { + "type": "object", + "additionalProperties": { "$ref": "#/definitions/RESOURCE_DESCRIPTION_ITEM" - }, - "minItems": 1 + } }, "_type": { "type": "string", @@ -3177,6 +3262,31 @@ }, "additionalProperties": false }, + "RESOURCE_ANNOTATIONS": { + "type": "object", + "required": [ + "documentation" + ], + "properties": { + "documentation": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "_type": { + "type": "string", + "const": "RESOURCE_ANNOTATIONS" + } + }, + "additionalProperties": false + }, "EVALUATION": { "type": "object", "required": [ @@ -3947,22 +4057,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": [ @@ -5664,9 +5758,6 @@ "magnitude": { "type": "number" }, - "property": { - "$ref": "#/definitions/CODE_PHRASE" - }, "units": { "type": "string" }, @@ -5973,17 +6064,6 @@ }, "additionalProperties": false }, - "URI": { - "type": "object", - "required": [ - ], - "properties": { - "_type": { - "type": "string", - "const": "URI" - } - } - }, "SYNC_EXTRACT": { "type": "object", "required": [ @@ -6127,8 +6207,7 @@ "type": "object", "required": [ "terminology_id", - "code_string", - "uri" + "code_string" ], "properties": { "terminology_id": { @@ -6141,7 +6220,8 @@ "type": "string" }, "uri": { - "$ref": "#/definitions/URI" + "type": "string", + "format": "uri-reference" }, "_type": { "type": "string", @@ -8982,6 +9062,7 @@ "DURATION": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -9531,8 +9612,7 @@ "type": "object", "required": [ "language", - "purpose", - "other_details" + "purpose" ], "properties": { "language": { @@ -9553,17 +9633,20 @@ "misuse": { "type": "string" }, - "copyright": { - "type": "string" - }, "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", @@ -12302,8 +12385,8 @@ "type": "string" }, "other_details": { - "type": "array", - "items": { + "type": "object", + "additionalProperties": { "type": "string" } }, @@ -12317,6 +12400,7 @@ "DATE": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -13295,6 +13379,7 @@ "DATE_TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -13728,6 +13813,7 @@ "DV_EHR_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15288,13 +15374,22 @@ "$ref": "#/definitions/TERMINOLOGY_CODE" }, "author": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "accreditation": { "type": "string" }, + "version_last_translated": { + "type": "string" + }, "other_details": { - "type": "object" + "type": "object", + "additionalProperties": { + "type": "string" + } }, "_type": { "type": "string", @@ -15669,6 +15764,7 @@ "TIME": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -15868,6 +15964,7 @@ "DV_URI": { "type": "object", "required": [ + "value" ], "properties": { "value": { @@ -17002,7 +17099,8 @@ "required": [ "archetype_node_id", "name", - "description" + "description", + "action_archetype_id" ], "properties": { "uid": {