Updates to model and runtime

mdht · Oct 17, 2020 · fcc2ff4 · fcc2ff4
1 parent cd43174
commit fcc2ff4
Show file tree

Hide file tree

Showing 24 changed files with 65,526 additions and 62,383 deletions.
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/META-INF/MANIFEST.MF b/generated/org.openhealthtools.mdht.uml.cda.consol2/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,

diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.genmodel b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.genmodel
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.properties b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.properties
@@ -109,6 +109,9 @@ _label_consol__HealthConcernAct = Health Concern Act (V2)
 _label_consol__InterventionAct = Intervention Act (V2)
 _label_consol__PlannedInterventionAct = Planned Intervention Act (V2)
 _label_consol__RiskConcernAct = Risk Concern Act (V2)
+_label_consol__CareTeamOrganizer = Care Team Organizer
+_label_consol__CareTeams = Care Teams
+_label_consol__NoteActivity = Note Activity
 _label_consol__ComplicationsSection2 = Complications Section (V3)
 _label_consol__PostprocedureDiagnosisSection2 = Postprocedure Diagnosis Section (V3)
 _label_consol__PreoperativeDiagnosisSection2 = Preoperative Diagnosis Section (V3)

diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties b/generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties
diff --git a/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-allergies.uml b/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-allergies.uml
@@ -2491,28 +2491,28 @@ If the allergy/intolerance is known to be resolved, but the date of resolution i
     <ownedAttribute xmi:id="_ALzJoLD0EeafNo3UpQoAYw" name="classCode" visibility="private" isReadOnly="true">
       <type xmi:type="uml:Enumeration" href="pathmap://VOCAB_MODEL/vocab.uml#__yVecEDcEd6xYZuu1VKCVw"/>
       <defaultValue xmi:type="uml:LiteralString" xmi:id="_O6GKELD0EeafNo3UpQoAYw" value="OBS"/>
-      <redefinedProperty href="pathmap://CDA_MODEL///cda.uml#_FcjT0EbtEd6besF9iFIJkQ"/>
+      <redefinedProperty href="pathmap://CDA_MODEL/cda.uml#_FcjT0EbtEd6besF9iFIJkQ"/>
     </ownedAttribute>
     <ownedAttribute xmi:id="_ALzJobD0EeafNo3UpQoAYw" name="moodCode" visibility="private" isReadOnly="true">
       <type xmi:type="uml:Enumeration" href="pathmap://VOCAB_MODEL/vocab.uml#__zOoCEDcEd6xYZuu1VKCVw"/>
       <defaultValue xmi:type="uml:LiteralString" xmi:id="_o4MDwLD0EeafNo3UpQoAYw" value="EVN"/>
-      <redefinedProperty href="pathmap://CDA_MODEL///cda.uml#_BLZhcEo_Ed6c3qsAxlFHaQ"/>
+      <redefinedProperty href="pathmap://CDA_MODEL/cda.uml#_BLZhcEo_Ed6c3qsAxlFHaQ"/>
     </ownedAttribute>
     <ownedAttribute xmi:id="_ALvfQLD0EeafNo3UpQoAYw" name="code" visibility="private" aggregation="composite">
       <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_VKl7EDxaEd6JwqSGecoePg"/>
-      <redefinedProperty href="pathmap://CDA_MODEL///cda.uml#_WEYp4Eo8Ed6c3qsAxlFHaQ"/>
+      <redefinedProperty href="pathmap://CDA_MODEL/cda.uml#_WEYp4Eo8Ed6c3qsAxlFHaQ"/>
     </ownedAttribute>
     <ownedAttribute xmi:id="_ALwtYLD0EeafNo3UpQoAYw" name="statusCode" visibility="private" aggregation="composite">
       <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_iYn74D55Ed6cla2oXsPtlA"/>
       <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1VEbMbD0EeafNo3UpQoAYw" value="1"/>
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1VEbMLD0EeafNo3UpQoAYw" value="1"/>
-      <redefinedProperty href="pathmap://CDA_MODEL///cda.uml#_c-D3cEo8Ed6c3qsAxlFHaQ"/>
+      <redefinedProperty href="pathmap://CDA_MODEL/cda.uml#_c-D3cEo8Ed6c3qsAxlFHaQ"/>
     </ownedAttribute>
     <ownedAttribute xmi:id="_ALwtY7D0EeafNo3UpQoAYw" name="value" visibility="private" aggregation="composite">
       <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_VKl7EDxaEd6JwqSGecoePg"/>
       <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1_QnsbD0EeafNo3UpQoAYw" value="1"/>
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1_QnsLD0EeafNo3UpQoAYw" value="1"/>
-      <redefinedProperty href="pathmap://CDA_MODEL///cda.uml#_tRpv0Eo-Ed6c3qsAxlFHaQ"/>
+      <redefinedProperty href="pathmap://CDA_MODEL/cda.uml#_tRpv0Eo-Ed6c3qsAxlFHaQ"/>
     </ownedAttribute>
   </uml:Class>
   <CDA:CDATemplate xmi:id="_ikcqQLDzEeafNo3UpQoAYw" base_Class="_LspMELDzEeafNo3UpQoAYw" templateId="2.16.840.1.113883.10.20.22.4.145">
