Skip to content
This repository was archived by the owner on Jan 5, 2025. It is now read-only.

Commit 45c13e3

Browse files
drbgfcdrbgfc
authored
Merge pull request #124 from mdht/develop
Merge develop into master for 20180222 Build
2 parents be70e3a + 7d17231 commit 45c13e3

File tree

18 files changed

+17593
-17214
lines changed

18 files changed

+17593
-17214
lines changed

‎generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore‎

Lines changed: 63 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14283,12 +14283,13 @@
1428314283
</eClassifiers>
1428414284
<eClassifiers xsi:type="ecore:EClass" name="MedicationsSection" eSuperTypes="#//MedicationsSectionEntriesOptional">
1428514285
<eAnnotations source="http://www.openhealthtools.org/mdht/uml/cda/annotation">
14286-
<details key="constraints.validation.error" value="MedicationsSectionEntriesOptionalTemplateId MedicationsSectionCode MedicationsSectionTitle MedicationsSectionText MedicationsSectionMedication"/>
14286+
<details key="constraints.validation.error" value="MedicationsSectionEntriesOptionalTemplateId MedicationsSectionCode MedicationsSectionCodeP MedicationsSectionTitle MedicationsSectionText MedicationsSectionMedication"/>
1428714287
<details key="templateId.root" value="2.16.840.1.113883.10.20.22.2.1.1"/>
1428814288
<details key="code.code" value="10160-0"/>
1428914289
<details key="code.codeSystem" value="2.16.840.1.113883.6.1"/>
1429014290
<details key="code.codeSystemName" value="LOINC"/>
1429114291
<details key="code.displayName" value="History of medication use"/>
14292+
<details key="constraints.validation.dependOn.MedicationsSectionCode" value="MedicationsSectionCodeP"/>
1429214293
</eAnnotations>
1429314294
<eAnnotations source="duplicates">
1429414295
<contents xsi:type="ecore:EOperation" name="MedicationsSectionEntriesOptionalTemplateId"
@@ -14313,6 +14314,25 @@
1431314314
</eParameters>
1431414315
</contents>
1431514316
</eAnnotations>
14317+
<eOperations name="MedicationsSectionCodeP" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
14318+
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
14319+
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())"/>
14320+
</eAnnotations>
14321+
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
14322+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
14323+
<details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
14324+
</eAnnotations>
14325+
</eParameters>
14326+
<eParameters name="context">
14327+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
14328+
<details key="documentation" value="The cache of context-specific information."/>
14329+
</eAnnotations>
14330+
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
14331+
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
14332+
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
14333+
</eGenericType>
14334+
</eParameters>
14335+
</eOperations>
1431614336
<eOperations name="MedicationsSectionCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
1431714337
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
1431814338
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and &#xD;&#xA;let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in &#xD;&#xA;value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')"/>
@@ -14398,7 +14418,7 @@
1439814418
</eClassifiers>
1439914419
<eClassifiers xsi:type="ecore:EClass" name="MedicationsSectionEntriesOptional" eSuperTypes="../../org.eclipse.mdht.uml.cda/model/cda.ecore#//Section">
1440014420
<eAnnotations source="http://www.openhealthtools.org/mdht/uml/cda/annotation">
14401-
<details key="constraints.validation.error" value="MedicationsSectionEntriesOptionalTemplateId MedicationsSectionEntriesOptionalCode MedicationsSectionEntriesOptionalTitle MedicationsSectionEntriesOptionalText"/>
14421+
<details key="constraints.validation.error" value="MedicationsSectionEntriesOptionalTemplateId MedicationsSectionEntriesOptionalCode MedicationsSectionEntriesOptionalCodeP MedicationsSectionEntriesOptionalTitle MedicationsSectionEntriesOptionalText"/>
1440214422
<details key="templateId.root" value="2.16.840.1.113883.10.20.22.2.1"/>
1440314423
<details key="code.code" value="10160-0"/>
1440414424
<details key="code.codeSystem" value="2.16.840.1.113883.6.1"/>
@@ -14444,6 +14464,25 @@
1444414464
</eGenericType>
1444514465
</eParameters>
1444614466
</eOperations>
14467+
<eOperations name="MedicationsSectionEntriesOptionalCodeP" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
14468+
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
14469+
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())"/>
14470+
</eAnnotations>
14471+
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
14472+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
14473+
<details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
14474+
</eAnnotations>
14475+
</eParameters>
14476+
<eParameters name="context">
14477+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
14478+
<details key="documentation" value="The cache of context-specific information."/>
14479+
</eAnnotations>
14480+
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
14481+
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
14482+
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
14483+
</eGenericType>
14484+
</eParameters>
14485+
</eOperations>
1444714486
<eOperations name="MedicationsSectionEntriesOptionalTitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
1444814487
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
1444914488
<details key="body" value="(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())"/>
@@ -84273,7 +84312,7 @@
8427384312
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
8427484313
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())"/>
8427584314
</eAnnotations>
84276-
<eAnnotations source="redefines" references="#//MedicationsSectionEntriesOptional2/MedicationsSectionEntriesOptionalCodeP"/>
84315+
<eAnnotations source="redefines" references="#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCodeP #//MedicationsSectionEntriesOptional2/%duplicates%/MedicationsSectionEntriesOptionalCodeP"/>
8427784316
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
8427884317
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
8427984318
<details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
@@ -84430,6 +84469,27 @@
8443084469
</eGenericType>
8443184470
</eParameters>
8443284471
</contents>
84472+
<contents xsi:type="ecore:EOperation" name="MedicationsSectionEntriesOptionalCodeP"
84473+
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
84474+
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
84475+
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())"/>
84476+
</eAnnotations>
84477+
<eAnnotations source="redefines" references="#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCodeP"/>
84478+
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
84479+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
84480+
<details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
84481+
</eAnnotations>
84482+
</eParameters>
84483+
<eParameters name="context">
84484+
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
84485+
<details key="documentation" value="The cache of context-specific information."/>
84486+
</eAnnotations>
84487+
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
84488+
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
84489+
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
84490+
</eGenericType>
84491+
</eParameters>
84492+
</contents>
8443384493
<contents xsi:type="ecore:EOperation" name="MedicationsSectionEntriesOptionalCode"
8443484494
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
8443584495
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
@@ -84492,25 +84552,6 @@
8449284552
</eGenericType>
8449384553
</eParameters>
8449484554
</eOperations>
84495-
<eOperations name="MedicationsSectionEntriesOptionalCodeP" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
84496-
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
84497-
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())"/>
84498-
</eAnnotations>
84499-
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
84500-
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
84501-
<details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
84502-
</eAnnotations>
84503-
</eParameters>
84504-
<eParameters name="context">
84505-
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
84506-
<details key="documentation" value="The cache of context-specific information."/>
84507-
</eAnnotations>
84508-
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
84509-
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
84510-
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
84511-
</eGenericType>
84512-
</eParameters>
84513-
</eOperations>
8451484555
<eOperations name="getConsolMedicationActivity2s" ordered="false" lowerBound="1"
8451584556
upperBound="-1" eType="#//MedicationActivity2">
8451684557
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">

