From 0a88cbda75262c053522332297af94dcd713f2a0 Mon Sep 17 00:00:00 2001
From: Niklas Reimer <nr23730@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:08:25 +0000
Subject: [PATCH] Update Wed Nov 20 12:08:25 UTC 2024

---
 .../composition/Anamnese_Kardiologie.oet      | 382 ++++++++++++++++--
 .../composition/Medikation_Kardiologie.oet    | 173 ++++----
 2 files changed, 426 insertions(+), 129 deletions(-)

diff --git a/local/templates/composition/Anamnese_Kardiologie.oet b/local/templates/composition/Anamnese_Kardiologie.oet
index 374a241..1ae0fa4 100644
--- a/local/templates/composition/Anamnese_Kardiologie.oet
+++ b/local/templates/composition/Anamnese_Kardiologie.oet
@@ -47,7 +47,7 @@
             </item>
             <item>
                 <key>sem_ver</key>
-                <value>0.5.12</value>
+                <value>0.5.43</value>
             </item>
             <item>
                 <key>build_uid</key>
@@ -55,7 +55,7 @@
             </item>
             <item>
                 <key>MD5-CAM-1.0.1</key>
-                <value>d896fa239dc1c76232bbb12aee196081</value>
+                <value>0d7a2a57ab4f810780bcf6043bf40e6f</value>
             </item>
             <item>
                 <key>PARENT:MD5-CAM-1.0.1</key>
@@ -219,7 +219,7 @@
                             <includedValues>Niederlande</includedValues>
                             <includedValues>Westeuropa</includedValues>
                             <includedValues>Nordamerika</includedValues>
-                            <includedValues>Andere Region</includedValues>
+                            <includedValues>andere Region</includedValues>
                         </constraint>
                     </Rule>
                     <Rule max="0" path="/items[at0005]"/>
@@ -271,13 +271,271 @@
                     </Rule>
                     <Rule max="0" path="/items[at0018]"/>
                 </Items>