@@ -2533,17 +2533,17 @@ If the allergy/intolerance is known to be resolved, but the date of resolution i
   </CDA:PropertyValidation>
   <CDA:PropertyValidation xmi:id="_yb9gELD0EeafNo3UpQoAYw" base_Property="_ALwtY7D0EeafNo3UpQoAYw"/>
   <CDA:CodeSystemConstraint xmi:id="_coy5QLD1EeafNo3UpQoAYw" code="82606-5" displayName="Allergy or intolerance criticality" base_Property="_ALvfQLD0EeafNo3UpQoAYw">
-    <reference href="pathmap://TERM_MODEL///CodeSystems.uml#_3-cwsCWrEd-iTYfpNb4PkQ"/>
+    <reference href="pathmap://TERM_MODEL/CodeSystems.uml#_3-cwsCWrEd-iTYfpNb4PkQ"/>
     <ruleId>CONF:1198-32925</ruleId>
     <ruleId>CONF:1198-32926</ruleId>
     <ruleId>DSTU:872</ruleId>
   </CDA:CodeSystemConstraint>
   <CDA:CodeSystemConstraint xmi:id="_ZIovwLD2EeafNo3UpQoAYw" code="completed" displayName="Completed" base_Property="_ALwtYLD0EeafNo3UpQoAYw">
-    <reference href="pathmap://TERM_MODEL///CodeSystems.uml#_e8ZEoCWvEd-iTYfpNb4PkQ"/>
+    <reference href="pathmap://TERM_MODEL/CodeSystems.uml#_e8ZEoCWvEd-iTYfpNb4PkQ"/>
     <ruleId>CONF:1198-32927</ruleId>
   </CDA:CodeSystemConstraint>
   <CDA:ValueSetConstraint xmi:id="_SZ0nALD5EeafNo3UpQoAYw" base_Property="_ALwtY7D0EeafNo3UpQoAYw">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_6ZpdcLD2EeafNo3UpQoAYw"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_6ZpdcLD2EeafNo3UpQoAYw"/>
     <ruleId>CONF:1198-32928</ruleId>
   </CDA:ValueSetConstraint>
   <uml:Association xmi:id="_1EWToLsxEead0dyhUBLajQ" memberEnd="_1ET3YLsxEead0dyhUBLajQ _1EW6sLsxEead0dyhUBLajQ">
@@ -2570,14 +2570,14 @@ If the allergy/intolerance is known to be resolved, but the date of resolution i
     <ruleId>DSTU:710</ruleId>
   </CDA:EntryRelationship>
   <CDA:ValueSetConstraint xmi:id="_nFAdkDNwEeiFfJtNAawVHw" base_Property="_nET6ADNwEeiFfJtNAawVHw">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_OLJgsDNzEeiFfJtNAawVHw"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_OLJgsDNzEeiFfJtNAawVHw"/>
     <ruleId>CONF:NEW</ruleId>
     <ruleId>formerlyCONF:1098-7356</ruleId>
     <ruleId>DSTU:835</ruleId>
   </CDA:ValueSetConstraint>
   <CDA:PropertyValidation xmi:id="_nF6cgDNwEeiFfJtNAawVHw" base_Property="_nET6ADNwEeiFfJtNAawVHw"/>
   <CDA:ValueSetConstraint xmi:id="_D04F4DNyEeiFfJtNAawVHw" base_Property="_D03e0DNyEeiFfJtNAawVHw">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_2SVSkRSVEeGGzu7fmW9pXw"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_2SVSkRSVEeGGzu7fmW9pXw"/>
     <ruleId>CONF:1098-7335</ruleId>
   </CDA:ValueSetConstraint>
   <CDA:PropertyValidation xmi:id="_D057EDNyEeiFfJtNAawVHw" base_Property="_D03e0DNyEeiFfJtNAawVHw"/>
@@ -2610,7 +2610,7 @@ This template represents the status of the allergy indicating whether it is acti
     <ruleId>DSTU:816/1356</ruleId>
   </CDA:CodeSystemConstraint>
   <CDA:ValueSetConstraint xmi:id="_o2JlEEc6EeiFfJtNAawVHw" base_Property="_o2I-AEc6EeiFfJtNAawVHw">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_55qJYEc6EeiFfJtNAawVHw"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_55qJYEc6EeiFfJtNAawVHw"/>
     <ruleId>CONF:1098-7322</ruleId>
     <ruleId>DSTU:816/1356</ruleId>
     <ruleId>DSTU:1364</ruleId>

