diff options
Diffstat (limited to 'server/xml')
| -rw-r--r-- | server/xml/macros/90D_linse-1.0.xml (renamed from server/xml/macros/90Dlens-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/aktuelle-1.0.xml (renamed from server/xml/macros/current-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/allergier-1.0.xml (renamed from server/xml/macros/cave-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/amd_behandlingsindikation-1.0.xml (renamed from server/xml/macros/amdindication-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/amd_procedure-1.0.xml (renamed from server/xml/macros/amdprocedure-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/autorefraktion-1.0.xml (renamed from server/xml/macros/autoref-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/egen_brille-1.0.xml (renamed from server/xml/macros/lensmeter-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/fluorescens_faser-1.0.xml (renamed from server/xml/macros/fluoresceinphases-1.0.xml) | 4 | ||||
| -rw-r--r-- | server/xml/macros/fluorescens_injektion-1.0.xml (renamed from server/xml/macros/fluoresceininj-1.0.xml) | 4 | ||||
| -rw-r--r-- | server/xml/macros/fluorescens_konklusion-1.0.xml (renamed from server/xml/macros/fluoresceinconclusion-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/gennemgang_af_de_5_trin-1.0.xml (renamed from server/xml/macros/5steps-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/henvisning-1.0.xml (renamed from server/xml/macros/referral-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/information-1.0.xml (renamed from server/xml/macros/amdinformation-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/informeret_samtykke-1.0.xml (renamed from server/xml/macros/amdconsent-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/intravitreal_injektion_indikation-1.0.xml (renamed from server/xml/macros/amdinjektionindikation-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/medicin-1.0.xml (renamed from server/xml/macros/medicine-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/oct_konklusion-1.0.xml (renamed from server/xml/macros/octevaluation-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/oct_maaling-1.0.xml (renamed from server/xml/macros/octmeasurement-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/oejendrypning-1.0.xml (renamed from server/xml/macros/ocgtt-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/oejentryk-1.0.xml (renamed from server/xml/macros/pressure-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/spaltelampe-1.0.xml (renamed from server/xml/macros/slitlamp-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/subjektiv_evaluering-1.0.xml (renamed from server/xml/macros/subjeval-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/tidligere_alment-1.0.xml (renamed from server/xml/macros/previouscommon-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/tidligere_oejensygdomme-1.0.xml (renamed from server/xml/macros/preveyediseases-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/tobaksrygning-1.0.xml (renamed from server/xml/macros/tobacco-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/vurdering_af_fundus-1.0.xml (renamed from server/xml/macros/fundus-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/macros/yderligere_diagnostik-1.0.xml (renamed from server/xml/macros/amdpreopconclusion-1.0.xml) | 2 | ||||
| -rw-r--r-- | server/xml/templates/amd_behandling.xml | 6 | ||||
| -rw-r--r-- | server/xml/templates/amd_forunders.xml | 46 | ||||
| -rw-r--r-- | server/xml/templates/amd_kontrolunders.xml | 38 | 
30 files changed, 74 insertions, 74 deletions
| diff --git a/server/xml/macros/90Dlens-1.0.xml b/server/xml/macros/90D_linse-1.0.xml index 4219efe..2778446 100644 --- a/server/xml/macros/90Dlens-1.0.xml +++ b/server/xml/macros/90D_linse-1.0.xml @@ -12,7 +12,7 @@      20090420: Bent Bisballe Nyeng      Nyt resume.    --> -<macro name="90Dlens" version="1.0"> +<macro name="90D_linse" version="1.0">    <resume language="lua">      out = '90D linse:' diff --git a/server/xml/macros/current-1.0.xml b/server/xml/macros/aktuelle-1.0.xml index 263c4fe..444d450 100644 --- a/server/xml/macros/current-1.0.xml +++ b/server/xml/macros/aktuelle-1.0.xml @@ -20,7 +20,7 @@      20090320: Bent Bisballe Nyeng      Begge øjne er nu på, på samme tid. Resume er lavet intelligent.    --> -<macro name="current" version="1.0"> +<macro name="aktuelle" version="1.0">    <resume language="lua">      out = 'Aktuelle:\n' diff --git a/server/xml/macros/cave-1.0.xml b/server/xml/macros/allergier-1.0.xml index 12c5b61..ba8f597 100644 --- a/server/xml/macros/cave-1.0.xml +++ b/server/xml/macros/allergier-1.0.xml @@ -8,7 +8,7 @@      Alt tekst ændret.      Layout af multilist input er ændret så det er liniebaseret.    --> -<macro name="cave" version="1.0"> +<macro name="allergier" version="1.0">    <resume>Allergier:  ${cave}</resume>    <queries> diff --git a/server/xml/macros/amdindication-1.0.xml b/server/xml/macros/amd_behandlingsindikation-1.0.xml index e1ed3c3..0511b98 100644 --- a/server/xml/macros/amdindication-1.0.xml +++ b/server/xml/macros/amd_behandlingsindikation-1.0.xml @@ -3,7 +3,7 @@      20081202: Lars Bisballe Jensen      Ændret til nyt format i resume og naming scheme.    --> -<macro name="amdindication" version="1.0"> +<macro name="amd_behandlingsindikation" version="1.0">    <resume>${amd.indication}</resume>    <queries>    </queries> diff --git a/server/xml/macros/amdprocedure-1.0.xml b/server/xml/macros/amd_procedure-1.0.xml index abcc81a..6fbde6e 100644 --- a/server/xml/macros/amdprocedure-1.0.xml +++ b/server/xml/macros/amd_procedure-1.0.xml @@ -1,5 +1,5 @@  <?xml version='1.0' encoding='UTF-8'?> -<macro name="amdprocedure" version="1.0"> +<macro name="amd_procedure" version="1.0">    <resume>Der afvaskes periorbitalt med Povidoniodid og efterfølgende dryppes  der med Povidoniodid. Efter 5 minutter bedøves med en spongostan swap  vædet i Lidokain 20 mg/ml med Adrenalin. diff --git a/server/xml/macros/autoref-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml index 61c2a81..f7e78af 100644 --- a/server/xml/macros/autoref-1.0.xml +++ b/server/xml/macros/autorefraktion-1.0.xml @@ -11,7 +11,7 @@      20090402: Bent Bisballe Nyeng      'missing eye' tilføjet.    --> -<macro name="autoref" version="1.0"> +<macro name="autorefraktion" version="1.0">    <resume language="lua">      out = ''      if ( getValue('autorefractor.right.missing') == '' ) diff --git a/server/xml/macros/lensmeter-1.0.xml b/server/xml/macros/egen_brille-1.0.xml index 5b828b4..19eb15a 100644 --- a/server/xml/macros/lensmeter-1.0.xml +++ b/server/xml/macros/egen_brille-1.0.xml @@ -11,7 +11,7 @@      20090202: Bent Bisballe Nyeng      'missing eye' tilføjet.    --> -<macro name="lensmeter" version="1.0"> +<macro name="egen_brille" version="1.0">    <resume language="lua">      out = ''      if ( getValue('lensmeter.right.missing') == '' ) diff --git a/server/xml/macros/fluoresceinphases-1.0.xml b/server/xml/macros/fluorescens_faser-1.0.xml index b530687..7f1c397 100644 --- a/server/xml/macros/fluoresceinphases-1.0.xml +++ b/server/xml/macros/fluorescens_faser-1.0.xml @@ -3,7 +3,7 @@      20081204: Bent Bisballe Nyeng      Feltnavnene ændret så de giver mening.    --> -<macro name="fluoresceinphases" version="1.0"> +<macro name="fluorescens_faser" version="1.0">    <resume>Undersøgelsen viser god fyldning af det retinale kartræ.  Svarende til det retinale ødem ses der i de tidlige faser @@ -17,7 +17,7 @@ ${fluorescens.angiografic_fases}.</resume>    </maps>    <scripts>    </scripts> -  <widgets caption="Beskrivelse (B.2.7.2)" +  <widgets caption="Faser (B.2.7.2)"            layout="vbox">      <frame layout="vbox"> diff --git a/server/xml/macros/fluoresceininj-1.0.xml b/server/xml/macros/fluorescens_injektion-1.0.xml index 648933b..e011194 100644 --- a/server/xml/macros/fluoresceininj-1.0.xml +++ b/server/xml/macros/fluorescens_injektion-1.0.xml @@ -3,7 +3,7 @@      20081204: Bent Bisballe Nyeng      Feltnavnene ændret så de giver mening.    --> -<macro name="fluoresceininj" version="1.0"> +<macro name="fluorescens_injektion" version="1.0">    <resume>I henhold til ovenstående ordination foretages der fluorescein angiografi efter afdelingens retningslinier.  Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>    <queries> @@ -12,7 +12,7 @@ Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>    </maps>    <scripts>    </scripts> -  <widgets caption="Injektion ved (B.2.7.1)" +  <widgets caption="Injektion (B.2.7.1)"            layout="vbox">      <label caption="I henhold til ovenstående ordination foretages fluorescein injektion."/> diff --git a/server/xml/macros/fluoresceinconclusion-1.0.xml b/server/xml/macros/fluorescens_konklusion-1.0.xml index a8bd277..bfa115d 100644 --- a/server/xml/macros/fluoresceinconclusion-1.0.xml +++ b/server/xml/macros/fluorescens_konklusion-1.0.xml @@ -12,7 +12,7 @@      Fluorescens info felterne bliver nu disabled igen, men har f[et fjernet den      altcombo som omkransede dem. Desuden er et 'andet' felt tilføjet.    --> -<macro name="fluoresceinconclusion" version="1.0"> +<macro name="fluorescens_konklusion" version="1.0">    <resume language="lua">      out = 'Konklusion:\n' diff --git a/server/xml/macros/5steps-1.0.xml b/server/xml/macros/gennemgang_af_de_5_trin-1.0.xml index 1369b82..e908404 100644 --- a/server/xml/macros/5steps-1.0.xml +++ b/server/xml/macros/gennemgang_af_de_5_trin-1.0.xml @@ -1,5 +1,5 @@  <?xml version='1.0' encoding='UTF-8'?> -<macro name="5steps" version="1.0"> +<macro name="gennemgang_af_de_5_trin" version="1.0">    <resume>De 5 trin til forebyggelse af forveksling af øjnene er gennemgået.</resume>    <queries></queries>    <maps> diff --git a/server/xml/macros/referral-1.0.xml b/server/xml/macros/henvisning-1.0.xml index 68919af..12d28e0 100644 --- a/server/xml/macros/referral-1.0.xml +++ b/server/xml/macros/henvisning-1.0.xml @@ -6,7 +6,7 @@      20090526: Bent Bisballe Nyeng      Nye min størrelser på lineedits, så navnet altid kan ses.    --> -<macro name="referral" version="1.0"> +<macro name="henvisning" version="1.0">    <resume store_in_journal="true">      Henvist fra øjenlæge ${referral.doctor} til forundersøgelse for ${referral.diagnose}    </resume> diff --git a/server/xml/macros/amdinformation-1.0.xml b/server/xml/macros/information-1.0.xml index 5bd4b78..f6cb7ab 100644 --- a/server/xml/macros/amdinformation-1.0.xml +++ b/server/xml/macros/information-1.0.xml @@ -7,7 +7,7 @@      LUA script til validering af checkbox, så den ikke bliver godkendt      hvis den ikke er aktiveret.    --> -<macro name="amdinformation" version="1.0"> +<macro name="information" version="1.0">    <resume>${amd.information}</resume>    <queries>    </queries> diff --git a/server/xml/macros/amdconsent-1.0.xml b/server/xml/macros/informeret_samtykke-1.0.xml index 04ab291..24bf7c5 100644 --- a/server/xml/macros/amdconsent-1.0.xml +++ b/server/xml/macros/informeret_samtykke-1.0.xml @@ -9,7 +9,7 @@      20090526: Bent Bisballe Nyeng      Tekst omformuleret.    --> -<macro name="amdconsent" version="1.0"> +<macro name="informeret_samtykke" version="1.0">    <resume language="lua">      out = 'Pt informeres om muligheden for behandling og de risici og bivirkninger, som kan være forbundet hermed. Specielt informeres om, behandlingen foregår ved en injektion i øjet i lokalbedøvelse, samt at der kræves månedlig kontrol for at vurdere om behandlingen skal gentages. Endvidere at behandlingen kan være forbundet med smerter og irritation det første døgn, og i sjældne tilfælde kan medføre infektion. På baggrund af den givne behandling indvilliger patienten i at få foretaget behandlingen.\n\n' diff --git a/server/xml/macros/amdinjektionindikation-1.0.xml b/server/xml/macros/intravitreal_injektion_indikation-1.0.xml index 8aa9303..cab9d11 100644 --- a/server/xml/macros/amdinjektionindikation-1.0.xml +++ b/server/xml/macros/intravitreal_injektion_indikation-1.0.xml @@ -1,5 +1,5 @@  <?xml version='1.0' encoding='UTF-8'?> -<macro name="amdinjektionindikation" version="1.0"> +<macro name="intravitreal_injektion_indikation" version="1.0">    <resume>Der findes indikation for intravitreal injektion med Lucentis.  Pt. klargøres i henhold til afdelingens instruks.  Klargøring udført af: ${intravitreal.initials} diff --git a/server/xml/macros/medicine-1.0.xml b/server/xml/macros/medicin-1.0.xml index 4bc21f6..32e830a 100644 --- a/server/xml/macros/medicine-1.0.xml +++ b/server/xml/macros/medicin-1.0.xml @@ -12,7 +12,7 @@      20090319: Bent Bisballe Nyeng      Øje ændret til combobox istedet for radiobuttons.    --> -<macro name="medicine" version="1.0"> +<macro name="medicin" version="1.0">    <resume>Medicin:  ${medicin}</resume>    <queries> diff --git a/server/xml/macros/octevaluation-1.0.xml b/server/xml/macros/oct_konklusion-1.0.xml index b9993f2..250ad58 100644 --- a/server/xml/macros/octevaluation-1.0.xml +++ b/server/xml/macros/oct_konklusion-1.0.xml @@ -12,7 +12,7 @@      20090427: Bent Bisballe Nyeng      'andet' mulighed tilfoejet til combo (altcombo).    --> -<macro name="octevaluation" version="1.0"> +<macro name="oct_konklusion" version="1.0">    <resume language="lua">      out = ''      if ( getValue('oct.right.missing') == '' or getValue('oct.left.missing') == '' ) diff --git a/server/xml/macros/octmeasurement-1.0.xml b/server/xml/macros/oct_maaling-1.0.xml index 220a845..8f49e0f 100644 --- a/server/xml/macros/octmeasurement-1.0.xml +++ b/server/xml/macros/oct_maaling-1.0.xml @@ -11,7 +11,7 @@      20090402: Bent Bisballe Nyeng      'missing eye' tilføjet.    --> -<macro name="octmeasurement" version="1.0"> +<macro name="oct_maaling" version="1.0">    <resume language="lua">      out = ''      if ( getValue('oct.right.missing') == '' or getValue('oct.left.missing') == '' ) diff --git a/server/xml/macros/ocgtt-1.0.xml b/server/xml/macros/oejendrypning-1.0.xml index 7a00ef4..c09b8aa 100644 --- a/server/xml/macros/ocgtt-1.0.xml +++ b/server/xml/macros/oejendrypning-1.0.xml @@ -11,7 +11,7 @@      20090108: Bent Bisballe Nyeng      Tilføjede et datofelt.    --> -<macro name="ocgtt" version="1.0"> +<macro name="oejendrypning" version="1.0">    <resume language="lua">      out = 'I henhold til øjenafdelingens retningslinier dryppes der med:\n'      out = out .. getValue('ocgtt.preparation') .. '\n' diff --git a/server/xml/macros/pressure-1.0.xml b/server/xml/macros/oejentryk-1.0.xml index e19abc8..d02860f 100644 --- a/server/xml/macros/pressure-1.0.xml +++ b/server/xml/macros/oejentryk-1.0.xml @@ -11,7 +11,7 @@      20090402: Bent Bisballe Nyeng      'missing eye' tilføjet.    --> -<macro name="pressure" version="1.0"> +<macro name="oejentryk" version="1.0">    <resume language="lua">      out = '' diff --git a/server/xml/macros/slitlamp-1.0.xml b/server/xml/macros/spaltelampe-1.0.xml index b706f49..a2a86a0 100644 --- a/server/xml/macros/slitlamp-1.0.xml +++ b/server/xml/macros/spaltelampe-1.0.xml @@ -11,7 +11,7 @@      20090402: Bent Bisballe Nyeng      'missing eye' tilføjet.    --> -<macro name="slitlamp" version="1.0"> +<macro name="spaltelampe" version="1.0">    <resume language="lua">      out = ''      if ( getValue('slit_lamp.right.missing') == '' or  getValue('slit_lamp.left.missing') == '' ) diff --git a/server/xml/macros/subjeval-1.0.xml b/server/xml/macros/subjektiv_evaluering-1.0.xml index 1d0cb03..299558d 100644 --- a/server/xml/macros/subjeval-1.0.xml +++ b/server/xml/macros/subjektiv_evaluering-1.0.xml @@ -1,5 +1,5 @@  <?xml version='1.0' encoding='UTF-8'?> -<macro name="subjeval" version="1.0"> +<macro name="subjektiv_evaluering" version="1.0">    <resume>Subjektivt er symptomerne ${amd.subjective_evaluation}.</resume>    <queries>    </queries> diff --git a/server/xml/macros/previouscommon-1.0.xml b/server/xml/macros/tidligere_alment-1.0.xml index 7b801d2..86cfe21 100644 --- a/server/xml/macros/previouscommon-1.0.xml +++ b/server/xml/macros/tidligere_alment-1.0.xml @@ -7,7 +7,7 @@      20090108: Bent Bisballe Nyeng      Alt tekst ændret.    --> -<macro name="previouscommon" version="1.0"> +<macro name="tidligere_alment" version="1.0">    <resume>Tidligere alment:  ${previous_common_diseases}</resume>    <queries> diff --git a/server/xml/macros/preveyediseases-1.0.xml b/server/xml/macros/tidligere_oejensygdomme-1.0.xml index 7a73597..1349e23 100644 --- a/server/xml/macros/preveyediseases-1.0.xml +++ b/server/xml/macros/tidligere_oejensygdomme-1.0.xml @@ -11,7 +11,7 @@      20090103: Bent Bisballe Nyeng      Tilføjede "manglende øje" felter.    --> -<macro name="preveyediseases" version="1.0"> +<macro name="tidligere_oejensygdomme" version="1.0">    <resume>Tidligere øjensygdomme:  ${previous_eye_diseases}  ${missing_eye_right} diff --git a/server/xml/macros/tobacco-1.0.xml b/server/xml/macros/tobaksrygning-1.0.xml index 2341a7f..64c6251 100644 --- a/server/xml/macros/tobacco-1.0.xml +++ b/server/xml/macros/tobaksrygning-1.0.xml @@ -3,7 +3,7 @@      20081202: Bent Bisballe Nyeng      Feltnavnene ændret så de giver mening.    --> -<macro name="tobacco" version="1.0"> +<macro name="tobaksrygning" version="1.0">    <resume>Tobaksrygning:  ${tobacco}</resume>    <queries> diff --git a/server/xml/macros/fundus-1.0.xml b/server/xml/macros/vurdering_af_fundus-1.0.xml index 6e3d51e..f7ca475 100644 --- a/server/xml/macros/fundus-1.0.xml +++ b/server/xml/macros/vurdering_af_fundus-1.0.xml @@ -4,7 +4,7 @@      Resume opdateret så det altid inkluderer både randhæmorrhagier og      exsudater, både hvis de er observerede og hvis de ikke er det.    --> -<macro name="fundus" version="1.0"> +<macro name="vurdering_af_fundus" version="1.0">    <resume language="lua">      out = '90-D undersøgelse:\nDer findes '      if(getValue('fundus.randh') == '' and getValue('fundus.exsud') == '') diff --git a/server/xml/macros/amdpreopconclusion-1.0.xml b/server/xml/macros/yderligere_diagnostik-1.0.xml index 03dbff0..44863cc 100644 --- a/server/xml/macros/amdpreopconclusion-1.0.xml +++ b/server/xml/macros/yderligere_diagnostik-1.0.xml @@ -3,7 +3,7 @@      20081204: Bent Bisballe Nyeng      Feltnavnene ændret så de giver mening.    --> -<macro name="amdpreopconclusion" version="1.0"> +<macro name="yderligere_diagnostik" version="1.0">    <resume store_in_journal="true">${amd_preop.conclusion}  ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>    <queries> diff --git a/server/xml/templates/amd_behandling.xml b/server/xml/templates/amd_behandling.xml index 58393b3..461f526 100644 --- a/server/xml/templates/amd_behandling.xml +++ b/server/xml/templates/amd_behandling.xml @@ -4,9 +4,9 @@    <macro name="header" static="true"/>    <header caption="Behandling"/> -  <macro name="amdinjektionindikation"/> -  <macro name="5steps"/> -  <macro name="amdprocedure"/> +  <macro name="intravitreal_injektion_indikation"/> +  <macro name="gennemgang_af_de_5_trin"/> +  <macro name="amd_procedure"/>  </template> diff --git a/server/xml/templates/amd_forunders.xml b/server/xml/templates/amd_forunders.xml index 31f7d7e..b9d6724 100644 --- a/server/xml/templates/amd_forunders.xml +++ b/server/xml/templates/amd_forunders.xml @@ -1,38 +1,38 @@  <?xml version='1.0' encoding='UTF-8'?>  <template name="amd_forunders" version="1.0" title="AMD forundersøgelse">    <macro name="header" static="true"/> -  <macro name="referral"/> +  <macro name="henvisning"/>    <header caption="Anamnese"/> -  <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 name="allergier" requires="henvisning"/> +  <macro name="medicin" requires="henvisning" compact="true"/> +  <macro name="tidligere_alment" requires="henvisning"/> +  <macro name="tobaksrygning" requires="henvisning"/> +  <macro name="tidligere_oejensygdomme" requires="henvisning"/> +  <macro name="aktuelle" requires="henvisning"/>    <header caption="Objektiv undersøgelse"/> -  <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 name="visus" requires="henvisning"/> +  <macro name="egen_brille" requires="henvisning"/> +  <macro name="autorefraktion" requires="henvisning"/> +  <macro name="oct_maaling" requires="henvisning"/> +  <macro name="oct_konklusion" requires="henvisning,oct_maaling"/> +  <macro name="oejentryk" requires="henvisning"/> +  <macro name="spaltelampe" requires="henvisning"/> +  <macro name="90D_linse" requires="henvisning"/> +  <macro name="yderligere_diagnostik" requires="henvisning"/>    <header caption="Øjendrypning"/> -  <macro name="ocgtt" requires="referral"/> +  <macro name="oejendrypning" requires="henvisning"/>    <header caption="Fluorescens angiografi"/> -  <macro name="fluoresceininj" requires="referral"/> -  <macro name="fluoresceinphases" requires="referral"/> -  <macro name="fluoresceinconclusion" requires="referral"/> +  <macro name="fluorescens_injektion" requires="henvisning"/> +  <macro name="fluorescens_faser" requires="henvisning"/> +  <macro name="fluorescens_konklusion" requires="henvisning"/>    <header caption="Samlet konklusion"/> -  <macro name="amdinformation" requires="referral"/> -  <macro name="amdindication" requires="referral"/> -  <macro name="amdconsent" requires="referral" compact="true"/> +  <macro name="information" requires="henvisning"/> +  <macro name="amd_behandlingsindikation" requires="henvisning"/> +  <macro name="informeret_samtykke" requires="henvisning" compact="true"/>  </template> diff --git a/server/xml/templates/amd_kontrolunders.xml b/server/xml/templates/amd_kontrolunders.xml index 818c472..86ae20f 100644 --- a/server/xml/templates/amd_kontrolunders.xml +++ b/server/xml/templates/amd_kontrolunders.xml @@ -4,33 +4,33 @@    <macro name="header" static="true"/>    <header caption="Anamnese"/> -  <macro name="cave"/> -  <macro name="medicine" compact="true"/> -  <macro name="subjeval"/> -  <macro name="current"/> +  <macro name="allergier"/> +  <macro name="medicin" compact="true"/> +  <macro name="subjektiv_evaluering"/> +  <macro name="aktuelle"/>    <header caption="Objektiv undersøgelse"/>    <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 name="egen_brille"/> +  <macro name="autorefraktion"/> +  <macro name="oct_maaling"/> +  <macro name="oct_konklusion" requires="octmeasurement"/> +  <macro name="oejentryk"/> +  <macro name="spaltelampe"/> +  <macro name="90D_linse"/> +  <macro name="yderligere_diagnostik"/> +  <macro name="vurdering_af_fundus"/>    <header caption="Øjendrypning"/> -  <macro name="ocgtt"/> +  <macro name="oejendrypning"/>    <header caption="Fluorescens angiografi"/> -  <macro name="fluoresceinphases"/> -  <macro name="fluoresceinconclusion"/> +  <macro name="fluorescens_faser"/> +  <macro name="fluorescens_konklusion"/>    <header caption="Samlet konklusion"/> -  <macro name="amdinformation"/> -  <macro name="amdtreatmentindication"/> -  <macro name="amdconsent" compact="true"/> +  <macro name="information"/> +  <macro name="amd_behandlingsindikation"/> +  <macro name="informeret_samtykke" compact="true"/>  </template> | 