+                <Items archetype_id="openEHR-EHR-CLUSTER.person_birth_data_iso.v0" max="1" path="/data[at0001]/items[at0028]" xsi:type="tem:CLUSTER">
+                    <Rule path="/items[at0002]">
+                        <constraint xsi:type="tem:textConstraint">
+                            <includedValues>ISO-3166 ALPHA-2::AF::Afghanistan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::EG::Ägypten</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AX::Åland Islands</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AL::Albanien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::DZ::Algerien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AD::Andorra</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AO::Angola</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AI::Anguilla</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AQ::Antarktis</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AG::Antigua und Barbuda</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GQ::Äquatorial Guinea</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AR::Argentinien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AM::Armenien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AW::Aruba</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AZ::Aserbaidschan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ET::Äthiopien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AU::Australien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BS::Bahamas</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BH::Bahrain</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BD::Bangladesh</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BB::Barbados</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BE::Belgien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BZ::Belize</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BJ::Benin</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BM::Bermudas</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BT::Bhutan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MM::Birma</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BO::Bolivien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BA::Bosnien-Herzegowina</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BW::Botswana</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BV::Bouvet Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BR::Brasilien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IO::Britisch-Indischer Ozean</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BN::Brunei</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BG::Bulgarien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BF::Burkina Faso</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BI::Burundi</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CL::Chile</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CN::China</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CX::Christmas Island</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CK::Cook Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CR::Costa Rica</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CW::Curaçao</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::DK::Dänemark</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CD::Demokratische Republik Kongo</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::DE::Deutschland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::DJ::Djibuti</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::DM::Dominika</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::DO::Dominikanische Republik</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::EC::Ecuador</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SV::El Salvador</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CI::Elfenbeinküste</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ER::Eritrea</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::EE::Estland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::FK::Falkland Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::FO::Färöer Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::FJ::Fidschi</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::FI::Finnland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::FR::Frankreich</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GF::französisch Guyana</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PF::Französisch Polynesien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TF::Französisches Süd-Territorium</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GA::Gabun</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GM::Gambia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GE::Georgien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GH::Ghana</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GI::Gibraltar</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GD::Grenada</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GR::Griechenland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GL::Grönland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GB::Großbritannien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GP::Guadeloupe</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GU::Guam</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GT::Guatemala</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GG::Guernsey</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GN::Guinea</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GW::Guinea Bissau</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GY::Guyana</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::HT::Haiti</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::HM::Heard und McDonald Islands</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::HN::Honduras</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::HK::Hong Kong</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IN::Indien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ID::Indonesien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IQ::Irak</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IR::Iran</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IE::Irland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IS::Island</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IM::Isle of Man</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IL::Israel</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::IT::Italien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::JM::Jamaika</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::JP::Japan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::YE::Jemen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::JE::Jersey</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::JO::Jordanien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KY::Kaiman Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KH::Kambodscha</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CM::Kamerun</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CA::Kanada</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CV::Kap Verde</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BQ::Karibische Niederlande</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KZ::Kasachstan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KE::Kenia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KG::Kirgisistan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KI::Kiribati</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CC::Kokosinseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CO::Kolumbien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KM::Komoren</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CG::Kongo</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::HR::Kroatien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CU::Kuba</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KW::Kuwait</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LA::Laos</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LS::Lesotho</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LV::Lettland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LB::Libanon</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LR::Liberia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LY::Libyen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LI::Liechtenstein</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LT::Litauen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LU::Luxemburg</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MO::Macao</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MG::Madagaskar</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MW::Malawi</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MY::Malaysia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MV::Malediven</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ML::Mali</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MT::Malta</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MP::Marianen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MA::Marokko</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MH::Marshall Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MQ::Martinique</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MR::Mauretanien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MU::Mauritius</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::YT::Mayotte</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MK::Mazedonien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MX::Mexiko</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::FM::Mikronesien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MZ::Mocambique</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MD::Moldavien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MC::Monaco</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MN::Mongolei</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ME::Montenegro</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MS::Montserrat</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NA::Namibia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NR::Nauru</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NP::Nepal</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NC::Neukaledonien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NZ::Neuseeland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NI::Nicaragua</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NL::Niederlande</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NE::Niger</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NG::Nigeria</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NU::Niue</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KP::Nord Korea</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NF::Norfolk Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::NO::Norwegen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::OM::Oman</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AT::Österreich</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TL::Osttimor</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PK::Pakistan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PS::Palästina</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PW::Palau</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PA::Panama</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PG::Papua Neuguinea</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PY::Paraguay</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PE::Peru</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PH::Philippinen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PN::Pitcairn</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PL::Polen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PT::Portugal</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PR::Puerto Rico</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::QA::Qatar</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::RE::Reunion</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::RW::Ruanda</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::RO::Rumänien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::RU::Russland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LC::Saint Lucia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BL::Saint-Barthélemy</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::MF::Saint-Martin</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ZM::Sambia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AS::Samoa</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::WS::Samoa</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SM::San Marino</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ST::Sao Tome</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SA::Saudi Arabien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SE::Schweden</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CH::Schweiz</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SN::Senegal</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::RS::Serbien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SC::Seychellen</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SL::Sierra Leone</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SG::Singapur</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SX::Sint Maarten</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SK::Slowakei</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SI::Slowenien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SB::Solomon Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SO::Somalia</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ES::Spanien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::LK::Sri Lanka</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SH::St. Helena</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KN::St. Kitts Nevis Anguilla</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::PM::St. Pierre und Miquelon</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VC::St. Vincent</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::KR::Süd Korea</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ZA::Südafrika</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SD::Sudan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::GS::Südgeorgien und die Südlichen Sandwichinseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SS::Südsudan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SR::Surinam</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SJ::Svalbard und Jan Mayen Islands</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SZ::Eswatini</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::SY::Syrien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TJ::Tadschikistan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TW::Taiwan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TZ::Tansania</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TH::Thailand</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TG::Togo</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TK::Tokelau</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TO::Tonga</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TT::Trinidad Tobago</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TD::Tschad</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CZ::Tschechische Republik</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TN::Tunesien</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TR::Türkei</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TM::Turkmenistan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TC::Turks und Kaikos Inseln</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::TV::Tuvalu</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::UG::Uganda</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::UA::Ukraine</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::HU::Ungarn</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::UM::United States Minor Outlying Islands</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::UY::Uruguay</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::UZ::Usbekistan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VU::Vanuatu</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VA::Vatikan</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VE::Venezuela</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::AE::Vereinigte Arabische Emirate</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::US::Vereinigte Staaten von Amerika</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VN::Vietnam</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VG::Virgin Island (Brit.)</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::VI::Virgin Island (USA)</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::WF::Wallis et Futuna</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::BY::Weissrussland</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::EH::Westsahara</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CF::Zentralafrikanische Republik</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::ZW::Zimbabwe</includedValues>
+                            <includedValues>ISO-3166 ALPHA-2::CY::Zypern</includedValues>
+                        </constraint>
+                    </Rule>
+                    <Rule max="0" path="/items[at0003]"/>
+                    <Rule max="0" path="/items[at0004]"/>
+                    <Rule max="0" path="/items[at0005]"/>
+                </Items>
             </Item>
             <Item archetype_id="openEHR-EHR-EVALUATION.ethnicity.v1" max="1" path="/items" xsi:type="tem:EVALUATION">
                 <Rule max="0" path="/data[at0001]/items[at0002]"/>
                 <Rule max="1" path="/data[at0001]/items[at0003]">
                     <constraint xsi:type="tem:textConstraint">
                         <includedValues>kaukasisch</includedValues>
-                        <includedValues>schwarzafrikanisch</includedValues>
+                        <includedValues>afroamerikanisch</includedValues>
                         <includedValues>andere</includedValues>
                     </constraint>
                 </Rule>
@@ -389,17 +647,8 @@
                 <Rule path="/data[at0001]/items[at0002]">
                     <constraint limitToList="false" xsi:type="tem:textConstraint">
                         <includedValues>Kontrastmittel</includedValues>
-                        <includedValues>Iodhaltiges Kontrastmittel</includedValues>
-                        <includedValues>Gadoliniumhaltiges Kontrastmittel</includedValues>
                         <includedValues>Antibiotika</includedValues>
                         <includedValues>Sonstiges</includedValues>
-                        <includedValues>Hausstaub(-milben)</includedValues>
-                        <includedValues>Nickel</includedValues>
-                        <includedValues>Cobalt</includedValues>
-                        <includedValues>Gräser</includedValues>
-                        <includedValues>Parfüme</includedValues>
-                        <includedValues>Kolophonium</includedValues>
-                        <includedValues>Pilzsporen</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/data[at0001]/items[at0130]">
@@ -572,11 +821,8 @@
                 <Rule max="0" path="/protocol[at0011]/items[at1010]"/>
             </Item>
             <Item archetype_id="openEHR-EHR-EVALUATION.tobacco_smoking_summary.v1" max="1" path="/items" xsi:type="tem:EVALUATION">
