diff --git a/cdaxehealth-model/src/main/resources/cdaxehealth/datatypes.xml b/cdaxehealth-model/src/main/resources/cdaxehealth/datatypes.xml
index fdbb29273981c81714539a78f2c0873b4cb128f1..ec5c4e101d523fb1b5b91ea03601284de974ab7e 100644
--- a/cdaxehealth-model/src/main/resources/cdaxehealth/datatypes.xml
+++ b/cdaxehealth-model/src/main/resources/cdaxehealth/datatypes.xml
@@ -16,7 +16,7 @@
<datatype>CV</datatype>
<datatype>CO</datatype>
<datatype>PQR</datatype>
-<!-- <datatype>EIVL.event</datatype> -->
+ <datatype>EIVL.event</datatype>
<datatype>CR</datatype>
<datatype>CS</datatype>
<datatype>EN</datatype>
@@ -87,6 +87,21 @@
<datatype>TEL.AT</datatype>
<datatype>TEL.EPSOS</datatype>
<datatype>URL.NL.EXTENDED</datatype>
+ <datatype>CD.IPS</datatype>
+ <datatype>CV.IPS</datatype>
+ <datatype>CE.IPS</datatype>
+ <datatype>BXITCD.IPS</datatype>
+ <datatype>EIVLEvent.IPS</datatype>
+ <datatype>HXITCE.IPS</datatype>
+ <datatype>II.IPS</datatype>
+ <datatype>PQR.IPS</datatype>
+ <datatype>CO.IPS</datatype>
+ <datatype>CS.IPS</datatype>
+ <datatype ref="CD" ignore="true">CD.SDTC</datatype>
+ <datatype ref="AD">AD.IPS</datatype>
+ <datatype ref="IVL_TS">IVL_TS.IPS.TZ</datatype>
+ <datatype ref="TEL">TEL.IPS</datatype>
+ <datatype ref="TS">TS.IPS.TZ</datatype>
<!-- <datatype>bn</datatype> -->
<!-- <datatype>oid</datatype> -->
<!-- <datatype>uuid</datatype> -->
diff --git a/cdaxehealth-model/src/main/resources/datatypes-ips-model/datatypes-ips.uml b/cdaxehealth-model/src/main/resources/datatypes-ips-model/datatypes-ips.uml
index cb24f01c9df254ba568082e41c3d8de9df2d51f7..800d297edef51ee4ea4fc1d86e1c7fb6c344613d 100644
--- a/cdaxehealth-model/src/main/resources/datatypes-ips-model/datatypes-ips.uml
+++ b/cdaxehealth-model/src/main/resources/datatypes-ips-model/datatypes-ips.uml
@@ -27,7 +27,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuDnq670EeGxJei_o6JmIA" name="BXITCD_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuDnq670EeGxJei_o6JmIA" name="BXITCDIPS">
<generalization xmi:id="_CuDnrK70EeGxJei_o6JmIA" general="_CuDnsK70EeGxJei_o6JmIA"/>
<ownedAttribute xmi:id="_CuDnra70EeGxJei_o6JmIA" name="qty" visibility="public" isOrdered="true">
<ownedComment xmi:id="_CuDnrq70EeGxJei_o6JmIA" annotatedElement="_CuDnra70EeGxJei_o6JmIA">
@@ -41,7 +41,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuDnsK70EeGxJei_o6JmIA" name="CD_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuDnsK70EeGxJei_o6JmIA" name="CDIPS">
<ownedComment xmi:id="_CuDnsa70EeGxJei_o6JmIA" annotatedElement="_CuDnsK70EeGxJei_o6JmIA">
<body> A concept descriptor represents any kind of concept usually by giving a code defined in a code system. A concept descriptor can contain the original text or phrase that served as the basis of the coding and one or more translations into different coding systems. A concept descriptor can also contain qualifiers to describe, e.g., the concept of a "left foot" as a postcoordinated term built from the primary code "FOOT" and the qualifier "LEFT". In exceptional cases, the concept descriptor need not contain a code but only the original text describing that concept. </body>
</ownedComment>
@@ -157,7 +157,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuENka70EeGxJei_o6JmIA" name="CV_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuENka70EeGxJei_o6JmIA" name="CVIPS">
<ownedComment xmi:id="_CuENkq70EeGxJei_o6JmIA" annotatedElement="_CuENka70EeGxJei_o6JmIA">
<body> Coded data, consists of a code, display name, code system, and original text. Used when a single code value must be sent. </body>
</ownedComment>
@@ -167,7 +167,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuENlK70EeGxJei_o6JmIA" name="CE_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuENlK70EeGxJei_o6JmIA" name="CEIPS">
<ownedComment xmi:id="_CuENla70EeGxJei_o6JmIA" annotatedElement="_CuENlK70EeGxJei_o6JmIA">
<body> Coded data, consists of a coded value (CV) and, optionally, coded value(s) from other coding systems that identify the same concept. Used when alternative codes may exist. </body>
</ownedComment>
@@ -200,7 +200,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuENz670EeGxJei_o6JmIA" name="PQR_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuENz670EeGxJei_o6JmIA" name="PQRIPS">
<ownedComment xmi:id="_CuEN0K70EeGxJei_o6JmIA" annotatedElement="_CuENz670EeGxJei_o6JmIA">
<body> A representation of a physical quantity in a unit from any code system. Used to show alternative representation for a physical quantity. </body>
</ownedComment>
@@ -219,7 +219,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuEN7K70EeGxJei_o6JmIA" name="CO_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuEN7K70EeGxJei_o6JmIA" name="COIPS">
<ownedComment xmi:id="_CuEN7a70EeGxJei_o6JmIA" annotatedElement="_CuEN7K70EeGxJei_o6JmIA">
<body> Coded data, where the domain from which the codeset comes is ordered. The Coded Ordinal data type adds semantics related to ordering so that models that make use of such domains may introduce model elements that involve statements about the order of the terms in a domain. </body>
</ownedComment>
@@ -228,7 +228,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuEN7670EeGxJei_o6JmIA" name="CS_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuEN7670EeGxJei_o6JmIA" name="CSIPS">
<ownedComment xmi:id="_CuEN8K70EeGxJei_o6JmIA" annotatedElement="_CuEN7670EeGxJei_o6JmIA">
<body> Coded data, consists of a code, display name, code system, and original text. Used when a single code value must be sent. </body>
</ownedComment>
@@ -237,7 +237,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuEN8q70EeGxJei_o6JmIA" name="EIVLEvent_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuEN8q70EeGxJei_o6JmIA" name="EIVLEventIPS">
<ownedComment xmi:id="_CuEN8670EeGxJei_o6JmIA" annotatedElement="_CuEN8q70EeGxJei_o6JmIA">
<body> A code for a common (periodical) activity of daily living based on which the event related periodic interval is specified. </body>
</ownedComment>
@@ -249,7 +249,7 @@
- <packagedElement xmi:type="uml:Class" xmi:id="_CuEO6K70EeGxJei_o6JmIA" name="HXITCE_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuEO6K70EeGxJei_o6JmIA" name="HXITCEIPS">
<generalization xmi:id="_CuEO6a70EeGxJei_o6JmIA" general="_CuENlK70EeGxJei_o6JmIA"/>
<ownedAttribute xmi:id="_CuEO6q70EeGxJei_o6JmIA" name="validTime" isOrdered="true" aggregation="composite" association="_CuEO7a70EeGxJei_o6JmIA">
<type xmi:type="uml:Class" href="../../datatypes-model/models/datatypes.uml#_CuEOl670EeGxJei_o6JmIA" />
@@ -264,7 +264,7 @@
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_CuEO9q70EeFxJei_o6JmIA" name="II_IPS">
+ <packagedElement xmi:type="uml:Class" xmi:id="_CuEO9q70EeFxJei_o6JmIA" name="IIIPS">
<ownedComment xmi:id="_CuEO9670EeGxJei_o6JmIA" annotatedElement="_CuEO9q70EeFxJei_o6JmIA">
<body>II IPS EXTENSION</body>
</ownedComment>
@@ -360,7 +360,7 @@
<Ecore:EAttribute xmi:id="_CuGpw670EeGxJei_o6JmIA" isUnsettable="true" xmlFeatureKind="Attribute" base_Property="_CuDnra70EeGxJei_o6JmIA"/>
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuGpxK70EeGxJei_o6JmIA" base_Class="_CuDnsK70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuGpxK70EeGxJei_o6JmIA" xmlName="CD_IPS" base_Class="_CuDnsK70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!-- KEEP -->
<Ecore:EReference xmi:id="_DAKE0580FeGxJei_o6JmIA" xmlNamespace="urn:hl7-org:ips" xmlFeatureKind="Element" base_Property="_CuDhtb70EeGxJei_o6JmIA" isResolveProxies="false"/>
@@ -389,10 +389,10 @@
-->
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuGp0a70EeGxJei_o6JmIA" base_Class="_CuENka70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuGp0a70EeGxJei_o6JmIA" xmlName="CV_IPS" base_Class="_CuENka70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuGp0q70EeGxJei_o6JmIA" base_Class="_CuENlK70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuGp0q70EeGxJei_o6JmIA" xmlName="CE_IPS" base_Class="_CuENlK70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!--
@@ -417,7 +417,7 @@
-->
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuGp5K70EeGxJei_o6JmIA" base_Class="_CuENz670EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuGp5K70EeGxJei_o6JmIA" xmlName="PQR_IPS" base_Class="_CuENz670EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!--
<Ecore:EAttribute xmi:id="_CuGp5a70EeGxJei_o6JmIA" isUnsettable="true" xmlFeatureKind="Attribute" base_Property="_CuEN0q70EeGxJei_o6JmIA"/>
@@ -426,13 +426,13 @@
-->
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuHQ0a70EeGxJei_o6JmIA" base_Class="_CuEN7K70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuHQ0a70EeGxJei_o6JmIA" xmlName="CO_IPS" base_Class="_CuEN7K70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuHQ0q70EeGxJei_o6JmIA" base_Class="_CuEN7670EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuHQ0q70EeGxJei_o6JmIA" xmlName="CS_IPS" base_Class="_CuEN7670EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!-- KEEP -->
- <Ecore:EClass xmi:id="_CuHQ0670EeGxJei_o6JmIA" xmlName="EIVL.event" base_Class="_CuEN8q70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
+ <Ecore:EClass xmi:id="_CuHQ0670EeGxJei_o6JmIA" xmlName="EIVL.event_IPS" base_Class="_CuEN8q70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
<!--
@@ -509,7 +509,7 @@
<!-- KEEP -->
<Ecore:EClass xmi:id="_CuIe9a70EeGxJei_o6JmIA" xmlName="HXIT_CE" base_Class="_CuEO6K70EeGxJei_o6JmIA" xmlContentKind="ElementOnly"/>
- <Ecore:EClass xmi:id="_CuIe-a70EeGxJei_o6JmIA" base_Class="_CuEO9q70EeFxJei_o6JmIA" xmlContentKind="Empty"/>
+ <Ecore:EClass xmi:id="_CuIe-a70EeGxJei_o6JmIA" xmlName="II_IPS" base_Class="_CuEO9q70EeFxJei_o6JmIA" xmlContentKind="Empty"/>
<!--
<Ecore:EReference xmi:id="_CuIe9q70EeGxJei_o6JmIA" xmlNamespace="urn:hl7-org:v3" xmlFeatureKind="Element" base_Property="_CuEO6q70EeGxJei_o6JmIA" isResolveProxies="false"/>