From 2e2bac72135fab9c630852f95fc88975c518a00f Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Fri, 28 Aug 2015 10:12:44 +0200
Subject: [PATCH] Add electrophoresis parameters, update clinic style.

---
 zaaReloaded2/Defaults/clinic.zaaReloaded | 94 +++++++++++++-----------
 zaaReloaded2/Defaults/parameters.txt     |  7 +-
 2 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded
index e67c6b5..15d9bbc 100755
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded
@@ -3,17 +3,17 @@
 <a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
 <Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>804500411</_a>
-<_b>28316</_b>
-<_c>19488</_c>
-<_d>162</_d>
-<_e>198</_e>
-<_f>58</_f>
-<_g>243</_g>
-<_h>81</_h>
-<_i>228</_i>
-<_j>147</_j>
-<_k>135</_k>
+<_a>233768554</_a>
+<_b>-10539</_b>
+<_c>19865</_c>
+<_d>131</_d>
+<_e>252</_e>
+<_f>97</_f>
+<_g>190</_g>
+<_h>116</_h>
+<_i>107</_i>
+<_j>28</_j>
+<_k>144</_k>
 </Uid>
 <Name id="ref-3">Kopie von Standard für NepA</Name>
 <ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
@@ -29,7 +29,7 @@
 </a2:UnitySerializationHolder>
 <a4:SelectEachDay id="ref-5" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<ChildrenCount>20</ChildrenCount>
+<ChildrenCount>21</ChildrenCount>
 <Child0Type href="#ref-8"/>
 <Child0Object href="#ref-9"/>
 <Child1Type href="#ref-8"/>
@@ -62,104 +62,110 @@
 <Child14Object href="#ref-23"/>
 <Child15Type href="#ref-8"/>
 <Child15Object href="#ref-24"/>
-<Child16Type href="#ref-25"/>
-<Child16Object href="#ref-26"/>
-<Child17Type href="#ref-25"/>
+<Child16Type href="#ref-8"/>
+<Child16Object href="#ref-25"/>
+<Child17Type href="#ref-26"/>
 <Child17Object href="#ref-27"/>
-<Child18Type href="#ref-25"/>
+<Child18Type href="#ref-26"/>
 <Child18Object href="#ref-28"/>
-<Child19Type href="#ref-8"/>
+<Child19Type href="#ref-26"/>
 <Child19Object href="#ref-29"/>
+<Child20Type href="#ref-8"/>
+<Child20Object href="#ref-30"/>
 </a4:SelectEachDay>
 <a2:UnitySerializationHolder id="ref-8" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-30">zaaReloaded2.Controller.Elements.Items</Data>
+<Data id="ref-31">zaaReloaded2.Controller.Elements.Items</Data>
 <UnityType>4</UnityType>
 <AssemblyName href="#ref-7"/>
 </a2:UnitySerializationHolder>
 <a4:Items id="ref-9" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-31">Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure</Content>
+<Content id="ref-32">Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure</Content>
 </a4:Items>
 <a4:Items id="ref-10" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-32">Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL</Content>
+<Content id="ref-33">Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL</Content>
 </a4:Items>
 <a4:Items id="ref-11" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-33">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
+<Content id="ref-34">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
 </a4:Items>
 <a4:Items id="ref-12" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-34">Niere: Krea, Hst, eGFR (CKD-EPI)</Content>
+<Content id="ref-35">Niere: Krea, Hst, eGFR (CKD-EPI)</Content>
 </a4:Items>
 <a4:Items id="ref-13" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-35">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
+<Content id="ref-36">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
 </a4:Items>
 <a4:Items id="ref-14" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-36">Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt</Content>
+<Content id="ref-37">Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt</Content>
 </a4:Items>
 <a4:Items id="ref-15" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-37">Leber: GOT, GGT, GPT, AP, Bilirubin, CHE</Content>