-                <Rule max="0" path="/data[at0001]/items[at0043]"/>
-                <Rule max="0" path="/data[at0001]/items[at0015]"/>
                 <Rule max="0" path="/data[at0001]/items[at0080]"/>
                 <Rule max="0" path="/data[at0001]/items[at0029]"/>
-                <Rule max="0" path="/data[at0001]/items[at0016]"/>
                 <Rule path="/data[at0001]/items[at0093]">
                     <constraint xsi:type="tem:quantityConstraint">
                         <unitMagnitude>
@@ -594,7 +840,6 @@
                         <includesMinimum>true</includesMinimum>
                     </constraint>
                 </Rule>
-                <Rule max="0" path="/data[at0001]/items[at0019]"/>
                 <Rule max="0" path="/protocol[at0021]/items[at0071]"/>
                 <Rule max="0" path="/protocol[at0021]/items[at0085]"/>
                 <Rule max="0" path="/protocol[at0021]/items[at0075]"/>
@@ -731,7 +976,7 @@
                 <Rule max="0" path="/data[at0001]/items[at0012]"/>
                 <Rule max="1" path="/data[at0001]/items[at0078]">
                     <constraint xsi:type="tem:textConstraint">
-                        <includedValues>Hyperlidämie</includedValues>
+                        <includedValues>Hypercholesterinämie</includedValues>
                         <includedValues>Hypertriglyzeridämie</includedValues>
                         <includedValues>Lp(a)-Erhöhung</includedValues>
                     </constraint>
@@ -811,7 +1056,7 @@
         <Content archetype_id="openEHR-EHR-SECTION.adhoc.v1" concept_name="Ad hoc Überschrift" max="1" name="Vorerkrankungen" path="/content" xsi:type="tem:SECTION">
             <Item archetype_id="openEHR-EHR-EVALUATION.problem_diagnosis.v1" path="/items" xsi:type="tem:EVALUATION">
                 <Rule path="/data[at0001]/items[at0002]">
-                    <constraint limitToList="false" xsi:type="tem:textConstraint">
+                    <constraint xsi:type="tem:textConstraint">
                         <includedValues>Embolischer Gefäßverschluss cerebro vascular</includedValues>
                         <includedValues>Bauchaortenaneurysma</includedValues>
                         <includedValues>Lungenarterienembolie</includedValues>
@@ -833,10 +1078,14 @@
                         <includedValues>Z.n. Krebserkrankung (&gt;5 Jahre)</includedValues>
                         <includedValues>Depression</includedValues>
                         <includedValues>Andere psychiatrische Störung</includedValues>
+                        <includedValues>Schlaganfall</includedValues>
+                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                     </constraint>
                 </Rule>
                 <Rule path="/data[at0001]/items[at0079]">
                     <constraint limitToList="false" xsi:type="tem:textConstraint">
+                        <includedValues>Schlaganfall</includedValues>
+                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                         <includedValues>Amaurosis fugax</includedValues>
                         <includedValues>Retinainfarkt</includedValues>
                         <includedValues>OP Carotiden</includedValues>
@@ -859,9 +1108,8 @@
                         <includedValues>medikamentöse Therapie</includedValues>
                         <includedValues>keine medikamentöse Therapie</includedValues>
                         <includedValues>Dialysepflicht</includedValues>
-                        <includedValues>keine Dialysepflicht</includedValues>
                         <includedValues>Nierentransplantation</includedValues>
-                        <includedValues>keine Nierentransplantation</includedValues>
+                        <includedValues>keine Dialysepflicht/Nierentransplantation</includedValues>
                         <includedValues>Schlafmaskentherapie</includedValues>
                         <includedValues>keine Schlafmaskentherapie</includedValues>
                         <includedValues>Operation</includedValues>
@@ -975,6 +1223,8 @@
                         <includedValues>Z.n. Krebserkrankung (&gt;5 Jahre)</includedValues>
                         <includedValues>Depression</includedValues>
                         <includedValues>Andere psychiatrische Störung</includedValues>
+                        <includedValues>Schlaganfall</includedValues>
+                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                     </constraint>
                     <nameConstraint>
                         <excludedValues>local::at0008</excludedValues>
@@ -1009,6 +1259,8 @@
                         <includedValues>Z.n. Krebserkrankung (&gt;5 Jahre)</includedValues>
                         <includedValues>Depression</includedValues>
                         <includedValues>Andere psychiatrische Störung</includedValues>
+                        <includedValues>Schlaganfall</includedValues>
+                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/data[at0001]/items[at0005]"/>
@@ -1021,12 +1273,12 @@
                     <constraint xsi:type="tem:textConstraint">
                         <includedValues>Koronare Herzerkrankung (KHK)</includedValues>
                         <includedValues>Myokardinfarkt</includedValues>
-                        <includedValues>Akutes Koronarsydrom  (ACS)</includedValues>
+                        <includedValues>Akutes Koronarsydrom (ACS)</includedValues>
                         <includedValues>Angina pectoris</includedValues>
                         <includedValues>Herzinsuffizienz</includedValues>
                         <includedValues>Periphere arterielle Verschlusskrankheit (pAVK)</includedValues>
                         <includedValues>Orthopnoe</includedValues>
