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

Commit b86fd4e

Browse files
drbgfcdrbgfc
authored
Merge pull request #150 from mdht/develop
Merge develop to master for 20210720 Release
2 parents 1ed6aaa + 634647d commit b86fd4e

File tree

73 files changed

+15855
-15880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+15855
-15880
lines changed

‎examples/CCDSamples/LCDA.zip‎

27.1 MB
Binary file not shown.

‎generated/org.hl7.security.ds4p.contentprofile/.classpath‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<classpath>
33
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
44
<classpathentry kind="src" path="src"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6-
<classpathentry kind="output" path="bin"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/>
76
</classpath>

‎generated/org.hl7.security.ds4p.contentprofile/model/contentprofile.ecore‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106
<eAnnotations source="http://www.openhealthtools.org/mdht/uml/cda/annotation">
107107
<details key="constraints.validation.error" value="PrivacySegmentedSectionTemplateId PrivacySegmentedSectionConfidentialityCode"/>
108108
<details key="templateId.root" value="2.16.840.1.113883.3.3251.1.10"/>
109-
<details key="confidentialityCode.codeSystem" value="2.16.840.1.113883.5.25"/>
110-
<details key="confidentialityCode.codeSystemName" value="ConfidentialityCode"/>
109+
<details key="confidentialityCode.codeSystemName" value=""/>
111110
<details key="constraints.validation.warning" value="PrivacySegmentedSectionConfidentialityCodeP PrivacySegmentedSectionAuthor"/>
112111
</eAnnotations>
113112
<eOperations name="PrivacySegmentedSectionTemplateId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -131,7 +130,7 @@
131130
</eOperations>
132131
<eOperations name="PrivacySegmentedSectionConfidentialityCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
133132
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
134-
<details key="body" value="not self.confidentialityCode.oclIsUndefined() and self.confidentialityCode.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = self.confidentialityCode.oclAsType(datatypes::CE) in &#xA;value.codeSystem = '2.16.840.1.113883.5.25' and (value.code = 'N' or value.code = 'R' or value.code = 'V')"/>
133+
<details key="body" value="not self.confidentialityCode.oclIsUndefined() and self.confidentialityCode.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = self.confidentialityCode.oclAsType(datatypes::CE) in &#xA;value.code = 'N' or value.code = 'R' or value.code = 'V'"/>
135134
</eAnnotations>
136135
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
137136
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -192,8 +191,7 @@
192191
<details key="constraints.validation.error" value="PrivacyMarkingsSectionTemplateId PrivacyMarkingsSectionCodeP PrivacyMarkingsSectionText"/>
193192
<details key="templateId.root" value="2.16.840.1.113883.3.3251.1.5"/>
194193
<details key="code.code" value="57017-6"/>
195-
<details key="code.codeSystem" value="2.16.840.1.113883.6.1"/>
196-
<details key="code.codeSystemName" value="LOINC"/>
194+
<details key="code.codeSystemName" value=""/>
197195
<details key="code.displayName" value="Privacy Policy"/>
198196
<details key="constraints.validation.warning" value="PrivacyMarkingsSectionCode"/>
199197
<details key="constraints.validation.info" value="PrivacyMarkingsSectionEntry1"/>
@@ -219,7 +217,7 @@
219217
</eOperations>
220218
<eOperations name="PrivacyMarkingsSectionCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
221219
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
222-
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in &#xA;value.code = '57017-6' and value.codeSystem = '2.16.840.1.113883.6.1')"/>
220+
<details key="body" value="(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in &#xA;value.code = '57017-6')"/>
223221
</eAnnotations>
224222
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
225223
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -304,8 +302,7 @@
304302
<details key="code.codeSystemName" value="SecurityObservationTypeCodeSystem"/>
305303
<details key="code.displayName" value="Security Control"/>
306304
<details key="constraints.validation.dependOn.SecurityObservationCode" value="SecurityObservationCodeP"/>
307-
<details key="value.codeSystem" value="2.16.840.1.113883.5.1063"/>
308-
<details key="value.codeSystemName" value="SecurityObservationValueCodeSystem"/>
305+
<details key="value.codeSystemName" value=""/>
309306
<details key="constraints.validation.warning" value="SecurityObservationValue"/>
310307
<details key="constraints.validation.dependOn.SecurityObservationValue" value="SecurityObservationValueP"/>
311308
</eAnnotations>
@@ -392,7 +389,7 @@
392389
</contents>
393390
<contents xsi:type="ecore:EOperation" name="SecurityObservationValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
394391
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
395-
<details key="body" value="self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = element.oclAsType(datatypes::CE) in &#xA;value.codeSystem = '2.16.840.1.113883.5.1063' and (value.code = 'CPLYCD' or value.code = 'ENCRYPT'))"/>
392+
<details key="body" value="self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = element.oclAsType(datatypes::CE) in &#xA;value.code = 'CPLYCD' or value.code = 'ENCRYPT')"/>
396393
</eAnnotations>
397394
<eAnnotations source="redefines" references="#//SecurityObservation/SecurityObservationValue"/>
398395
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
@@ -919,8 +916,7 @@
919916
<details key="code.codeSystemName" value="SecurityObservationTypeCodeSystem"/>
920917
<details key="code.displayName" value="Security Control Observation Type"/>
921918
<details key="constraints.validation.dependOn.SecurityObservationCode" value="SecurityObservationCodeP"/>
922-
<details key="value.codeSystem" value="2.16.840.1.113883.5.1063"/>
923-
<details key="value.codeSystemName" value="SecurityObservationValueCodeSystem"/>
919+
<details key="value.codeSystemName" value=""/>
924920
<details key="constraints.validation.dependOn.SecurityObservationValue" value="SecurityObservationValueP"/>
925921
</eAnnotations>
926922
<eAnnotations source="duplicates">
@@ -1006,7 +1002,7 @@
10061002
</contents>
10071003
<contents xsi:type="ecore:EOperation" name="SecurityObservationValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
10081004
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
1009-
<details key="body" value="self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = element.oclAsType(datatypes::CE) in &#xA;value.codeSystem = '2.16.840.1.113883.5.1063' and (value.code = 'NORDSLCD' or value.code = 'NOMOU'))"/>
1005+
<details key="body" value="self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = element.oclAsType(datatypes::CE) in &#xA;value.code = 'NOAUTH' or value.code = 'NOCOLLECT' or value.code = 'NODSCLCD' or value.code = 'NOINTEGRATE' or value.code = 'NOLIST' or value.code = 'NOMOU' or value.code = 'NOORGPOL' or value.code = 'NOPERSISTP' or value.code = 'NORDSCLW' or value.code = 'NORDSLCD' or value.code = 'NORELINK' or value.code = 'NOREUSE' or value.code = 'NOVIP' or value.code = 'ORCON')"/>
10101006
</eAnnotations>
10111007
<eAnnotations source="redefines" references="#//SecurityObservation/SecurityObservationValue"/>
10121008
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
@@ -1028,16 +1024,13 @@
10281024
</eClassifiers>
10291025
<eClassifiers xsi:type="ecore:EClass" name="PurposeOfUseSecurityObservation" eSuperTypes="#//SecurityObservation">
10301026
<eAnnotations source="http://www.openhealthtools.org/mdht/uml/cda/annotation">
1031-
<details key="constraints.validation.error" value="SecurityObservationTemplateId SecurityObservationCode SecurityObservationCodeP SecurityObservationValue SecurityObservationValueP"/>
1027+
<details key="constraints.validation.error" value="SecurityObservationTemplateId SecurityObservationCode SecurityObservationCodeP SecurityObservationValue"/>
10321028
<details key="templateId.root" value="2.16.840.1.113883.3.445.22"/>
10331029
<details key="code.code" value="SECCONOBS"/>
10341030
<details key="code.codeSystem" value="2.16.840.1.113883.1.11.20457"/>
10351031
<details key="code.codeSystemName" value="SecurityObservationTypeCodeSystem"/>
10361032
<details key="code.displayName" value="Security Control"/>
10371033
<details key="constraints.validation.dependOn.SecurityObservationCode" value="SecurityObservationCodeP"/>
1038-
<details key="value.codeSystem" value="2.16.840.1.113883.5.1063"/>
1039-
<details key="value.codeSystemName" value="SecurityObservationValueCodeSystem"/>
1040-
<details key="constraints.validation.dependOn.SecurityObservationValue" value="SecurityObservationValueP"/>
10411034
</eAnnotations>
10421035
<eAnnotations source="duplicates">
10431036
<contents xsi:type="ecore:EOperation" name="SecurityObservationTemplateId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1100,29 +1093,9 @@
11001093
</eGenericType>
11011094
</eParameters>
11021095
</contents>
1103-
<contents xsi:type="ecore:EOperation" name="SecurityObservationValueP" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
1104-
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
1105-
<details key="body" value="not self.value->isEmpty()"/>
1106-
</eAnnotations>
1107-
<eAnnotations source="redefines" references="#//SecurityObservation/SecurityObservationValueP"/>
1108-
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
1109-
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
1110-
<details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
1111-
</eAnnotations>
1112-
</eParameters>
1113-
<eParameters name="context">
1114-
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
1115-
<details key="documentation" value="The cache of context-specific information."/>
1116-
</eAnnotations>
1117-
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
1118-
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
1119-
<eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
1120-
</eGenericType>
1121-
</eParameters>
1122-
</contents>
11231096
<contents xsi:type="ecore:EOperation" name="SecurityObservationValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
11241097
<eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
1125-
<details key="body" value="self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and &#xA;let value : datatypes::CE = element.oclAsType(datatypes::CE) in &#xA;value.codeSystem = '2.16.840.1.113883.5.1063' and (value.code = 'TREAT' or value.code = 'ETREAT' or value.code = 'HPAYMT' or value.code = 'HRESCH' or value.code = 'CLINTRCH' or value.code = ' CLINTRL'))"/>
1098+
<details key="body" value="not self.value->isEmpty()"/>
11261099
</eAnnotations>
11271100
<eAnnotations source="redefines" references="#//SecurityObservation/SecurityObservationValue"/>
11281101
<eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">

