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

Commit

Permalink
Fix RT.../Guardian/code terminology error firing when no code
Browse files Browse the repository at this point in the history 
-recordTarget/PatientRole/Patient/Guardian/code: The terminology portion
of the error CONF:1198-5326 should only fire if the code exists but is
firing without a code. The terminology is now enforced as an error only
if the code exists and is invalid. The property portion is a SHOULD and
is and was enforced as a warning correctly.
  • Loading branch information
drbgfc committed Jun 19, 2018
1 parent c84e844 commit f4387c7
Show file tree
Hide file tree
Showing 11 changed files with 13,319 additions and 13,338 deletions.
22 changes: 8 additions & 14 deletions generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.genmodel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13389,9 +13389,9 @@
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/USRealmHeader2TemplateId/diagnostics"/>
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/USRealmHeader2TemplateId/context"/>
</genOperations>
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//USRealmHeader2/GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeP">
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeP/diagnostics"/>
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeP/context"/>
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//USRealmHeader2/USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology">
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology/diagnostics"/>
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology/context"/>
</genOperations>
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="consol.ecore#//USRealmHeader2/USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute">
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="consol.ecore#//USRealmHeader2/USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute/diagnostics"/>
Expand Down
26,446 changes: 13,223 additions & 13,223 deletions generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml
View file

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2619,6 +2619,7 @@ HospitalDischargeStudiesSummarySectionHospitalDischargeStudiesSummarySectionCode
HospitalDischargeStudiesSummarySectionHospitalDischargeStudiesSummarySectionTemplateId = SHALL contain exactly one [1..1] templateId ( CONF:10398 ) such that it SHALL contain exactly one [1..1] @root="2.16.840.1.113883.10.20.22.2.16"
HospitalDischargeStudiesSummarySectionHospitalDischargeStudiesSummarySectionText = Consol Hospital Discharge Studies Summary Section SHALL contain exactly one [1..1] text (CONF:7913)
HospitalDischargeStudiesSummarySectionHospitalDischargeStudiesSummarySectionTitle = Consol Hospital Discharge Studies Summary Section SHALL contain exactly one [1..1] title (CONF:7912)
If = the allergy/intolerance is known to be resolved, but the date of resolution is not known, then the high element SHALL be present, and the nullFlavor attribute SHALL be set to 'UNK'.
ImmunizationActivity2CEImmunizationActivity2CETranslation = Consol CE SHOULD contain zero or more [0..*] translation, which SHALL be selected from ValueSet Medication Route 2.16.840.1.113762.1.4.1099.12 DYNAMIC (CONF:1198-32960, DSTU:1276)
ImmunizationActivity2CEImmunizationActivity2CETranslationP = Consol CE SHOULD contain zero or more [0..*] translation, which SHALL be selected from ValueSet Medication Route 2.16.840.1.113762.1.4.1099.12 DYNAMIC (CONF:1198-32960, DSTU:1276)
ImmunizationActivity2ConsumableImmunizationActivityConsumableImmunizationMedicationInformation = Consol Consumable SHALL contain exactly one [1..1] manufacturedProduct, where its type is Immunization Medication Information2 (CONF:1198-15546)
Expand Down Expand Up @@ -5970,7 +5971,7 @@ USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePl
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) patient SHALL contain exactly one [1..1] ethnicGroupCode, which SHALL be selected from ValueSet EthnicityGroup 2.16.840.1.114222.4.11.837 DYNAMIC (CONF:1198-5323)
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) patient SHALL contain exactly one [1..1] ethnicGroupCode, which SHALL be selected from ValueSet EthnicityGroup 2.16.840.1.114222.4.11.837 DYNAMIC (CONF:1198-5323)
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) patient MAY contain zero or more [0..*] guardian, where its type is Guardian (CONF:1198-5325)
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each MAY contain zero or more [0..*] guardian, where (CONF:1198-5325) guardian SHOULD contain zero or one [0..1] code, which SHALL be selected from ValueSet Personal And Legal Relationship Role Type 2.16.840.1.113883.11.20.12.1 DYNAMIC (CONF:1198-5326)
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each MAY contain zero or more [0..*] guardian, where (CONF:1198-5325) guardian SHOULD contain zero or one [0..1] code (CONF:1198-5326)
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each MAY contain zero or more [0..*] guardian, where (CONF:1198-5325) guardian MAY satisfy: This constraint is being overridden as it has been removed in v2 and should never fire
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeP = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each MAY contain zero or more [0..*] guardian, where (CONF:1198-5325) guardian SHOULD contain zero or one [0..1] code, which SHALL be selected from ValueSet Personal And Legal Relationship Role Type 2.16.840.1.113883.11.20.12.1 DYNAMIC (CONF:1198-5326)
USRealmHeader2GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each MAY contain zero or more [0..*] guardian, where (CONF:1198-5325) each SHOULD contain zero or more [0..*] telecom (CONF:1198-5382) telecom SHOULD contain zero or one [0..1] @use (CONF:7993, R2.1=CONF:1198-7993)
Expand Down Expand Up @@ -6023,11 +6024,12 @@ USRealmHeader2RecordTargetPatientRolePatientGeneralHeaderConstraintsRecordTarget
USRealmHeader2RecordTargetPatientRolePatientGeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay = Consol Patient SHALL contain exactly one [1..1] birthTime (CONF:1198-5298) birthTime SHOULD satisfy: precise to day (CONF:1198-5300)
USRealmHeader2RecordTargetPatientRolePatientGeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear = Consol Patient SHALL contain exactly one [1..1] birthTime (CONF:1198-5298) birthTime SHALL satisfy: precise to year (CONF:1198-5299)
USRealmHeader2RecordTargetPatientRolePatientGeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue = Consol Patient SHALL contain exactly one [1..1] birthTime (CONF:1198-5298) birthTime contain exactly one [1..1] value
USRealmHeader2RecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode = Consol Guardian SHOULD contain zero or one [0..1] code, which SHALL be selected from ValueSet Personal And Legal Relationship Role Type 2.16.840.1.113883.11.20.12.1 DYNAMIC (CONF:1198-5326)
USRealmHeader2RecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode = Consol Guardian SHOULD contain zero or one [0..1] code (CONF:1198-5326)
USRealmHeader2RecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty = Consol Guardian MAY satisfy: This constraint is being overridden as it has been removed in v2 and should never fire
USRealmHeader2RecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeP = Consol Guardian SHOULD contain zero or one [0..1] code, which SHALL be selected from ValueSet Personal And Legal Relationship Role Type 2.16.840.1.113883.11.20.12.1 DYNAMIC (CONF:1198-5326)
USRealmHeader2RecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse = Consol Guardian SHOULD contain zero or more [0..*] telecom (CONF:1198-5382) telecom SHOULD contain zero or one [0..1] @use (CONF:7993, R2.1=CONF:1198-7993)
USRealmHeader2RecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom = Consol Guardian SHOULD contain zero or more [0..*] telecom (CONF:1198-5382)
USRealmHeader2RecordTargetPatientRolePatientGuardianUSRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology = Consol Guardian code, if present, SHALL be selected from ValueSet Personal And Legal Relationship Role Type 2.16.840.1.113883.11.20.12.1 DYNAMIC (CONF:1198-5326)
USRealmHeader2RecordTargetPatientRolePatientLanguageCommunicationGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode = Consol Language Communication SHALL contain exactly one [1..1] languageCode, which SHALL be selected from ValueSet Language 2.16.840.1.113883.1.11.11526 DYNAMIC (CONF:1198-5407)
USRealmHeader2RecordTargetPatientRolePatientLanguageCommunicationGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP = Consol Language Communication SHALL contain exactly one [1..1] languageCode, which SHALL be selected from ValueSet Language 2.16.840.1.113883.1.11.11526 DYNAMIC (CONF:1198-5407)
USRealmHeader2RecordTargetPatientRolePatientLanguageCommunicationGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd = Consol Language Communication SHOULD contain zero or one [0..1] preferenceInd (CONF:1198-5414)
Expand Down Expand Up @@ -6056,6 +6058,7 @@ USRealmHeader2USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRea
USRealmHeader2USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP = Consol US Realm Header (V3) MAY contain zero or more [0..*] informant, where its type is Informant (CONF:1198-8001, CONF:1198-31355) each contain zero or one [0..1] assignedEntity, where each SHALL contain at least one [1..*] addr (CONF:1198-8220) addr SHOULD contain zero or one [0..1] @use, which SHALL be selected from ValueSet PostalAddressUse 2.16.840.1.113883.1.11.10637 STATIC (CONF:7290, R2.1=CONF:81-7290)
USRealmHeader2USRealmHeader2InformationRecipientIntendedRecipientId = Consol US Realm Header (V3) MAY contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-5565) each SHALL contain exactly one [1..1] intendedRecipient, where (CONF:1198-5566) intendedRecipient MAY contain zero or more [0..*] id (CONF:1198-32399)
USRealmHeader2USRealmHeader2LegalAuthenticatorSDTCSignatureText = Consol US Realm Header (V3) SHOULD contain zero or one [0..1] legalAuthenticator, where its type is Legal Authenticator (CONF:1198-5579) legalAuthenticator MAY contain zero or one [0..1] sDTCSignatureText (CONF:1198-30810)
USRealmHeader2USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each MAY contain zero or more [0..*] guardian, where (CONF:1198-5325) guardian code, if present, SHALL be selected from ValueSet Personal And Legal Relationship Role Type 2.16.840.1.113883.11.20.12.1 DYNAMIC (CONF:1198-5326)
USRealmHeader2USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCode = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) patient MAY contain zero or more [0..*] sDTCEthnicGroupCode (ethnicGroupCode) (1198-32901), which SHALL be selected from ValueSet Detailed Ethnicity 2.16.840.1.114222.4.11.877 STATIC
USRealmHeader2USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) patient MAY contain zero or more [0..*] sDTCEthnicGroupCode (ethnicGroupCode) (1198-32901), which SHALL be selected from ValueSet Detailed Ethnicity 2.16.840.1.114222.4.11.877 STATIC
USRealmHeader2USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute = Consol US Realm Header (V3) SHALL contain at least one [1..*] recordTarget, where its type is Record Target (CONF:1198-5266) each SHALL contain exactly one [1..1] patientRole, where (CONF:1198-5267) patient Role SHALL contain exactly one [1..1] patient, where (CONF:1198-5283) each SHALL contain exactly one [1..1] birthTime (CONF:1198-5298) birthTime MAY satisfy: precise to the minute (CONF:1198-32418)
Expand Down
Loading

0 comments on commit f4387c7

Please sign in to comment.