-                        <includedValues>Paroxysmale nächtliche Dyspnoe</includedValues>
+                        <includedValues>paroxysmale nächtliche Dyspnoe</includedValues>
                         <includedValues>Nykturie</includedValues>
                         <includedValues>Periphere Ödeme</includedValues>
                         <includedValues>Palpitationen</includedValues>
@@ -1036,12 +1288,11 @@
                         <includedValues>Schwindel</includedValues>
                         <includedValues>Angeborener Herzfehler (EMAH)</includedValues>
                         <includedValues>Embolischer Gefäßverschluss peripher (nicht-cerebral)</includedValues>
-                        <includedValues>Schlaganfall</includedValues>
-                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                         <includedValues>Hirnblutung</includedValues>
                         <includedValues>Aortenplaques</includedValues>
                         <includedValues>Herzklappenerkrankung</includedValues>
                         <includedValues>Cerebrale arterielle Verschlusskrankheit (cAVK)</includedValues>
+                        <includedValues>Artherosklerotische Erkrankung</includedValues>
                     </constraint>
                 </Rule>
                 <Rule path="/data[at0001]/items[at0079]">
@@ -1055,8 +1306,6 @@
                         <includedValues>Schwankschwindel</includedValues>
                         <includedValues>Gangunsicherheit</includedValues>
                         <includedValues>Lagerungsschwindel</includedValues>
-                        <includedValues>Insuffizienz</includedValues>
-                        <includedValues>Stenose</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" name="Behandlung" path="/data[at0001]/items[at0009]"/>
@@ -1076,6 +1325,7 @@
                         <includedValues>Liegen</includedValues>
                         <includedValues>mit Voranzeichen</includedValues>
                         <includedValues>ohne Voranzeichen</includedValues>
+                        <includedValues>Andere</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/data[at0001]/items[at0003]"/>
@@ -1094,6 +1344,20 @@
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/protocol[at0032]/items[at0070]"/>
+                <Items archetype_id="openEHR-EHR-CLUSTER.hospitalization.v0" max="1" path="/protocol[at0032]/items[at0071]" xsi:type="tem:CLUSTER">
+                    <Rule max="0" path="/items[at0007]"/>
+                    <Rule max="0" path="/items[at0004]"/>
+                    <Rule max="0" path="/items[at0005]"/>
+                    <Rule max="0" path="/items[at0006]"/>
+                    <Rule max="1" path="/items[at0012]"/>
+                    <Rule path="/items[at0012]/items[at0002]">
+                        <constraint xsi:type="tem:textConstraint">
+                            <includedValues>stationäre Krankenhausbehandlung aufgrund Verschlechterung der Herzinsuffizienz in den letzten 12 Monaten</includedValues>
+                            <includedValues>keine stationäre Krankenhausbehandlung aufgrund Verschlechterung der Herzinsuffizienz in den letzten 12 Monaten</includedValues>
+                        </constraint>
+                    </Rule>
+                    <Rule max="0" path="/items[at0012]/items[at0013]"/>
+                </Items>
             </Item>
             <Item archetype_id="openEHR-EHR-EVALUATION.exclusion_specific.v1" path="/items" xsi:type="tem:EVALUATION">
                 <Rule max="0" path="/data[at0001]/items[at0002]"/>
@@ -1101,7 +1365,7 @@
                     <constraint xsi:type="tem:textConstraint">
                         <includedValues>Koronare Herzerkrankung (KHK)</includedValues>
                         <includedValues>Myokardinfarkt</includedValues>
-                        <includedValues>Akutes Koronarsydrom  (ACS)</includedValues>
+                        <includedValues>Akutes Koronarsydrom (ACS)</includedValues>
                         <includedValues>Angina pectoris</includedValues>
                         <includedValues>Herzinsuffizienz</includedValues>
                         <includedValues>Periphere arterielle Verschlusskrankheit (pAVK)</includedValues>
@@ -1116,12 +1380,11 @@
                         <includedValues>Schwindel</includedValues>
                         <includedValues>Angeborener Herzfehler (EMAH)</includedValues>
                         <includedValues>Embolischer Gefäßverschluss peripher (nicht-cerebral)</includedValues>
-                        <includedValues>Schlaganfall</includedValues>
-                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                         <includedValues>Hirnblutung</includedValues>
                         <includedValues>Aortenplaques</includedValues>
                         <includedValues>Herzklappenerkrankung</includedValues>
                         <includedValues>Cerebrale arterielle Verschlusskrankheit (cAVK)</includedValues>
+                        <includedValues>Artherosklerotische Erkrankung</includedValues>
                     </constraint>
                     <nameConstraint>
                         <excludedValues>local::at0008</excludedValues>
@@ -1137,7 +1400,7 @@
                     <constraint xsi:type="tem:textConstraint">
                         <includedValues>Koronare Herzerkrankung (KHK)</includedValues>
                         <includedValues>Myokardinfarkt</includedValues>
-                        <includedValues>Akutes Koronarsydrom  (ACS)</includedValues>
+                        <includedValues>Akutes Koronarsydrom (ACS)</includedValues>
                         <includedValues>Angina pectoris</includedValues>
                         <includedValues>Herzinsuffizienz</includedValues>
                         <includedValues>Periphere arterielle Verschlusskrankheit (pAVK)</includedValues>
