Merge branch 'release-2.0.0-beta.4'

HISTORY.md

@@ -1,4 +1,13 @@
-Version 2.0.0-beta.3 (2015-08-20)
+Version 2.0.0-beta.4 (2015-08-21)
+========================================================================
+
+- VERBESSERUNG: Aliasse für fT3 und fT4.
+- VERBESSERUNG: Ambulanz-Stil überarbeitet.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.0.0-beta.3. (2015-08-20)
 ========================================================================
 
 - VERBESSERT: Bei Updates werden neue eingebaute Stile jetzt immer berücksichtigt.

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.0.0-beta.3
+2.0.0-beta.4
-http://zaa.nephrowiki.de/downloads/zaaReloaded-2.0.0-beta.3.exe
+http://zaa.nephrowiki.de/downloads/zaaReloaded-2.0.0-beta.4.exe
-7453cdb91221fe4d9dabd8259be2dc7703274706  publish/release/zaaReloaded-2.0.0-beta.3.exe
+d660895c949b9a1be96e70198d694e090b970c62  publish/release/zaaReloaded-2.0.0-beta.4.exe
 

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>1</Version>
 <Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>82184435</_a>
+<_a>218738701</_a>
-<_b>11851</_b>
+<_b>27917</_b>
-<_c>19443</_c>
+<_c>18480</_c>
-<_d>139</_d>
+<_d>165</_d>
-<_e>251</_e>
+<_e>139</_e>
-<_f>157</_f>
+<_f>92</_f>
-<_g>33</_g>
+<_g>162</_g>
-<_h>11</_h>
+<_h>40</_h>
-<_i>13</_i>
+<_i>202</_i>
-<_j>118</_j>
+<_j>51</_j>
-<_k>225</_k>
+<_k>115</_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">IfSpecialOrAbnormal</ReferenceStyle>
@@ -119,7 +119,7 @@
 </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>1</Version>
-<Content id="ref-41">Hormone: iPTH, TSH</Content>
+<Content id="ref-41">Hormone: iPTH, TSH, fT3, fT4</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>1</Version>
@@ -135,7 +135,7 @@
 </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>1</Version>
-<Content id="ref-45">Medikamente: TAC, CSA, SIR, Vancomycin, Gentamicin, Tobramicin</Content>
+<Content id="ref-45">Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin</Content>
 </a4:Items>
 <a2:UnitySerializationHolder id="ref-25" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
 <Data id="ref-46">zaaReloaded2.Controller.Elements.CustomText</Data>

zaaReloaded2/Defaults/parameters.txt

@@ -35,6 +35,8 @@ Eosinophile                        Eos                  E
 "Erythrozyten (U)"                 Ery                  U
 Erythrozyten                       Ery                  E
 Ferritin                           Ferr                 S
+"freies T3"                        fT3                  S                  X
+"freies T4"                        fT4                  S                  X
 Gesamt-Bilirubin                   Bilirubin            S
 "Gesamt-Eiweiss (PU)"              Protein              U
 "Gesamt-Eiweiss (SU)"              Protein              SU

zaaReloaded2/Formatter/DanielsStyle.cs

@@ -69,12 +69,15 @@ namespace zaaReloaded2.Formatter
             find.Execute2007(FindText: "Assistent der Klinik", ReplaceWith: "Internist/Nephrologe", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "Professor Dr.", ReplaceWith: "Prof. Dr.", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "mmHg", ReplaceWith: "mm Hg", Replace: WdReplace.wdReplaceAll);
-            find.Execute2007(FindText: "RR ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "RR", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
-            find.Execute2007(FindText: "HF ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "HF", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
             find.Execute2007(FindText: "TAC-Spiegel", ReplaceWith: "Tacrolimus-Talspiegel", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "4-7", ReplaceWith: "4 bis 7", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "5-8", ReplaceWith: "5 bis 8", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "8-10", ReplaceWith: "8 bis 10", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "4 - 7", ReplaceWith: "4 bis 7", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "5 - 8", ReplaceWith: "5 bis 8", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "8 - 10", ReplaceWith: "8 bis 10", Replace: WdReplace.wdReplaceAll);
         }
 
         static void FixSalutation(Document document)

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.0.0-beta.3
+2.0.0-beta.4
-2.0.0.8
+2.0.0.9