3 files changed, 49 insertions, 54 deletions
diff --git a/server/xml/templates/amd_behandling.xml b/server/xml/templates/amd_behandling.xml
index 5c9c04d..016a6f2 100644
--- a/server/xml/templates/amd_behandling.xml
+++ b/server/xml/templates/amd_behandling.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <course name="amd_kontrolunders" version="1.0" title="AMD behandling"
 	resume="Behandling af AMD med Lucentis">
-  <macro name="B.0" static="true"/>
+  <macro name="header" static="true"/>
   
   <macro header="Behandling"/>
-  <macro name="B.3.1.1"/>
-  <macro name="B.3.1.2"/>
-  <macro name="B.3.1.3"/>
+  <macro name="amdinjektionindikation"/>
+  <macro name="5steps"/>
+  <macro name="amdprocedure"/>
 
 </course>
 
diff --git a/server/xml/templates/amd_forunders.xml b/server/xml/templates/amd_forunders.xml
index 66b6be8..1245b99 100644
--- a/server/xml/templates/amd_forunders.xml
+++ b/server/xml/templates/amd_forunders.xml
@@ -1,39 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <course name="amd_forunders" version="1.0" title="AMD forundersøgelse">
-  <macro name="B.0" static="true"/>
-  <macro name="B.0.1"/>
+  <macro name="header" static="true"/>
+  <macro name="referral"/>
   
   <macro header="Anamnese"/>
-  <macro name="B.1.1" requires="B.0.1"/>
-  <macro name="B.1.2" requires="B.0.1" compact="true"/>
-  <macro name="B.1.3" requires="B.0.1"/>
-  <macro name="B.2.1.1" requires="B.0.1"/>
-  <macro name="B.2.1.2" requires="B.0.1"/>
-  <macro name="B.2.1.3" requires="B.0.1"/>
+  <macro name="cave" requires="referral"/>
+  <macro name="medicine" requires="referral" compact="true"/>
+  <macro name="previouscommon" requires="referral"/>
+  <macro name="tobacco" requires="referral"/>
+  <macro name="preveyediseases" requires="referral"/>
+  <macro name="current" requires="referral"/>
 
   <macro header="Objektiv undersøgelse"/>
-  <macro name="B.2.2.1" requires="B.0.1"/>
-  <macro name="B.2.2.2" requires="B.0.1"/>
-  <macro name="B.2.2.3" requires="B.0.1"/>
-  <macro name="B.2.2.4.1" requires="B.0.1"/>
-  <macro name="B.2.2.4.2" requires="B.0.1,B.2.2.4.1"/>
-  <macro name="B.2.2.5" requires="B.0.1"/>
-  <macro name="B.2.2.6" requires="B.0.1"/>
-  <macro name="B.2.2.7" requires="B.0.1"/>
-  <macro name="B.2.2.8" requires="B.0.1"/>
+  <macro name="visus" requires="referral"/>
+  <macro name="lensmeter" requires="referral"/>
+  <macro name="autoref" requires="referral"/>
+  <macro name="octmeasurement" requires="referral"/>
+  <macro name="octevaluation" requires="referral, octmeasurement"/>
+  <macro name="pressure" requires="referral"/>
+  <macro name="slitlamp" requires="referral"/>
+  <macro name="90Dlens" requires="referral"/>
+  <macro name="amdpreopconclusion" requires="referral"/>
 
   <macro header="Øjendrypning"/>
-  <macro name="B.2.3" requires="B.0.1"/>
+  <macro name="ocgtt" requires="referral"/>
 
   <macro header="Fluorescens angiografi"/>
-  <macro name="B.2.7.1" requires="B.0.1"/>
-  <macro name="B.2.7.2" requires="B.0.1"/>
-  <macro name="B.2.7.3" requires="B.0.1"/>
+  <macro name="fluoresceininj" requires="referral"/>
+  <macro name="fluoresceinphases" requires="referral"/>
+  <macro name="fluoresceinconclusion" requires="referral"/>
 
   <macro header="Samlet konklusion"/>
-  <macro name="B.2.10.1" requires="B.0.1"/>
-  <macro name="B.2.10.2" requires="B.0.1"/>
-  <macro name="B.2.10.3" requires="B.0.1" compact="true"/>
+  <macro name="amdinformation" requires="referral"/>
+  <macro name="amdindication" requires="referral"/>
+  <macro name="amdconsent" requires="referral" compact="true"/>
 
 </course>
-
diff --git a/server/xml/templates/amd_kontrolunders.xml b/server/xml/templates/amd_kontrolunders.xml
index bfe7de8..5d81b0a 100644
--- a/server/xml/templates/amd_kontrolunders.xml
+++ b/server/xml/templates/amd_kontrolunders.xml
@@ -1,40 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <course name="amd_kontrolunders" version="1.0" title="AMD kontrolundersøgelse"
 	resume="Kontrolundersøgelse i AMD forløb">
-  <macro name="B.0" static="true"/>
+  <macro name="header" static="true"/>
   
   <macro header="Anamnese"/>
-  <macro name="B.1.1"/>
-  <macro name="B.1.2" compact="true"/>
-  <macro name="B.1.4"/>
-  <macro name="B.2.1.3"/>
+  <macro name="cave"/>
+  <macro name="medicine" compact="true"/>
+  <macro name="subjeval"/>
+  <macro name="current"/>
 
   <macro header="Objektiv undersøgelse"/>
-  <macro name="B.2.2.1"/>
-  <macro name="B.2.2.2"/>
-  <macro name="B.2.2.3"/>
-  <macro name="B.2.2.4.1"/>
-  <macro name="B.2.2.4.2"/>
-  <macro name="B.2.2.5"/>
-
-  <macro name="B.2.2.6"/>
-  <macro name="B.2.2.7"/>
-  <macro name="B.2.2.8"/>
-
-  <macro name="B.2.5"/>
+  <macro name="visus"/>
+  <macro name="lensmeter"/>
+  <macro name="autoref"/>
+  <macro name="octmeasurement"/>
+  <macro name="octevaluation" requires="octmeasurement"/>
+  <macro name="pressure"/>
+  <macro name="slitlamp"/>
+  <macro name="90Dlens"/>
+  <macro name="amdpreopconclusion"/>
+  <macro name="fundus"/>
 
   <macro header="Øjendrypning"/>
-  <macro name="B.2.3"/>
+  <macro name="ocgtt"/>
 
   <macro header="Fluorescens angiografi"/>
-
-  <macro name="B.2.7.2"/>
-  <macro name="B.2.7.3"/>
+  <macro name="fluoresceinphases"/>
+  <macro name="fluoresceinconclusion"/>
 
   <macro header="Samlet konklusion"/>
-  <macro name="B.2.10.1"/>
-  <macro name="B.2.10.4"/>
-  <macro name="B.2.10.3" compact="true"/>
+  <macro name="amdinformation"/>
+  <macro name="amdtreatmentindication"/>
+  <macro name="amdconsent" compact="true"/>
 
 </course>
-