diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/CDA_Pharma.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/CDA_Pharma.xsd new file mode 100755 index 0000000000000000000000000000000000000000..92d38944b76531887a1641db400a1a437611adcb --- /dev/null +++ b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/CDA_Pharma.xsd @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +******************************************************************************* +Schema for HL7 Clinical Document Architecture (CDA) R2 (2005) + +Containing extensions for : +- POCD_MT000040.Material (HL7 Pharmacy CDA extensions) +- translated desinations for the coded elements (International Patient Summary (IPS) CDA extensions) + + +History: +2018.06.28 Giorgio Cangioli, first version based on the ELGA XML schema created by Tony Schaller, medshare GmbH, Switzerland +2022.02.25 Giorgio Cangioli, added part extension (pharma namespace) + +******************************************************************************* +--> +<xs:schema xmlns:hl7v3="urn:hl7-org:v3" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:hl7-org:v3" elementFormDefault="qualified"> + <xs:include schemaLocation="POCD_MT000040_Pharma.xsd"/> + <xs:element name="ClinicalDocument" type="hl7v3:POCD_MT000040.ClinicalDocument"/> +</xs:schema> diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/datatypes-base.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/datatypes-base.xsd old mode 100755 new mode 100644 diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/datatypes.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/datatypes.xsd old mode 100755 new mode 100644 diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/narrative-block.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/narrative-block.xsd old mode 100755 new mode 100644 diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/voc.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/coreschemas/voc.xsd old mode 100755 new mode 100644 diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/COCT_MT230100UV01_extPHARM.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/COCT_MT230100UV01_extPHARM.xsd old mode 100755 new mode 100644 index 4266cbd5a894367f3b95d5a4cec96e91829fbcbd..affc0e7fe9a89900a9cb4ff80a85a878fb54c07b --- a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/COCT_MT230100UV01_extPHARM.xsd +++ b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/COCT_MT230100UV01_extPHARM.xsd @@ -35,6 +35,9 @@ applied to the POCD_MT000040.Material class History: 2018.06.29 Giorgio Cangioli, first version +2023.01.30 Giorgio Cangioli, asContent and part quantity: RTO demoted to PQ as for the Pharmacy Template +2023.02.03 Giorgio Cangioli, changes applied per https://jira.hl7.org/browse/CDA-20668 +2023.04.11 Giorgio Cangioli, nested asContent quantity: RTO demoted to PQ as for the Pharmacy Template ******************************************************************************* --> @@ -138,8 +141,9 @@ StaticMifToXsd.xsl version 2.0</xs:documentation> <xs:complexType name="COCT_MT230100UV01.Content"> <xs:sequence> <xs:group ref="hl7v3:InfrastructureRootElements"/> - <!-- Manual fix by the eHDSI Solution Provider datatype hl7v3:RTO -> hl7v3:PQ --> <xs:element name="quantity" type="hl7v3:PQ" minOccurs="0" maxOccurs="1"/> + <!-- demoted to PQ as agreed for the Pharmacy Template --> + <!-- <xs:element name="quantity" type="hl7v3:RTO" minOccurs="0" maxOccurs="1"/> --> <xs:element name="containerPackagedProduct" type="pharm:COCT_MT230100UV01.PackagedProduct" minOccurs="1" maxOccurs="1"/> <!-- HL7 Pharma extensions for the IPS: items removed from the original schema <xs:element name="subjectOf1" type="pharm:COCT_MT230100UV01.Subject1" nillable="true" minOccurs="0" maxOccurs="unbounded"/> @@ -153,7 +157,6 @@ StaticMifToXsd.xsl version 2.0</xs:documentation> <xs:complexType name="COCT_MT230100UV01.Content1"> <xs:sequence> <xs:group ref="hl7v3:InfrastructureRootElements"/> - <!-- Manual fix by the eHDSI Solution Provider datatype hl7v3:RTO -> hl7v3:PQ --> <xs:element name="quantity" type="hl7v3:PQ" minOccurs="0" maxOccurs="1"/> <xs:element name="containerPackagedProduct" type="pharm:COCT_MT230100UV01.PackagedProduct" minOccurs="1" maxOccurs="1"/> </xs:sequence> @@ -291,8 +294,9 @@ StaticMifToXsd.xsl version 2.0</xs:documentation> <xs:sequence> <xs:group ref="hl7v3:InfrastructureRootElements"/> <xs:element name="id" type="hl7v3:II" minOccurs="0" maxOccurs="1"/> - <!-- Manual fix by the eHDSI Solution Provider datatype hl7v3:RTO -> hl7v3:PQ --> <xs:element name="quantity" type="hl7v3:PQ" minOccurs="0" maxOccurs="1"/> + <!-- demoted to PQ as agreed for the Pharmacy Template --> + <!-- <xs:element name="quantity" type="hl7v3:RTO" minOccurs="0" maxOccurs="1"/> --> <xs:element name="partProduct" type="pharm:COCT_MT230100UV01.Product" minOccurs="1" maxOccurs="1"/> <xs:element name="subjectOf" type="pharm:COCT_MT230100UV01.Subject6" nillable="true" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> @@ -312,6 +316,13 @@ StaticMifToXsd.xsl version 2.0</xs:documentation> <xs:complexType name="COCT_MT230100UV01.Product"> <xs:sequence> <xs:group ref="hl7v3:InfrastructureRootElements"/> + <!-- added per https://jira.hl7.org/browse/CDA-20668 begin --> + <xs:element name="code" type="hl7v3:CE" minOccurs="0"/> + <xs:element name="name" type="hl7v3:EN" minOccurs="0"/> + <xs:element name="desc" type="hl7v3:ED" minOccurs="0"/> + <xs:element name="formCode" type="hl7v3:CE" minOccurs="0" maxOccurs="1"/> + <xs:element name="expirationTime" type="hl7v3:IVL_TS" minOccurs="0"/> + <!-- added per https://jira.hl7.org/browse/CDA-20668 end --> <xs:element name="asContent" type="pharm:COCT_MT230100UV01.Content" nillable="true" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="asSpecializedKind" type="pharm:COCT_MT230100UV01.SpecializedKind" nillable="true" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="part" type="pharm:COCT_MT230100UV01.Part" nillable="true" minOccurs="0" maxOccurs="unbounded"/> diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/hl7v3_extPHARM.xsd b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/hl7v3_extPHARM.xsd old mode 100755 new mode 100644 index 05779f09ca57253c0caf324e4f5830f30301dbc4..4a2ba2f220ee212b9829cd5eaff0b5ebfbbb9537 --- a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/hl7v3_extPHARM.xsd +++ b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/extPHARM/hl7v3_extPHARM.xsd @@ -6,16 +6,12 @@ Currently included by POCD_MT000040_extPHARM.xsd, COCT_MT230100UV01_extPHARM.xsd History: 2018.06.29 Giorgio Cangioli, first version based on the ELGA XML schema created by Tony Schaller, medshare GmbH, Switzerland - +2023.30.01 Giorgio Cangioli, fixed the error with the first annotation ******************************************************************************* --> <xs:schema xmlns:hl7v3="urn:hl7-org:v3" xmlns:pharm="urn:hl7-org:pharm" xmlns:ips="urn:hl7-org:ips" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:hl7-org:v3" elementFormDefault="qualified"> <xs:include schemaLocation="../coreschemas/datatypes.xsd"> - <xs:annotation> - <xs:documentation> - The included coreschemas/datatypes-base.xsd has been modified to include the IPS extensions for coded elements (e.g. CD, CE,...) - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The included coreschemas/datatypes-base.xsd has been modified to include the Pharmacy / IPS extensions for coded elements (e.g. CD, CE,...)</xs:documentation></xs:annotation> </xs:include> <!-- this comes originally from infrastructureRoot.xsd of HL7 V3 Normative Edition 2010 --> <xs:group name="InfrastructureRootElements"> diff --git a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/xsd.zip b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/xsd.zip index 4bcdb6be0daf0a159e09453494d40206d0fbc40c..35ee0755b59f4e8da6bef1769db0b7b56418ebde 100644 Binary files a/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/xsd.zip and b/hl7templates/hl7templates-packager-jar/src/main/resources/eHDSI-resources/xsd/xsd.zip differ