@@ -1152,12 +1415,11 @@
                         <includedValues>Schwindel</includedValues>
                         <includedValues>Angeborener Herzfehler (EMAH)</includedValues>
                         <includedValues>Embolischer Gefäßverschluss peripher (nicht-cerebral)</includedValues>
-                        <includedValues>Schlaganfall</includedValues>
-                        <includedValues>Transitorische ischämische Attacke (TIA)</includedValues>
                         <includedValues>Hirnblutung</includedValues>
                         <includedValues>Aortenplaques</includedValues>
                         <includedValues>Herzklappenerkrankung</includedValues>
                         <includedValues>Cerebrale arterielle Verschlusskrankheit (cAVK)</includedValues>
+                        <includedValues>Artherosklerotische Erkrankung</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/data[at0001]/items[at0005]"/>
@@ -1188,24 +1450,28 @@
             <Item archetype_id="openEHR-EHR-EVALUATION.device_summary.v0" path="/items" xsi:type="tem:EVALUATION">
                 <Rule path="/data[at0001]/items[at0020]">
                     <constraint xsi:type="tem:textConstraint">
-                        <includedValues>Kardialer Device (implantiert)</includedValues>
+                        <includedValues>Kardialer Device</includedValues>
                         <includedValues>Herz-Kreislauf-Unterstützungssystem</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/data[at0001]/items[at0002]"/>
                 <Rule max="0" path="/data[at0001]/items[at0015]"/>
-                <Rule max="1" path="/data[at0001]/items[at0022]"/>
                 <Rule name="Medizinprodukttyp" path="/data[at0001]/items[at0022]/items[at0007]">
                     <constraint xsi:type="tem:textConstraint">
                         <includedValues>CRT</includedValues>
                         <includedValues>ICD</includedValues>
+                        <includedValues>AAI-Schrittmacher</includedValues>
+                        <includedValues>VVI-Schrittmacher</includedValues>
+                        <includedValues>DDD-Schrittmacher</includedValues>
                         <includedValues>RVAD</includedValues>
                         <includedValues>LVAD</includedValues>
                         <includedValues>BiVAD</includedValues>
                     </constraint>
                 </Rule>
+                <Rule max="0" path="/data[at0001]/items[at0022]/items[at0008]"/>
                 <Rule max="0" path="/data[at0001]/items[at0022]/items[at0012]"/>
                 <Rule max="0" path="/data[at0001]/items[at0022]/items[at0014]"/>
+                <Rule max="0" path="/data[at0001]/items[at0022]/items[at0009]"/>
                 <Rule max="0" path="/data[at0001]/items[at0022]/items[at0023]"/>
                 <Rule max="0" path="/data[at0001]/items[at0022]/items[at0019]"/>
                 <Rule max="0" path="/protocol[at0016]/items[at0017]"/>
@@ -1213,10 +1479,12 @@
             <Item archetype_id="openEHR-EHR-ACTION.procedure.v1" path="/items" xsi:type="tem:ACTION">
                 <Rule path="/description[at0001]/items[at0002]">
                     <constraint xsi:type="tem:textConstraint">
+                        <includedValues>Kardialer Device</includedValues>
+                        <includedValues>Herz-Kreislauf-Unterstützungssystem</includedValues>
                         <includedValues>Koronarintervention mit PCI/Stent</includedValues>
                         <includedValues>Aortokoronoare Bypassoperation</includedValues>
                         <includedValues>Katheterintervention/Operation pAVK</includedValues>
-                        <includedValues>Bauchaortenaneurysma Intervention andere ohne Stents</includedValues>
+                        <includedValues>Intervention Bauchaortenaneurysma</includedValues>
                         <includedValues>Herztransplantation</includedValues>
                         <includedValues>Sonstiger Herzchirurgischer Eingriff</includedValues>
                         <includedValues>Operativer Klappenersatz</includedValues>
@@ -1224,7 +1492,13 @@
                         <includedValues>Katheterinterventionelle TAVI</includedValues>
                     </constraint>
                 </Rule>
-                <Rule max="0" path="/description[at0001]/items[at0070]"/>
+                <Rule max="1" path="/description[at0001]/items[at0070]">
+                    <constraint xsi:type="tem:textConstraint">
+                        <includedValues>Insuffizienz</includedValues>
+                        <includedValues>Stenose</includedValues>
+                        <includedValues>Stenose und Insuffizienz</includedValues>
+                    </constraint>
+                </Rule>
                 <Rule max="1" path="/description[at0001]/items[at0065]">
                     <constraint xsi:type="tem:textConstraint">
                         <includedValues>chirurgisch</includedValues>
@@ -1232,7 +1506,14 @@
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/description[at0001]/items[at0058]"/>
-                <Rule max="0" path="/description[at0001]/items[at0063]"/>
+                <Rule max="1" path="/description[at0001]/items[at0063]">
+                    <constraint xsi:type="tem:textConstraint">
+                        <includedValues>Aortenklappe</includedValues>
+                        <includedValues>Pulmonalklappe</includedValues>
+                        <includedValues>Mitralklappe</includedValues>
+                        <includedValues>Trikuspidalklappe</includedValues>
+                    </constraint>
+                </Rule>
                 <Rule max="0" path="/description[at0001]/items[at0048]"/>
                 <Rule max="0" path="/description[at0001]/items[at0069]"/>
                 <Rule max="0" path="/description[at0001]/items[at0006]"/>
