Updates for UDI

Modified test and model to support validation
mdht · Nov 27, 2020 · 8cb9e9a · 8cb9e9a
1 parent 5041e9a
commit 8cb9e9a
Show file tree

Hide file tree

Showing 1,044 changed files with 268,620 additions and 263,603 deletions.
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore
@@ -106506,7 +106506,7 @@
         <details key="originalName" value="DeviceIdentifierObservationIIUDI issuing agency"/>
       </eAnnotations>
       <eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
-        <details key="body" value="self.value->excluding(null)->select(isNullFlavorUndefined())->reject((root = '1.3.160' or root ='2.16.840.1.113883.6.18'  or root = '2.16.840.1.113883.6.40'))"/>
+        <details key="body" value="self.value->excluding(null)->select(isNullFlavorUndefined())->reject(matches('root','\\\\b1.3.160\\\\b'))"/>
       </eAnnotations>
       <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

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
@@ -1152,6 +1152,14 @@ DeceasedObservationDeceasedObservationStatusCodeP = Consol Deceased Observation
 DeceasedObservationDeceasedObservationTemplateId = SHALL contain exactly one [1..1] templateId ( CONF:14871, CONF:14872 ) such that it SHALL contain exactly one [1..1] @root="2.16.840.1.113883.10.20.22.4.79"
 DeceasedObservationDeceasedObservationValue = Consol Deceased Observation SHALL contain exactly one [1..1] value with @xsi:type="CD" (CONF:14857, R2.1=CONF:1198-14857)/@code="419099009" Dead (CodeSystem: 2.16.840.1.113883.6.96 SNOMEDCT) (CONF:15142, R2.1=CONF:1198-15142)
 DeceasedObservationDeceasedObservationValueP = Consol Deceased Observation SHALL contain exactly one [1..1] value with @xsi:type="CD" (CONF:14857, R2.1=CONF:1198-14857)/@code="419099009" Dead (CodeSystem: 2.16.840.1.113883.6.96 SNOMEDCT) (CONF:15142, R2.1=CONF:1198-15142)
+DeviceIdentifierObservationCDDeviceIdentifierObservationCDCode = Consol CD SHALL contain zero or one [0..1] code
+DeviceIdentifierObservationCDDeviceIdentifierObservationCDOriginalText = Consol CD SHALL contain zero or one [0..1] originalText
+DeviceIdentifierObservationCDDeviceIdentifierObservationCDQualifier1 = Consol CD SHALL contain zero or more [0..*] qualifier
+DeviceIdentifierObservationCDDeviceIdentifierObservationCDTranslation1 = Consol CD SHALL contain zero or more [0..*] translation
+DeviceIdentifierObservationDeviceIdentifierObservationCDCode = Consol Device Identifier Observation SHALL contain zero or more [0..*] value, where its type is CD cd SHALL contain zero or one [0..1] code
+DeviceIdentifierObservationDeviceIdentifierObservationCDOriginalText = Consol Device Identifier Observation SHALL contain zero or more [0..*] value, where its type is CD cd SHALL contain zero or one [0..1] originalText
+DeviceIdentifierObservationDeviceIdentifierObservationCDQualifier1 = Consol Device Identifier Observation SHALL contain zero or more [0..*] value, where its type is CD cd SHALL contain zero or more [0..*] qualifier
+DeviceIdentifierObservationDeviceIdentifierObservationCDTranslation1 = Consol Device Identifier Observation SHALL contain zero or more [0..*] value, where its type is CD cd SHALL contain zero or more [0..*] translation
 DeviceIdentifierObservationDeviceIdentifierObservationCode = Consol Device Identifier Observation SHALL contain exactly one [1..1] code (CONF:4437-3422)/@code="C101722" Primary DI Number (CodeSystem: 2.16.840.1.113883.3.26.1.1 NCI Thesaurus) (CONF:4437-3426, CONF:4437-3427, CONF:4437-3428, CONF:4437-3429)
 DeviceIdentifierObservationDeviceIdentifierObservationCodeP = Consol Device Identifier Observation SHALL contain exactly one [1..1] code (CONF:4437-3422)/@code="C101722" Primary DI Number (CodeSystem: 2.16.840.1.113883.3.26.1.1 NCI Thesaurus) (CONF:4437-3426, CONF:4437-3427, CONF:4437-3428, CONF:4437-3429)
 DeviceIdentifierObservationDeviceIdentifierObservationIIDisplayable = Consol Device Identifier Observation SHALL contain exactly one [1..1] value with @xsi:type="II" (CONF:4437-3423) value SHALL contain exactly one [1..1] displayable="true"  (CONF:4437-3540)

diff --git a/...l.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdmissionDiagnosisSection2.java b/...l.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdmissionDiagnosisSection2.java
@@ -75,9 +75,9 @@ public interface AdmissionDiagnosisSection2 extends HospitalAdmissionDiagnosisSe
 	public AdmissionDiagnosisSection2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdmissionDiagnosisSection2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdmissionDiagnosisSection2