+<Content id="ref-38">Leber: GOT, GGT, GPT, AP, Bilirubin, CHE</Content>
 </a4:Items>
 <a4:Items id="ref-16" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-38">Blutfette: TG, Chol, LDL, HDL, Lp(a)</Content>
+<Content id="ref-39">Blutfette: TG, Chol, LDL, HDL, Lp(a)</Content>
 </a4:Items>
 <a4:Items id="ref-17" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-39">Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten</Content>
+<Content id="ref-40">Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten</Content>
 </a4:Items>
 <a4:Items id="ref-18" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-40">Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa</Content>
+<Content id="ref-41">Diff.-BB: Neu, Lym, Mon, Baso, Eos</Content>
 </a4:Items>
 <a4:Items id="ref-19" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-41">Diff.-BB: Neu, Lym, Mon, Baso, Eos</Content>
+<Content id="ref-42">Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa</Content>
 </a4:Items>
 <a4:Items id="ref-20" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-42">Hormone: iPTH, TSH, fT3, fT4</Content>
+<Content id="ref-43">Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin</Content>
 </a4:Items>
 <a4:Items id="ref-21" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-43">Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.</Content>
+<Content id="ref-44">Hormone: iPTH, TSH, fT3, fT4</Content>
 </a4:Items>
 <a4:Items id="ref-22" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-44">BGA: pH, Std.-Bic., BE</Content>
+<Content id="ref-45">Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.</Content>
 </a4:Items>
 <a4:Items id="ref-23" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-45">Hepatitis-Serologie: Anti-HBs, Anti-HBc</Content>
+<Content id="ref-46">BGA: pH, Std.-Bic., BE</Content>
 </a4:Items>
 <a4:Items id="ref-24" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-46">Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin</Content>
+<Content id="ref-47">Hepatitis-Serologie: Anti-HBs, Anti-HBc</Content>
 </a4:Items>
-<a2:UnitySerializationHolder id="ref-25" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-47">zaaReloaded2.Controller.Elements.CustomText</Data>
+<a4:Items id="ref-25" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
+<Version>2</Version>
+<Content id="ref-48">Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin</Content>
+</a4:Items>
+<a2:UnitySerializationHolder id="ref-26" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
+<Data id="ref-49">zaaReloaded2.Controller.Elements.CustomText</Data>
 <UnityType>4</UnityType>
 <AssemblyName href="#ref-7"/>
 </a2:UnitySerializationHolder>
-<a4:CustomText id="ref-26" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-48">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
-</a4:CustomText>
 <a4:CustomText id="ref-27" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-49">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
+<Content id="ref-50">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
 </a4:CustomText>
 <a4:CustomText id="ref-28" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-50">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
+<Content id="ref-51">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
 </a4:CustomText>
-<a4:Items id="ref-29" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
+<a4:CustomText id="ref-29" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-51">Tumormarker: PSA</Content>
+<Content id="ref-52">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
+</a4:CustomText>
+<a4:Items id="ref-30" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
+<Version>2</Version>
+<Content id="ref-53">Tumormarker: PSA</Content>
 </a4:Items>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt
index 3d3c005..31695b0 100755
--- a/zaaReloaded2/Defaults/parameters.txt
+++ b/zaaReloaded2/Defaults/parameters.txt
@@ -118,4 +118,9 @@ TSH                                TSH                  S
 HAPTOGLOBIN                        Haptoglobin          S
 FRAGMENTOZYTEN                     Fragmentozyten       E
 "HBc-Antikörper (gesamt)"          Anti-HBc             S
-HBs-Antikörper                     Anti-HBs             S
\ No newline at end of file
+HBs-Antikörper                     Anti-HBs             S
+"Albumin - Fraktion"               Albumin-Fraktion     S                           X
+"Alpha1-Globulin - Fraktion"       a1-Globulin          S                           X
+"Alpha2-Globulin - Fraktion"       a2-Globulin          S                           X
+"Beta-Globulin - Fraktion"         b-Globulin           S                           X
+"Gammaglobulin - Fraktion"         g-Globulin           S                           X