@@ -1263,17 +1544,17 @@
                 <Rule max="0" path="/data[at0001]/items[at0002]"/>
                 <Rule name="Eingriff" path="/data[at0001]/items[at0003]">
                     <constraint xsi:type="tem:textConstraint">
+                        <includedValues>Kardialer Device</includedValues>
+                        <includedValues>Herz-Kreislauf-Unterstützungssystem</includedValues>
                         <includedValues>Koronarintervention mit PCI/Stent</includedValues>
                         <includedValues>Aortokoronoare Bypassoperation</includedValues>
                         <includedValues>Katheterintervention/Operation pAVK</includedValues>
-                        <includedValues>Bauchaortenaneurysma Intervention andere ohne Stents</includedValues>
+                        <includedValues>Intervention Bauchaortenaneurysma</includedValues>
                         <includedValues>Herztransplantation</includedValues>
                         <includedValues>Sonstiger Herzchirurgischer Eingriff</includedValues>
                         <includedValues>Operativer Klappenersatz</includedValues>
                         <includedValues>Operative Klappenrekonstruktion</includedValues>
                         <includedValues>Katheterinterventionelle TAVI</includedValues>
-                        <includedValues>Kardiale Device-Implantation</includedValues>
-                        <includedValues>Herz-Kreislauf-Unterstützungssystem</includedValues>
                     </constraint>
                     <nameConstraint>
                         <excludedValues>local::at0008</excludedValues>
@@ -1287,17 +1568,17 @@
             <Item archetype_id="openEHR-EHR-EVALUATION.absence.v2" path="/items" xsi:type="tem:EVALUATION">
                 <Rule path="/data[at0001]/items[at0002]">
                     <constraint xsi:type="tem:textConstraint">
+                        <includedValues>Kardialer Device</includedValues>
+                        <includedValues>Herz-Kreislauf-Unterstützungssystem</includedValues>
                         <includedValues>Koronarintervention mit PCI/Stent</includedValues>
                         <includedValues>Aortokoronoare Bypassoperation</includedValues>
                         <includedValues>Katheterintervention/Operation pAVK</includedValues>
-                        <includedValues>Bauchaortenaneurysma Intervention andere ohne Stents</includedValues>
+                        <includedValues>Intervention Bauchaortenaneurysma</includedValues>
                         <includedValues>Herztransplantation</includedValues>
                         <includedValues>Sonstiger Herzchirurgischer Eingriff</includedValues>
                         <includedValues>Operativer Klappenersatz</includedValues>
                         <includedValues>Operative Klappenrekonstruktion</includedValues>
                         <includedValues>Katheterinterventionelle TAVI</includedValues>
-                        <includedValues>Kardiale Device-Implantation</includedValues>
-                        <includedValues>Herz-Kreislauf-Unterstützungssystem</includedValues>
                     </constraint>
                 </Rule>
                 <Rule max="0" path="/data[at0001]/items[at0005]"/>
@@ -1307,6 +1588,13 @@
         <Rule max="0" path="/context/other_context[at0001]/items[at0002]"/>
         <Rule max="0" path="/context/other_context[at0001]/items[at0005]"/>
     </definition>
+    <view>
+        <constraints path="[openEHR-EHR-COMPOSITION.report.v1]/content[openEHR-EHR-SECTION.adhoc.v1, 'Allgemeine Daten']/items[openEHR-EHR-ADMIN_ENTRY.person_data.v0]/data[at0001]/items[openEHR-EHR-CLUSTER.person_birth_data_iso.v0]/items">
+            <items id="VisibleInView">
+                <value>items</value>
+            </items>
+        </constraints>
+    </view>
     <integrity_checks archetype_id="openEHR-EHR-COMPOSITION.report.v1" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">005501C1FA493A4838F5F1121F2870EC</digest>
     </integrity_checks>
@@ -1319,6 +1607,9 @@
     <integrity_checks archetype_id="openEHR-EHR-CLUSTER.address.v1" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">5B0F3DD7C67AD080CB799BBBD819A16E</digest>
     </integrity_checks>
+    <integrity_checks archetype_id="openEHR-EHR-CLUSTER.person_birth_data_iso.v0" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
+        <digest id="MD5-CAM-1.0.1">FA9E215CB95BE6F50667A10DEB71F199</digest>
+    </integrity_checks>
     <integrity_checks archetype_id="openEHR-EHR-EVALUATION.ethnicity.v1" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">75F0FE57A0A92ECC8129254AAAE50E4F</digest>
     </integrity_checks>
@@ -1361,6 +1652,9 @@
     <integrity_checks archetype_id="openEHR-EHR-CLUSTER.symptom_sign.v2" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">FCE561F6A986DB8BAAAA657711F52D16</digest>
     </integrity_checks>
+    <integrity_checks archetype_id="openEHR-EHR-CLUSTER.hospitalization.v0" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
+        <digest id="MD5-CAM-1.0.1">9FFE74C18D706649A5A3E239E69D232D</digest>
+    </integrity_checks>
     <integrity_checks archetype_id="openEHR-EHR-OBSERVATION.nyha_heart_failure.v1" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">F17EAAFC478546D29320FFEF082FFF54</digest>
     </integrity_checks>
diff --git a/local/templates/composition/Medikation_Kardiologie.oet b/local/templates/composition/Medikation_Kardiologie.oet
index 9a3f66d..67d00e8 100644
--- a/local/templates/composition/Medikation_Kardiologie.oet
+++ b/local/templates/composition/Medikation_Kardiologie.oet
@@ -37,7 +37,7 @@
             </item>
             <item>
                 <key>sem_ver</key>