diff --git a/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-discharge.uml b/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-discharge.uml
@@ -1158,7 +1158,7 @@ Often thought of as an &quot;actual outcome&quot;, the Outcome Observation may b
     <ruleId>DSTU:820</ruleId>
   </CDA:PropertyValidation>
   <CDA:CodeSystemConstraint xmi:id="_T8XSADJsEeaFUpY8BxK5oA" code="75311-1" displayName="Discharge medication" base_Property="_lDj48DJrEeaFUpY8BxK5oA">
-    <reference href="pathmap://TERM_MODEL///CodeSystems.uml#_3-cwsCWrEd-iTYfpNb4PkQ"/>
+    <reference href="pathmap://TERM_MODEL/CodeSystems.uml#_3-cwsCWrEd-iTYfpNb4PkQ"/>
     <ruleId>CONF:NEW</ruleId>
     <ruleId>DSTU:820</ruleId>
   </CDA:CodeSystemConstraint>

diff --git a/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-documents.uml b/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-documents.uml
@@ -7153,7 +7153,7 @@ The Care Plan is continually evolving and dynamic. The Care Plan CDA instance is
     <ruleId>CONF:1198-29893</ruleId>
   </CDA:AssociationValidation>
   <CDA:ValueSetConstraint xmi:id="_fsopoJ8TEeOr4eM3k36wAg" base_Property="_Pj-kAJ8TEeOr4eM3k36wAg">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_nQiIEDdVEeiFfJtNAawVHw"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_nQiIEDdVEeiFfJtNAawVHw"/>
     <ruleId>CONF:1198-31889</ruleId>
     <ruleId>DSTU:1267</ruleId>
     <ruleId>DSTU:1333</ruleId>
@@ -12538,7 +12538,7 @@ This performer represents any assistants.</body>
   </CDA:AssociationValidation>
   <CDA:PropertyValidation xmi:id="_NvbMMC1oEeSoCqqrpX8LzQ" severity="WARNING" base_Property="_NF4f8C1oEeSoCqqrpX8LzQ"/>
   <CDA:ValueSetConstraint xmi:id="_WMkXoC1oEeSoCqqrpX8LzQ" base_Property="_NF4f8C1oEeSoCqqrpX8LzQ">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_-bWMgT-UEeGvOdejHZ7dYg"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_-bWMgT-UEeGvOdejHZ7dYg"/>
     <ruleId>CONF:1198-8490</ruleId>
     <ruleId>DSTU:1331</ruleId>
     <ruleId>DSTU:1369</ruleId>
@@ -14686,7 +14686,7 @@ The nonXMLBody/text element also has a &quot;compression&quot; attribute that ca
   </CDA:AssociationValidation>
   <CDA:PropertyValidation xmi:id="_w-8d4J3KEeSofqct4VeYrw" severity="WARNING" base_Property="_wHsFwJ3KEeSofqct4VeYrw"/>
   <CDA:ValueSetConstraint xmi:id="_zT1RoJ3KEeSofqct4VeYrw" base_Property="_wHsFwJ3KEeSofqct4VeYrw">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_-bWMgT-UEeGvOdejHZ7dYg"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_-bWMgT-UEeGvOdejHZ7dYg"/>
     <ruleId>CONF:1198-32739</ruleId>
     <ruleId>DSTU:1331</ruleId>
   </CDA:ValueSetConstraint>
@@ -14832,14 +14832,14 @@ The nonXMLBody/text element also has a &quot;compression&quot; attribute that ca
     <ruleId>1198-32901</ruleId>
   </CDA:PropertyValidation>
   <CDA:ValueSetConstraint xmi:id="_W-4zcIdqEeeEdPtCCB--vA" base_Property="_Ul7_EIdqEeeEdPtCCB--vA" uri="consol-vocab::Detailed Ethnicity">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_cL0AwIdpEeeAsbPrNOnubg"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_cL0AwIdpEeeAsbPrNOnubg"/>
   </CDA:ValueSetConstraint>
   <CDA:PropertyValidation xmi:id="_z8M-4DdUEeiFfJtNAawVHw" base_Property="_vLvgkDdUEeiFfJtNAawVHw">
     <ruleId>CONF:1198-32949</ruleId>
     <ruleId>DSTU:1267</ruleId>
   </CDA:PropertyValidation>
   <CDA:ValueSetConstraint xmi:id="_xsqpUDzzEeiFfJtNAawVHw" base_Property="_WQ858J5xEeOr4eM3k36wAg">
-    <reference href="pathmap://CONSOL_MODEL///consol-vocab.uml#_av2kwDzyEeiFfJtNAawVHw"/>
+    <reference href="pathmap://CONSOL_MODEL/consol-vocab.uml#_av2kwDzyEeiFfJtNAawVHw"/>
     <ruleId>CONF:1198-32959</ruleId>
     <ruleId>DSTU:1048</ruleId>
     <ruleId>DSTU:1260</ruleId>