Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d01bdabf35 | |||
| 346112b069 | |||
| 5d1ee1f96e | |||
| 3043a07632 | |||
| da90e8e528 | |||
| 1f744c8c42 | |||
| 5868dc0cd4 | |||
| fe1da47f84 | |||
| c8492c6266 | |||
| bbd7bd1d7b | |||
| cb044015d2 | |||
| 08640363a2 | |||
| 578c126a20 | |||
| 180cb351a6 | |||
| d5bb0cd5fb | |||
| 65c6f9335f | |||
| 80c8177a58 | |||
| 684a11a81a | |||
| b62204109f | |||
| f2443d6e93 | |||
| 0b4763bf99 | |||
| 45430302ae | |||
| d5c4ec39ab | |||
| 9ae32ddaa6 | |||
| 796ba7b375 | |||
| c94e704b01 | |||
| 220e98ce1f | |||
| d2e236f88a | |||
| 1f0fadc181 | |||
| ac8320b917 | |||
| 7a92c7bc1e | |||
| 4ec52d290a | |||
| 9f83041554 | |||
| e80d75648e | |||
| 6e963b63cf | |||
| 9e39a7b868 | |||
| 80845150aa | |||
| c3429e1105 | |||
| 799fb9e112 | |||
| fa96c5df19 | |||
| 4953b40a39 | |||
| f5ca26c5e0 | |||
| 10ad2d4f23 | |||
| 2eea99aa32 | |||
| d71c8a02e3 | |||
| e54f107c39 | |||
| a29ee55003 | |||
| c83b8726cc | |||
| f7705a8bf3 |
85
HISTORY.md
85
HISTORY.md
@ -1,4 +1,87 @@
|
||||
Version 2.1.3 (2015-09-18)
|
||||
Version 2.1.13 (2015-11-12)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Parameter für Aldosteron, Renin und Schwangerschaftstest einprogrammiert.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.12 (2015-11-04)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Lp(a) zu den bekannten Parametern hinzugefügt.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.11 (2015-10-28)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Ambulanzstil überarbeitet, CK-MB wird jetzt mit ausgegeben.
|
||||
- VERBESSERT: Benutzereinstellungen werden nicht mehr jedes Mal zurückgesetzt.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.10 (2015-10-24)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: PSA wird jetzt richtig erkannt.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.9 (2015-10-18)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Integritätsprüfung für Updates wurde für besseren Algorithmus (SHA-256) vorbereitet.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.8 (2015-10-11)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Alpha-Fetoprotein (AFP) zu den bekannten Parametern hinzugefügt.
|
||||
- VERBESSERT: Einstellungen werden nach Office-Update nicht vergessen.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.7 (2015-10-02)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Statt Sekretariatsmodus stand zweimal Ärztemodus im Begrüßungsbildschirm.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.6. (2015-09-27)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Eingebaute Stile überarbeitet.
|
||||
- VERBESSERT: Troponin T wurde nicht richtig verarbeitet.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.5. (2015-09-24)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: NT-proBNP wird jetzt korrekt ausgegeben.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.4 (2015-09-23)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: Unkonventionell ausgegebene Laborwerte (v.a. Cyclosporin-A vor Gabe) wurden nicht richtig erkannt.
|
||||
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
|
||||
Version 2.1.3. (2015-09-18)
|
||||
========================================================================
|
||||
|
||||
- VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf.
|
||||
|
||||
51
Tests/Controller/Elements/CloneTest.cs
Executable file
51
Tests/Controller/Elements/CloneTest.cs
Executable file
@ -0,0 +1,51 @@
|
||||
/* CloneTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
using zaaReloaded2.Controller.Elements;
|
||||
|
||||
namespace Tests.Controller.Elements
|
||||
{
|
||||
[TestFixture(typeof(SelectFirstDay))]
|
||||
[TestFixture(typeof(SelectLastDay))]
|
||||
[TestFixture(typeof(SelectEachDay))]
|
||||
class CloneTest<T> where T : ControlElementBase, new()
|
||||
{
|
||||
[Test]
|
||||
public void CloneControlElement()
|
||||
{
|
||||
T original = new T();
|
||||
original.Children = new List<FormatElementBase>()
|
||||
{
|
||||
new Items("hello"),
|
||||
new Items("world")
|
||||
};
|
||||
T clone = original.Clone() as T;
|
||||
for (int i = 0; i < original.Children.Count; i++)
|
||||
{
|
||||
Assert.AreEqual(original.Children[i].Content, clone.Children[i].Content);
|
||||
}
|
||||
clone.Children[1].Content = "something else";
|
||||
Assert.AreNotEqual(clone.Children[1].Content, original.Children[1].Content,
|
||||
"Clone's child #1 should have different content than original's child #1");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -49,6 +49,11 @@ namespace Tests.Controller
|
||||
((Items)source.Elements[1]).Content,
|
||||
((Items)clone.Elements[1]).Content,
|
||||
"Items content");
|
||||
((Items)clone.Elements[1]).Content = "something else";
|
||||
Assert.AreNotEqual(
|
||||
((Items)source.Elements[1]).Content,
|
||||
((Items)clone.Elements[1]).Content,
|
||||
"Items content should be different");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -118,6 +118,23 @@ namespace Tests.Formatter
|
||||
document.Range().Text);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void FormatCyclosporine()
|
||||
{
|
||||
ZaaImporter importer = new ZaaImporter();
|
||||
importer.Import(
|
||||
"(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l; CK gesamt: 123 [<= 170] U/l; Cholesterin: 211");
|
||||
Document document = new Document();
|
||||
f.Formatter formatter = new f.Formatter(document);
|
||||
formatter.Laboratory = importer.Laboratory;
|
||||
formatter.Settings = new zaaReloaded2.Controller.Settings(
|
||||
new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") });
|
||||
formatter.Run();
|
||||
Assert.AreEqual(
|
||||
"Laborwerte vom 17.09.2015 10:44:00:\rCsA (C0) 130 µg/l\r\r",
|
||||
document.Range().Text);
|
||||
}
|
||||
|
||||
string GetResourceText(string resource)
|
||||
{
|
||||
try
|
||||
|
||||
@ -41,8 +41,8 @@
|
||||
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
|
||||
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
@ -82,6 +82,7 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="Controller\Comments\CommentPoolTest.cs" />
|
||||
<Compile Include="Controller\Comments\ItemCommentTest.cs" />
|
||||
<Compile Include="Controller\Elements\CloneTest.cs" />
|
||||
<Compile Include="SerializationTest.cs" />
|
||||
<Compile Include="Controller\SettingsRepositoryTest.cs" />
|
||||
<Compile Include="Controller\SettingsTest.cs" />
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
|
||||
<package id="Bovender" version="0.5.0.0" targetFramework="net40" />
|
||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||
<package id="NUnit" version="2.6.4" targetFramework="net40" />
|
||||
</packages>
|
||||
@ -1,4 +1,4 @@
|
||||
2.1.3
|
||||
http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.3.exe
|
||||
38971b670eb061ada475c7ab2f98a57299f25ff7 publish/release/zaaReloaded-2.1.3.exe
|
||||
2.1.13
|
||||
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
|
||||
8dc26f4c80bb91a9384c6cf3818b411e3056bb15b00c334eac5edafa764a52f0 publish/release/zaaReloaded-2.1.13.exe
|
||||
|
||||
|
||||
@ -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>-1928431729</_a>
|
||||
<_b>-21948</_b>
|
||||
<_c>18512</_c>
|
||||
<_d>140</_d>
|
||||
<_e>76</_e>
|
||||
<_f>210</_f>
|
||||
<_g>176</_g>
|
||||
<_h>1</_h>
|
||||
<_i>125</_i>
|
||||
<_j>44</_j>
|
||||
<_k>143</_k>
|
||||
<_a>1024466373</_a>
|
||||
<_b>-13000</_b>
|
||||
<_c>18257</_c>
|
||||
<_d>175</_d>
|
||||
<_e>25</_e>
|
||||
<_f>195</_f>
|
||||
<_g>192</_g>
|
||||
<_h>189</_h>
|
||||
<_i>241</_i>
|
||||
<_j>139</_j>
|
||||
<_k>63</_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>
|
||||
@ -66,13 +66,13 @@
|
||||
<Child16Object href="#ref-25"/>
|
||||
<Child17Type href="#ref-8"/>
|
||||
<Child17Object href="#ref-26"/>
|
||||
<Child18Type href="#ref-27"/>
|
||||
<Child18Object href="#ref-28"/>
|
||||
<Child19Type href="#ref-27"/>
|
||||
<Child18Type href="#ref-8"/>
|
||||
<Child18Object href="#ref-27"/>
|
||||
<Child19Type href="#ref-28"/>
|
||||
<Child19Object href="#ref-29"/>
|
||||
<Child20Type href="#ref-27"/>
|
||||
<Child20Type href="#ref-28"/>
|
||||
<Child20Object href="#ref-30"/>
|
||||
<Child21Type href="#ref-8"/>
|
||||
<Child21Type href="#ref-28"/>
|
||||
<Child21Object href="#ref-31"/>
|
||||
</a4:SelectEachDay>
|
||||
<a2:UnitySerializationHolder id="ref-8" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||
@ -90,11 +90,11 @@
|
||||
</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-35">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
|
||||
<Content id="ref-35">Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP</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-36">Niere: Krea, Hst, eGFR (CKD-EPI)</Content>
|
||||
<Content id="ref-36">Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C</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>
|
||||
@ -102,7 +102,7 @@
|
||||
</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-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</Content>
|
||||
<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest</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>
|
||||
@ -130,7 +130,7 @@
|
||||
</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-45">Hormone: iPTH, TSH, fT3, fT4</Content>
|
||||
<Content id="ref-45">Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ</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>
|
||||
@ -152,26 +152,26 @@
|
||||
<Version>2</Version>
|
||||
<Content id="ref-50">Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin</Content>
|
||||
</a4:Items>
|
||||
<a2:UnitySerializationHolder id="ref-27" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||
<Data id="ref-51">zaaReloaded2.Controller.Elements.CustomText</Data>
|
||||
<a4:Items 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-51">Tumormarker: PSA, AFP</Content>
|
||||
</a4:Items>
|
||||
<a2:UnitySerializationHolder id="ref-28" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||
<Data id="ref-52">zaaReloaded2.Controller.Elements.CustomText</Data>
|
||||
<UnityType>4</UnityType>
|
||||
<AssemblyName href="#ref-7"/>
|
||||
</a2:UnitySerializationHolder>
|
||||
<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-52">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
|
||||
</a4:CustomText>
|
||||
<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-53">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
|
||||
</a4:CustomText>
|
||||
<a4:CustomText 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-54">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
|
||||
<Content id="ref-54">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
|
||||
</a4:CustomText>
|
||||
<a4:Items id="ref-31" 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-31" 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-55">Tumormarker: PSA</Content>
|
||||
</a4:Items>
|
||||
<Content id="ref-55">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
|
||||
</a4:CustomText>
|
||||
</SOAP-ENV:Body>
|
||||
</SOAP-ENV:Envelope>
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
# =========== ================== ======== ============== ======================= ===========
|
||||
"a1-Microglobulin (SU)" a1-Microglobulin SU
|
||||
"a1-Microglobulin (SU)/die" a1-Microglobulin SU
|
||||
"AFP (ECL, Elecsys, Roche)" AFP S --- X
|
||||
"aktuelles Bicarbonat" Bic BGA
|
||||
Albumin Alb S
|
||||
"Albumin (PU)" Alb U
|
||||
@ -9,6 +10,8 @@ Albumin Alb S
|
||||
"Albumin (SU)/die" Alb SU
|
||||
"Albumin - Fraktion" Albumin-Fraktion S --- X
|
||||
"Albumin/Creatinin (PU)" ACR U 0
|
||||
Aldosteron Aldosteron S --- X
|
||||
Aldosteron-Renin-Quotient ARQ S --- X
|
||||
"Alk. Phosphatase" AP S 0
|
||||
"Alpha1-Globulin - Fraktion" a1-Globulin S --- X
|
||||
"Alpha2-Globulin - Fraktion" a2-Globulin S --- X
|
||||
@ -27,7 +30,7 @@ Calcium Ca S
|
||||
"Calcium (SU)/die" Ca SU
|
||||
Calcium-Phosphat-Produkt CaxP S
|
||||
Cholesterin Chol S
|
||||
CK gesamt" CK S --- X
|
||||
"CK gesamt" CK S --- X
|
||||
"CK MB" CK-MB S
|
||||
Creatinin Krea S 1
|
||||
"Creatinin (PU)" Krea U 0
|
||||
@ -64,7 +67,7 @@ Haptoglobin Haptoglobin S ---
|
||||
HAPTOGLOBIN Haptoglobin S --- X
|
||||
"Harnstoff (SU)" Hst SU
|
||||
"Harnstoff (SU)/die" Hst/Tag SU
|
||||
Harnstoff" Hst S
|
||||
Harnstoff Hst S
|
||||
"Harnstoff-Clearance (SU)/min" HstCl SU
|
||||
Harnsäure Harnsäure S
|
||||
"HbA1c (NGSP)" HbA1c E
|
||||
@ -84,6 +87,7 @@ Kalium K S
|
||||
"LDL - Cholesterin" LDL S
|
||||
Leukozyten Leu E
|
||||
"Leukozyten (U)" Leu U
|
||||
"Lipoprotein (a) (Gen. 2)" Lp(a) S 0 X
|
||||
Lymphozyten Lym E
|
||||
Magnesium Mg S --- X
|
||||
"MCH (HbE)" MCH E 0
|
||||
@ -108,10 +112,12 @@ pH pH BGA
|
||||
"PTH intakt" iPTH S
|
||||
PTT PTT Z
|
||||
"Ratio int. norm." INR Z
|
||||
Plasma-Renin-Konzentration Renin S --- X
|
||||
Retikulozyten Retikulozyten E --- X
|
||||
"Sammelmenge (U)" Volumen SU
|
||||
"Sammelzeit (U)" Zeit SU
|
||||
"Sauerstoffsättigung (art.)" SO2 BGA
|
||||
"Schwangerschaftstest (U)" Schwangerschaftstest U
|
||||
Sirolimus SIR S
|
||||
"spezifisches Gewicht (U)" "spez. Gew." U
|
||||
"Standard Bicarbonat" "Std.-Bic." BGA
|
||||
@ -121,7 +127,7 @@ Thrombozyten Thr E
|
||||
Transferrin Transferrin S
|
||||
"Transferrinsättigung" Tf.-Sätt. S
|
||||
"Triglyceride" TG S
|
||||
"Troponin T (high sensitive)" hsTnT S
|
||||
"Troponin (high sensitive)" hsTnT S
|
||||
TSH TSH S
|
||||
"Übergangsepithelien (U)" Übergangsep. U
|
||||
"Unreife Granulozyten" Gran E
|
||||
|
||||
@ -3,21 +3,21 @@
|
||||
<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>726346026</_a>
|
||||
<_b>-9272</_b>
|
||||
<_c>16670</_c>
|
||||
<_d>156</_d>
|
||||
<_e>154</_e>
|
||||
<_f>68</_f>
|
||||
<_g>185</_g>
|
||||
<_h>192</_h>
|
||||
<_i>11</_i>
|
||||
<_j>64</_j>
|
||||
<_k>27</_k>
|
||||
<_a>1038630179</_a>
|
||||
<_b>-1437</_b>
|
||||
<_c>19419</_c>
|
||||
<_d>151</_d>
|
||||
<_e>122</_e>
|
||||
<_f>7</_f>
|
||||
<_g>44</_g>
|
||||
<_h>130</_h>
|
||||
<_i>195</_i>
|
||||
<_j>52</_j>
|
||||
<_k>194</_k>
|
||||
</Uid>
|
||||
<Name id="ref-3">neu fuer Station</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>
|
||||
<AbnormalStyle xsi:type="a3:AbnormalStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">Bold</AbnormalStyle>
|
||||
<Name id="ref-3">Station ganz neu</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>
|
||||
<AbnormalStyle xsi:type="a3:AbnormalStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">None</AbnormalStyle>
|
||||
<ElementsCount>4</ElementsCount>
|
||||
<Element0Type href="#ref-4"/>
|
||||
<Element0Object href="#ref-5"/>
|
||||
@ -167,19 +167,19 @@
|
||||
</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-44">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
|
||||
<Content id="ref-44">Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP</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-45">Niere: Krea, Hst, eGFR (CKD-EPI)</Content>
|
||||
<Content id="ref-45">Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C</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-46">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
|
||||
<Content id="ref-46">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</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-47">Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt</Content>
|
||||
<Content id="ref-47">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</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>
|
||||
@ -227,7 +227,7 @@
|
||||
</a4:Items>
|
||||
<a4:Items id="ref-33" 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-59">Medikamente: TAC "(Ziel-Talspiegel: <*** BITTE ANGEBEN***> µg/l)", CSA (C0) "(Ziel-Talspiegel: <*** BITTE ANGEBEN***> µg/l)", SIR "(Ziel-Talspiegel: <*** BITTE ANGEBEN***> µg/l)", Vancomycin, Gentamicin, Tobramicin</Content>
|
||||
<Content id="ref-59">Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin</Content>
|
||||
</a4:Items>
|
||||
<a2:UnitySerializationHolder id="ref-34" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||
<Data id="ref-60">zaaReloaded2.Controller.Elements.CustomText</Data>
|
||||
@ -236,11 +236,11 @@
|
||||
</a2:UnitySerializationHolder>
|
||||
<a4:CustomText id="ref-35" 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-61">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
|
||||
<Content id="ref-61">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
|
||||
</a4:CustomText>
|
||||
<a4:CustomText id="ref-36" 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-62">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
|
||||
<Content id="ref-62">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
|
||||
</a4:CustomText>
|
||||
<a4:CustomText id="ref-37" 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>
|
||||
|
||||
@ -69,9 +69,10 @@ 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, MatchCase: true, MatchWholeWord: true);
|
||||
find.Execute2007(FindText: "HF", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
|
||||
find.Execute2007(FindText: "RR ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
|
||||
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: "ammelruin", ReplaceWith: "ammelurin", Replace: WdReplace.wdReplaceAll, MatchWholeWord: false);
|
||||
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);
|
||||
|
||||
@ -196,11 +196,12 @@ namespace zaaReloaded2.Importer.ZaaImporter
|
||||
|
||||
void ParseParagraph(string paragraph)
|
||||
{
|
||||
if (_timeStampRegex.IsMatch(paragraph))
|
||||
Match m = _timeStampRegex.Match(paragraph);
|
||||
if (m.Success)
|
||||
{
|
||||
DateTime dt;
|
||||
if (DateTime.TryParseExact(
|
||||
_timeStampRegex.Match(paragraph).Groups["datetime"].Value,
|
||||
m.Groups["datetime"].Value,
|
||||
"dd.MM.yyyy HH:mm",
|
||||
CultureInfo.InvariantCulture,
|
||||
DateTimeStyles.AllowWhiteSpaces,
|
||||
@ -208,8 +209,24 @@ namespace zaaReloaded2.Importer.ZaaImporter
|
||||
{
|
||||
TimeStamp = dt;
|
||||
}
|
||||
|
||||
// Put the remainder of the line back to the
|
||||
// 'paragraph' parameter to deal with exceptional
|
||||
// lines such as
|
||||
// "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
|
||||
// We need to add a dummy caption because this is
|
||||
// the normal format of a paragraph generated from Lauris.
|
||||
if (m.Groups["tail"].Success)
|
||||
{
|
||||
paragraph = "DUMMY CAPTION: " + m.Groups["tail"].Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
paragraph = String.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
if (!String.IsNullOrEmpty(paragraph))
|
||||
{
|
||||
LaurisParagraph lp = new LaurisParagraph(
|
||||
paragraph,
|
||||
@ -236,7 +253,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
|
||||
/// paragraph of a LaurisText.
|
||||
/// </summary>
|
||||
static readonly Regex _timeStampRegex = new Regex(
|
||||
@"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)");
|
||||
@"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00\)\s*(?<tail>.+)?)?$");
|
||||
IList<String> _paragraphs;
|
||||
Parameters _parameterDictionary;
|
||||
Units _unitDictionary;
|
||||
|
||||
12
zaaReloaded2/Properties/Settings.Designer.cs
generated
12
zaaReloaded2/Properties/Settings.Designer.cs
generated
@ -264,5 +264,17 @@ namespace zaaReloaded2.Properties {
|
||||
return ((string)(this["Repository"]));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("True")]
|
||||
public bool NeedUpgrade {
|
||||
get {
|
||||
return ((bool)(this["NeedUpgrade"]));
|
||||
}
|
||||
set {
|
||||
this["NeedUpgrade"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,5 +77,8 @@
|
||||
<Setting Name="Repository" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">http://git.bovender.de</Value>
|
||||
</Setting>
|
||||
<Setting Name="NeedUpgrade" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">True</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@ -46,6 +46,14 @@ namespace zaaReloaded2
|
||||
{
|
||||
Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
|
||||
Bovender.WpfHelpers.RegisterTextBoxSelectAll();
|
||||
|
||||
if (Properties.Settings.Default.NeedUpgrade)
|
||||
{
|
||||
Properties.Settings.Default.Upgrade();
|
||||
Properties.Settings.Default.NeedUpgrade = false;
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
|
||||
CheckForUpdates();
|
||||
_oldCaption = Globals.ThisAddIn.Application.Caption;
|
||||
Globals.ThisAddIn.Application.Caption =
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
2.1.3
|
||||
2.1.3.0
|
||||
2.1.13
|
||||
2.1.13.0
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
<Button Height="40" DockPanel.Dock="Left" Command="{Binding SelectTypistsModeCommand}" Content="Sekretariatsmodus"
|
||||
Width="160" Margin="0 0 10 0" VerticalAlignment="Center" />
|
||||
<TextBlock TextWrapping="Wrap" VerticalAlignment="Center">
|
||||
Im Ärztemodus werden beim Formatieren grundsätzlich keine Zusatzinformationen abgefragt.
|
||||
Im Sekretariatsmodus werden beim Formatieren grundsätzlich keine Zusatzinformationen abgefragt.
|
||||
</TextBlock>
|
||||
</DockPanel>
|
||||
<TextBlock TextWrapping="Wrap" Foreground="Gray">
|
||||
|
||||
@ -108,6 +108,9 @@
|
||||
<setting name="FirstRunWizardShown" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="NeedUpgrade" serializeAs="String">
|
||||
<value>True</value>
|
||||
</setting>
|
||||
</zaaReloaded2.Properties.Settings>
|
||||
</userSettings>
|
||||
</configuration>
|
||||
@ -19,6 +19,6 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<packages>
|
||||
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
|
||||
<package id="Bovender" version="0.5.0.0" targetFramework="net40" />
|
||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||
</packages>
|
||||
@ -134,8 +134,8 @@
|
||||
-->
|
||||
<ItemGroup>
|
||||
<Reference Include="Accessibility" />
|
||||
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
|
||||
<Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
|
||||
Reference in New Issue
Block a user