‎generated/org.hl7.security.ds4p.contentprofile/model/contentprofile.genmodel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="org.hl7.security.ds4p.contentprofile/src" modelPluginID="org.hl7.security.ds4p.contentprofile"
44
templateDirectory="/org.eclipse.mdht.uml.cda/templates" dynamicTemplates="true"
5-
modelName="contentprofile_Ecore" modelPluginClass="CONTENTPROFILEPlugin" importerID="org.eclipse.uml2.uml.ecore.importer"
6-
complianceLevel="7.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="../../org.eclipse.mdht.uml.cda/model/cda.genmodel#//cda ../../org.openhealthtools.mdht.uml.cda.consol2/model/consol.genmodel#//consol ../../org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.genmodel#//datatypes ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.mdht.uml.hl7.rim/model/rim.genmodel#//rim ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.mdht.uml.hl7.vocab/model/vocab.genmodel#//vocab"
5+
modelName="contentprofile_Ecore" modelPluginClass="CONTENTPROFILEPlugin" testsDirectory="/org.hl7.security.ds4p.contentprofile.tests/src/test/java"
6+
importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="7.0" copyrightFields="false"
7+
runtimeVersion="2.9" usedGenPackages="../../org.eclipse.mdht.uml.cda/model/cda.genmodel#//cda ../../org.openhealthtools.mdht.uml.cda.consol2/model/consol.genmodel#//consol ../../org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.genmodel#//datatypes ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.mdht.uml.hl7.rim/model/rim.genmodel#//rim ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.mdht.uml.hl7.vocab/model/vocab.genmodel#//vocab"
78
pluralizedGetters="true" invariantPrefix="validate">
89
<genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
910
<details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

0 commit comments

Comments
 (0)