diff --git a/...mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdmissionMedication.java b/...mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdmissionMedication.java
@@ -111,9 +111,9 @@ public interface AdmissionMedication extends Act {
 	public AdmissionMedication init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdmissionMedication init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdmissionMedication
diff --git a/...dht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdmissionMedication2.java b/...dht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdmissionMedication2.java
@@ -51,9 +51,9 @@ public interface AdmissionMedication2 extends AdmissionMedication {
 	public AdmissionMedication2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdmissionMedication2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdmissionMedication2
diff --git a/.../org/openhealthtools/mdht/uml/cda/consol/AdmissionMedicationsSectionEntriesOptional2.java b/.../org/openhealthtools/mdht/uml/cda/consol/AdmissionMedicationsSectionEntriesOptional2.java
@@ -37,10 +37,10 @@ public interface AdmissionMedicationsSectionEntriesOptional2
 	public AdmissionMedicationsSectionEntriesOptional2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdmissionMedicationsSectionEntriesOptional2 init(
 			Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdmissionMedicationsSectionEntriesOptional2
diff --git a/....cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectiveObservation.java b/....cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectiveObservation.java
@@ -399,9 +399,9 @@ boolean validateAdvanceDirectiveObservationReferenceExternalDocument(DiagnosticC
 	public AdvanceDirectiveObservation init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectiveObservation init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectiveObservation
diff --git a/...cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectiveObservation2.java b/...cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectiveObservation2.java
@@ -292,9 +292,9 @@ boolean validateAdvanceDirectiveObservation2AdvanceDirectiveObservationReference
 	public AdvanceDirectiveObservation2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectiveObservation2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectiveObservation2
diff --git a/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectiveOrganizer.java b/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectiveOrganizer.java
@@ -161,9 +161,9 @@ boolean validateAdvanceDirectiveOrganizerAuthorParticipation(DiagnosticChain dia
 	public AdvanceDirectiveOrganizer init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectiveOrganizer init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectiveOrganizer
diff --git a/...uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSection.java b/...uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSection.java
@@ -100,9 +100,9 @@ boolean validateAdvanceDirectivesSectionAdvanceDirectiveObservation(DiagnosticCh
 	public AdvanceDirectivesSection init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectivesSection init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectivesSection
diff --git a/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSection2.java b/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSection2.java
@@ -127,9 +127,9 @@ boolean validateAdvanceDirectivesSection2EntryAdvanceDirectiveObservation2(Diagn
 	public AdvanceDirectivesSection2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectivesSection2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectivesSection2
diff --git a/.../src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSectionEntriesOptional.java b/.../src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSectionEntriesOptional.java
@@ -18,7 +18,7 @@
  *
  * <!-- begin-model-doc -->
  * <p>
- * This section contains data defining the patient's advance directives and any reference to supporting documentation. The most recent and up-to-date directives are required, if known, and should be listed in as much detail as possible. This section contains data such as the existence of living wills, healthcare proxies, and CPR and resuscitation status. If referenced documents are available, they can be included in the CCD exchange package. 
+ * This section contains data defining the patient's advance directives and any reference to supporting documentation. The most recent and up-to-date directives are required, if known, and should be listed in as much detail as possible. This section contains data such as the existence of living wills, healthcare proxies, and CPR and resuscitation status. If referenced documents are available, they can be included in the CCD exchange package.
  * </p>
  * <p>
  * NOTE: The descriptions in this section differentiate between "advance directives" and "advance directive documents". The former are the directions whereas the latter are legal documents containing those directions. Thus, an advance directive might be "no cardiopulmonary resuscitation", and this directive might be stated in a legal advance directive document.
@@ -126,10 +126,10 @@ boolean validateAdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservati
 	public AdvanceDirectivesSectionEntriesOptional init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectivesSectionEntriesOptional init(
 			Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectivesSectionEntriesOptional
diff --git a/...src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSectionEntriesOptional2.java b/...src/org/openhealthtools/mdht/uml/cda/consol/AdvanceDirectivesSectionEntriesOptional2.java
@@ -61,10 +61,10 @@ boolean validateAdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganize
 	public AdvanceDirectivesSectionEntriesOptional2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AdvanceDirectivesSectionEntriesOptional2 init(
 			Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AdvanceDirectivesSectionEntriesOptional2
diff --git a/...ools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AgeObservation.java b/...ools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AgeObservation.java
@@ -141,9 +141,9 @@ public interface AgeObservation extends Observation {
 	public AgeObservation init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AgeObservation init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AgeObservation
diff --git a/...ls.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSection.java b/...ls.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSection.java
@@ -103,9 +103,9 @@ public interface AllergiesSection extends AllergiesSectionEntriesOptional {
 	public AllergiesSection init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergiesSection init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergiesSection
diff --git a/...s.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSection2.java b/...s.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSection2.java
@@ -65,9 +65,9 @@ public interface AllergiesSection2 extends AllergiesSectionEntriesOptional2 {
 	public AllergiesSection2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergiesSection2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergiesSection2
diff --git a/....consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSectionEntriesOptional.java b/....consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSectionEntriesOptional.java
@@ -116,9 +116,9 @@ boolean validateAllergiesSectionEntriesOptionalAllergyProblemAct(DiagnosticChain
 	public AllergiesSectionEntriesOptional init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergiesSectionEntriesOptional init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergiesSectionEntriesOptional
diff --git a/...consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSectionEntriesOptional2.java b/...consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergiesSectionEntriesOptional2.java
@@ -36,9 +36,9 @@ public interface AllergiesSectionEntriesOptional2 extends AllergiesSectionEntrie
 	public AllergiesSectionEntriesOptional2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergiesSectionEntriesOptional2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergiesSectionEntriesOptional2
diff --git a/....mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyConcernAct2.java b/....mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyConcernAct2.java
@@ -64,9 +64,9 @@ public interface AllergyConcernAct2 extends AllergyProblemAct {
 	public AllergyConcernAct2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergyConcernAct2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergyConcernAct2
diff --git a/....mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyObservation.java b/....mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyObservation.java
@@ -416,9 +416,9 @@ boolean validateAllergyObservationParticipantParticipantRole(DiagnosticChain dia
 	public AllergyObservation init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergyObservation init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergyObservation
diff --git a/...mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyObservation2.java b/...mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyObservation2.java
@@ -219,9 +219,9 @@ boolean validateAllergyObservationParticipantParticipantRolePlayingEntityAllergy
 	public AllergyObservation2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergyObservation2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergyObservation2
diff --git a/...s.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyProblemAct.java b/...s.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyProblemAct.java
@@ -202,9 +202,9 @@ boolean validateAllergyProblemActCDCodeAndCodeSystemValues(DiagnosticChain diagn
 	public AllergyProblemAct init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergyProblemAct init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergyProblemAct
diff --git a/...uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyStatusObservation.java b/...uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyStatusObservation.java
@@ -107,9 +107,9 @@ public interface AllergyStatusObservation extends Observation {
 	public AllergyStatusObservation init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergyStatusObservation init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergyStatusObservation
diff --git a/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyStatusObservation2.java b/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AllergyStatusObservation2.java
@@ -41,9 +41,9 @@ public interface AllergyStatusObservation2 extends AllergyStatusObservation {
 	public AllergyStatusObservation2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AllergyStatusObservation2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AllergyStatusObservation2
diff --git a/...s.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AnesthesiaSection.java b/...s.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AnesthesiaSection.java
@@ -133,9 +133,9 @@ boolean validateAnesthesiaSectionProcedureActivityProcedure(DiagnosticChain diag
 	public AnesthesiaSection init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AnesthesiaSection init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AnesthesiaSection
diff --git a/....mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AnesthesiaSection2.java b/....mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AnesthesiaSection2.java
@@ -60,9 +60,9 @@ public interface AnesthesiaSection2 extends AnesthesiaSection {
 	public AnesthesiaSection2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AnesthesiaSection2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AnesthesiaSection2
diff --git a/...uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentAndPlanSection.java b/...uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentAndPlanSection.java
@@ -105,9 +105,9 @@ boolean validateAssessmentAndPlanSectionPlanOfCareActivityAct(DiagnosticChain di
 	public AssessmentAndPlanSection init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AssessmentAndPlanSection init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AssessmentAndPlanSection
diff --git a/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentAndPlanSection2.java b/...ml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentAndPlanSection2.java
@@ -51,9 +51,9 @@ public interface AssessmentAndPlanSection2 extends AssessmentAndPlanSection {
 	public AssessmentAndPlanSection2 init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AssessmentAndPlanSection2 init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AssessmentAndPlanSection2
diff --git a/...l.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentScaleObservation.java b/...l.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentScaleObservation.java
@@ -301,9 +301,9 @@ boolean validateAssessmentScaleObservationReferenceRangeObservationRange(Diagnos
 	public AssessmentScaleObservation init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AssessmentScaleObservation init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AssessmentScaleObservation
diff --git a/...ol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentScaleSupportingObservation.java b/...ol2/src/org/openhealthtools/mdht/uml/cda/consol/AssessmentScaleSupportingObservation.java
@@ -156,9 +156,9 @@ boolean validateAssessmentScaleSupportingObservationStatusCodeP(DiagnosticChain
 	public AssessmentScaleSupportingObservation init();
 
 	/**
-     * <!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-     * @generated
-     */
+	 * @generated
+	 */
 	public AssessmentScaleSupportingObservation init(Iterable<? extends Initializer<? extends EObject>> initializers);
 } // AssessmentScaleSupportingObservation