‎generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.genmodel‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2829,6 +2829,10 @@
28292829
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//AllergiesSectionEntriesOptional/getAllergyProblemActs"/>
28302830
</genClasses>
28312831
<genClasses xsi:type="genmodel:GenClass" ecoreClass="consol.ecore#//MedicationsSection">
2832+
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//MedicationsSection/MedicationsSectionCodeP">
2833+
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSection/MedicationsSectionCodeP/diagnostics"/>
2834+
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSection/MedicationsSectionCodeP/context"/>
2835+
</genOperations>
28322836
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//MedicationsSection/MedicationsSectionCode">
28332837
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSection/MedicationsSectionCode/diagnostics"/>
28342838
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSection/MedicationsSectionCode/context"/>
@@ -2856,6 +2860,10 @@
28562860
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCode/diagnostics"/>
28572861
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCode/context"/>
28582862
</genOperations>
2863+
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCodeP">
2864+
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCodeP/diagnostics"/>
2865+
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalCodeP/context"/>
2866+
</genOperations>
28592867
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalTitle">
28602868
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalTitle/diagnostics"/>
28612869
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional/MedicationsSectionEntriesOptionalTitle/context"/>
@@ -13958,10 +13966,6 @@
1395813966
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional2/MedicationsSectionEntriesOptionalAbsenceOfMedications/diagnostics"/>
1395913967
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional2/MedicationsSectionEntriesOptionalAbsenceOfMedications/context"/>
1396013968
</genOperations>
13961-
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//MedicationsSectionEntriesOptional2/MedicationsSectionEntriesOptionalCodeP">
13962-
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional2/MedicationsSectionEntriesOptionalCodeP/diagnostics"/>
13963-
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//MedicationsSectionEntriesOptional2/MedicationsSectionEntriesOptionalCodeP/context"/>
13964-
</genOperations>
1396513969
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//MedicationsSectionEntriesOptional2/getConsolMedicationActivity2s"/>
1396613970
</genClasses>
1396713971
<genClasses xsi:type="genmodel:GenClass" ecoreClass="consol.ecore#//ReasonForReferralSection2">

0 commit comments

Comments
 (0)