-                <value>0.2.2</value>
+                <value>0.2.5</value>
             </item>
             <item>
                 <key>build_uid</key>
@@ -45,7 +45,7 @@
             </item>
             <item>
                 <key>MD5-CAM-1.0.1</key>
-                <value>e1acfd1fe0aa29554426386ee21fac1c</value>
+                <value>d8e95ab37bd096022ae0aacedf25c672</value>
             </item>
             <item>
                 <key>PARENT:MD5-CAM-1.0.1</key>
@@ -116,86 +116,7 @@
                         <includedTypes>Text</includedTypes>
                     </constraint>
                 </Rule>
-                <Rule max="0" name="Gruppe" path="/items[at0133]">
-                    <constraint xsi:type="tem:textConstraint">
-                        <includedValues>ACE-Inhibitor</includedValues>
-                        <includedValues>andere Lipidsenker</includedValues>
-                        <includedValues>andere OAD</includedValues>
-                        <includedValues>Angiotensin-Rezeptor Blocker</includedValues>
-                        <includedValues>Aspirin niedrigdosiert DOAC</includedValues>
-                        <includedValues>Aspirin oder äquivalent</includedValues>
-                        <includedValues>Aspirin plus dual antiplatelet</includedValues>
-                        <includedValues>Atorvastatin</includedValues>
-                        <includedValues>Betablocker</includedValues>
-                        <includedValues>Calcium-Canal Blocker</includedValues>
-                        <includedValues>Digitalis</includedValues>
-                        <includedValues>DPP-4 Antagonist</includedValues>
-                        <includedValues>Ezetimibe</includedValues>
-                        <includedValues>Fluvastatin</includedValues>
-                        <includedValues>Furosemid</includedValues>
-                        <includedValues>GLP-1 Agonist</includedValues>
-                        <includedValues>Harnsäuresenkende Therapie</includedValues>
-                        <includedValues>Insulin</includedValues>
-                        <includedValues>Ivabradin</includedValues>
-                        <includedValues>Klasse I-Antiarrhythmika</includedValues>
-                        <includedValues>Klasse III-Antiarryhthmika</includedValues>
-                        <includedValues>Klasse IV-Antiarrhythmika</includedValues>
-                        <includedValues>Lovastatin</includedValues>
-                        <includedValues>Magnesium-Supplementation</includedValues>
-                        <includedValues>Marcumar/Falithrom</includedValues>
-                        <includedValues>Metformin</includedValues>
-                        <includedValues>Mineralokortikoidrezeptor-Antagonist (MRA)</includedValues>
-                        <includedValues>NSAR</includedValues>
-                        <includedValues>PCSK9-Inhibitor</includedValues>
-                        <includedValues>Pravastatin</includedValues>
-                        <includedValues>Rosuvastatin</includedValues>
-                        <includedValues>Sacubitril/Valsartan (ARNI)</includedValues>
-                        <includedValues>Schleifendiuretika</includedValues>
-                        <includedValues>SGLT-Inhibitor (SGLT2i)</includedValues>
-                        <includedValues>Simvastatin</includedValues>
-                        <includedValues>Statine</includedValues>
-                        <includedValues>Thiazid Diuretika</includedValues>
-                        <includedValues>Thrombozytenaggregationshemmer</includedValues>
-                        <includedValues>Torasemid</includedValues>
-                    </constraint>
-                </Rule>
-                <Items archetype_id="openEHR-EHR-CLUSTER.medication_supply_amount.v0" path="/items[at0141]" xsi:type="tem:CLUSTER">
-                    <Rule path="/items[at0161]">
-                        <constraint xsi:type="tem:textConstraint">
-                            <includedValues>morgens</includedValues>
-                            <includedValues>mittags</includedValues>
-                            <includedValues>abends</includedValues>
-                            <includedValues>nachts</includedValues>
-                        </constraint>
-                    </Rule>
-                    <Rule path="/items[at0131]">
-                        <constraint xsi:type="tem:quantityConstraint">
-                            <includedUnits>1</includedUnits>
-                            <unitMagnitude>
-                                <unit>1</unit>
-                                <minMagnitude>0.0</minMagnitude>
-                                <includesMaximum>false</includesMaximum>
-                                <includesMinimum>true</includesMinimum>
-                            </unitMagnitude>
-                        </constraint>
-                    </Rule>
-                    <Rule max="0" path="/items[at0158]">
-                        <constraint xsi:type="tem:countConstraint">
-                            <minMagnitude>1</minMagnitude>
-                            <includesMaximum>false</includesMaximum>
-                            <includesMinimum>true</includesMinimum>
-                        </constraint>
-                    </Rule>
-                    <Rule max="0" path="/items[at0159]"/>
-                    <Rule max="0" path="/items[at0142]">
-                        <constraint xsi:type="tem:durationConstraint">
-                            <pattern>PYMWDTS</pattern>
-                            <minMagnitude>P0D</minMagnitude>
-                            <includesMaximum>false</includesMaximum>
-                            <includesMinimum>true</includesMinimum>
-                        </constraint>
-                    </Rule>
-                </Items>
+                <Rule max="0" path="/items[at0133]"/>
                 <Items archetype_id="openEHR-EHR-CLUSTER.drug_class.v0" path="/items[at0141]" xsi:type="tem:CLUSTER">
                     <Rule path="/items[at0001]">
                         <constraint xsi:type="tem:textConstraint">
@@ -243,6 +164,85 @@
                     <Rule max="0" path="/items[at0004]"/>
                     <Rule max="0" path="/items[at0007]"/>
                 </Items>
+                <Items archetype_id="openEHR-EHR-CLUSTER.dosage.v2" path="/items[at0141]" xsi:type="tem:CLUSTER">
+                    <Rule max="0" path="/items[at0164]">
+                        <constraint xsi:type="tem:countConstraint">
+                            <minMagnitude>1</minMagnitude>
+                            <includesMaximum>false</includesMaximum>
+                            <includesMinimum>true</includesMinimum>
+                        </constraint>
+                    </Rule>
+                    <Rule path="/items[at0144]">
+                        <constraint xsi:type="tem:quantityConstraint">
+                            <includedUnits>1</includedUnits>
+                            <unitMagnitude>
+                                <unit>1</unit>
+                                <minMagnitude>0.0</minMagnitude>
+                                <includesMaximum>false</includesMaximum>
+                                <includesMinimum>true</includesMinimum>
+                            </unitMagnitude>
+                        </constraint>
+                    </Rule>
+                    <Rule max="0" path="/items[at0135]">
+                        <constraint xsi:type="tem:multipleConstraint">
+                            <includedTypes>Text</includedTypes>
+                            <includedTypes>Quantity</includedTypes>
+                        </constraint>
+                    </Rule>
+                    <Rule max="0" path="/items[at0178]"/>
+                    <Rule max="0" path="/items[at0134]">
+                        <constraint xsi:type="tem:multipleConstraint">
+                            <includedTypes>Quantity</includedTypes>
+                            <includedTypes>Text</includedTypes>
+                        </constraint>
+                    </Rule>
+                    <Rule max="0" path="/items[at0102]">
+                        <constraint xsi:type="tem:multipleConstraint">
+                            <includedTypes>Duration</includedTypes>
+                            <includedTypes>Interval</includedTypes>
+                        </constraint>
+                    </Rule>
+                    <Rule max="0" path="/items[at0176]">
+                        <constraint xsi:type="tem:multipleConstraint">
+                            <includedTypes>Quantity</includedTypes>
+                            <includedTypes>Interval</includedTypes>
+                        </constraint>
+                    </Rule>
+                    <Items archetype_id="openEHR-EHR-CLUSTER.timing_daily.v1" max="1" path="/items[at0037]" xsi:type="tem:CLUSTER">
+                        <Rule max="0" path="/items[at0003]">
+                            <constraint xsi:type="tem:multipleConstraint">
+                                <includedTypes>Quantity</includedTypes>
+                                <includedTypes>Interval</includedTypes>
+                            </constraint>
+                        </Rule>
+                        <Rule max="0" path="/items[at0014]">
+                            <constraint xsi:type="tem:durationConstraint">
+                                <pattern>PTHMS</pattern>
+                                <maxMagnitude>PT24H</maxMagnitude>
+                                <minMagnitude>PT0H</minMagnitude>
+                                <includesMaximum>true</includesMaximum>
+                                <includesMinimum>true</includesMinimum>
+                            </constraint>
+                        </Rule>
+                        <Rule max="0" path="/items[at0004]">
+                            <constraint xsi:type="tem:multipleConstraint">
+                                <includedTypes>Time</includedTypes>
+                                <includedTypes>Interval</includedTypes>
+                            </constraint>
+                        </Rule>
+                        <Rule path="/items[at0027]">
+                            <constraint xsi:type="tem:textConstraint">
+                                <includedValues>morgens</includedValues>
+                                <includedValues>mittags</includedValues>
+                                <includedValues>abends</includedValues>
+                                <includedValues>nachts</includedValues>
+                            </constraint>
+                        </Rule>
+                        <Rule max="0" path="/items[at0023]"/>
+                        <Rule max="0" path="/items[at0039]"/>
+                        <Rule max="0" path="/items[at0035]"/>
+                    </Items>
+                </Items>
             </Items>
         </Content>
         <Rule max="0" path="/context/other_context[at0001]/items[at0002]"/>
@@ -257,10 +257,13 @@
     <integrity_checks archetype_id="openEHR-EHR-CLUSTER.medication.v2" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">89BA41E6CD217F7E2639D05A6B02465C</digest>
     </integrity_checks>
-    <integrity_checks archetype_id="openEHR-EHR-CLUSTER.medication_supply_amount.v0" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
-        <digest id="MD5-CAM-1.0.1">EE0C097D86C864115F3C4480B21599C4</digest>
-    </integrity_checks>
     <integrity_checks archetype_id="openEHR-EHR-CLUSTER.drug_class.v0" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">014E566E2D6FA001BE95EAA621A78F3A</digest>
     </integrity_checks>
+    <integrity_checks archetype_id="openEHR-EHR-CLUSTER.dosage.v2" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
+        <digest id="MD5-CAM-1.0.1">926B8773E3FBB271F2820D4198B4F63E</digest>
+    </integrity_checks>
+    <integrity_checks archetype_id="openEHR-EHR-CLUSTER.timing_daily.v1" xmlns:tem="openEHR/v1/Template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
+        <digest id="MD5-CAM-1.0.1">BBF04254F8BEA1421AF2CC97A0B64624</digest>
+    </integrity_checks>
 </template>