Compare commits
20 Commits
Author | SHA1 | Date | |
---|---|---|---|
ac8320b917 | |||
7a92c7bc1e | |||
4ec52d290a | |||
9f83041554 | |||
e80d75648e | |||
6e963b63cf | |||
9e39a7b868 | |||
80845150aa | |||
c3429e1105 | |||
799fb9e112 | |||
fa96c5df19 | |||
4953b40a39 | |||
f5ca26c5e0 | |||
10ad2d4f23 | |||
2eea99aa32 | |||
d71c8a02e3 | |||
e54f107c39 | |||
a29ee55003 | |||
c83b8726cc | |||
f7705a8bf3 |
35
HISTORY.md
35
HISTORY.md
@ -1,4 +1,37 @@
|
|||||||
Version 2.1.3 (2015-09-18)
|
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.
|
- VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf.
|
||||||
|
@ -118,6 +118,23 @@ namespace Tests.Formatter
|
|||||||
document.Range().Text);
|
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)
|
string GetResourceText(string resource)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -41,8 +41,8 @@
|
|||||||
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
<Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
|
<HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
|
<package id="Bovender" version="0.4.0.0" targetFramework="net40" />
|
||||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||||
<package id="NUnit" version="2.6.4" targetFramework="net40" />
|
<package id="NUnit" version="2.6.4" targetFramework="net40" />
|
||||||
</packages>
|
</packages>
|
@ -1,4 +1,4 @@
|
|||||||
2.1.3
|
2.1.7
|
||||||
http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.3.exe
|
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
|
||||||
38971b670eb061ada475c7ab2f98a57299f25ff7 publish/release/zaaReloaded-2.1.3.exe
|
e142c709482684790e8f5779b4313647d90e44fa publish/release/zaaReloaded-2.1.7.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">
|
<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>
|
<Version>2</Version>
|
||||||
<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||||
<_a>-1928431729</_a>
|
<_a>1333827306</_a>
|
||||||
<_b>-21948</_b>
|
<_b>-10272</_b>
|
||||||
<_c>18512</_c>
|
<_c>18647</_c>
|
||||||
<_d>140</_d>
|
<_d>136</_d>
|
||||||
<_e>76</_e>
|
<_e>197</_e>
|
||||||
<_f>210</_f>
|
<_f>236</_f>
|
||||||
<_g>176</_g>
|
<_g>232</_g>
|
||||||
<_h>1</_h>
|
<_h>219</_h>
|
||||||
<_i>125</_i>
|
<_i>198</_i>
|
||||||
<_j>44</_j>
|
<_j>61</_j>
|
||||||
<_k>143</_k>
|
<_k>115</_k>
|
||||||
</Uid>
|
</Uid>
|
||||||
<Name id="ref-3">Kopie von Standard für NepA</Name>
|
<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>
|
<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>
|
||||||
@ -90,11 +90,11 @@
|
|||||||
</a4:Items>
|
</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">
|
<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>
|
<Version>2</Version>
|
||||||
<Content id="ref-35">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
|
<Content id="ref-35">Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP</Content>
|
||||||
</a4:Items>
|
</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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<Version>2</Version>
|
||||||
@ -159,11 +159,11 @@
|
|||||||
</a2:UnitySerializationHolder>
|
</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">
|
<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>
|
<Version>2</Version>
|
||||||
<Content id="ref-52">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
|
<Content id="ref-52">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
|
||||||
</a4:CustomText>
|
</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">
|
<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>
|
<Version>2</Version>
|
||||||
<Content id="ref-53">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
|
<Content id="ref-53">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
|
||||||
</a4:CustomText>
|
</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">
|
<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>
|
<Version>2</Version>
|
||||||
|
@ -27,7 +27,7 @@ Calcium Ca S
|
|||||||
"Calcium (SU)/die" Ca SU
|
"Calcium (SU)/die" Ca SU
|
||||||
Calcium-Phosphat-Produkt CaxP S
|
Calcium-Phosphat-Produkt CaxP S
|
||||||
Cholesterin Chol S
|
Cholesterin Chol S
|
||||||
CK gesamt" CK S --- X
|
"CK gesamt" CK S --- X
|
||||||
"CK MB" CK-MB S
|
"CK MB" CK-MB S
|
||||||
Creatinin Krea S 1
|
Creatinin Krea S 1
|
||||||
"Creatinin (PU)" Krea U 0
|
"Creatinin (PU)" Krea U 0
|
||||||
@ -64,7 +64,7 @@ Haptoglobin Haptoglobin S ---
|
|||||||
HAPTOGLOBIN Haptoglobin S --- X
|
HAPTOGLOBIN Haptoglobin S --- X
|
||||||
"Harnstoff (SU)" Hst SU
|
"Harnstoff (SU)" Hst SU
|
||||||
"Harnstoff (SU)/die" Hst/Tag SU
|
"Harnstoff (SU)/die" Hst/Tag SU
|
||||||
Harnstoff" Hst S
|
Harnstoff Hst S
|
||||||
"Harnstoff-Clearance (SU)/min" HstCl SU
|
"Harnstoff-Clearance (SU)/min" HstCl SU
|
||||||
Harnsäure Harnsäure S
|
Harnsäure Harnsäure S
|
||||||
"HbA1c (NGSP)" HbA1c E
|
"HbA1c (NGSP)" HbA1c E
|
||||||
@ -121,7 +121,7 @@ Thrombozyten Thr E
|
|||||||
Transferrin Transferrin S
|
Transferrin Transferrin S
|
||||||
"Transferrinsättigung" Tf.-Sätt. S
|
"Transferrinsättigung" Tf.-Sätt. S
|
||||||
"Triglyceride" TG S
|
"Triglyceride" TG S
|
||||||
"Troponin T (high sensitive)" hsTnT S
|
"Troponin (high sensitive)" hsTnT S
|
||||||
TSH TSH S
|
TSH TSH S
|
||||||
"Übergangsepithelien (U)" Übergangsep. U
|
"Übergangsepithelien (U)" Übergangsep. U
|
||||||
"Unreife Granulozyten" Gran E
|
"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">
|
<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>
|
<Version>2</Version>
|
||||||
<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||||
<_a>726346026</_a>
|
<_a>1038630179</_a>
|
||||||
<_b>-9272</_b>
|
<_b>-1437</_b>
|
||||||
<_c>16670</_c>
|
<_c>19419</_c>
|
||||||
<_d>156</_d>
|
<_d>151</_d>
|
||||||
<_e>154</_e>
|
<_e>122</_e>
|
||||||
<_f>68</_f>
|
<_f>7</_f>
|
||||||
<_g>185</_g>
|
<_g>44</_g>
|
||||||
<_h>192</_h>
|
<_h>130</_h>
|
||||||
<_i>11</_i>
|
<_i>195</_i>
|
||||||
<_j>64</_j>
|
<_j>52</_j>
|
||||||
<_k>27</_k>
|
<_k>194</_k>
|
||||||
</Uid>
|
</Uid>
|
||||||
<Name id="ref-3">neu fuer Station</Name>
|
<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">IfSpecialOrAbnormal</ReferenceStyle>
|
<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">Bold</AbnormalStyle>
|
<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>
|
<ElementsCount>4</ElementsCount>
|
||||||
<Element0Type href="#ref-4"/>
|
<Element0Type href="#ref-4"/>
|
||||||
<Element0Object href="#ref-5"/>
|
<Element0Object href="#ref-5"/>
|
||||||
@ -167,19 +167,19 @@
|
|||||||
</a4:Items>
|
</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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<Version>2</Version>
|
||||||
@ -227,7 +227,7 @@
|
|||||||
</a4:Items>
|
</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">
|
<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>
|
<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>
|
</a4:Items>
|
||||||
<a2:UnitySerializationHolder id="ref-34" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
<a2:UnitySerializationHolder id="ref-34" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||||
<Data id="ref-60">zaaReloaded2.Controller.Elements.CustomText</Data>
|
<Data id="ref-60">zaaReloaded2.Controller.Elements.CustomText</Data>
|
||||||
@ -236,11 +236,11 @@
|
|||||||
</a2:UnitySerializationHolder>
|
</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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<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>
|
||||||
<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">
|
<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>
|
<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: "Assistent der Klinik", ReplaceWith: "Internist/Nephrologe", Replace: WdReplace.wdReplaceAll);
|
||||||
find.Execute2007(FindText: "Professor Dr.", ReplaceWith: "Prof. Dr.", 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: "mmHg", ReplaceWith: "mm Hg", Replace: WdReplace.wdReplaceAll);
|
||||||
find.Execute2007(FindText: "RR", 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: "HF ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
|
||||||
find.Execute2007(FindText: "TAC-Spiegel", ReplaceWith: "Tacrolimus-Talspiegel", Replace: WdReplace.wdReplaceAll);
|
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: "4-7", ReplaceWith: "4 bis 7", Replace: WdReplace.wdReplaceAll);
|
||||||
find.Execute2007(FindText: "5-8", ReplaceWith: "5 bis 8", 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: "8-10", ReplaceWith: "8 bis 10", Replace: WdReplace.wdReplaceAll);
|
||||||
|
@ -196,11 +196,12 @@ namespace zaaReloaded2.Importer.ZaaImporter
|
|||||||
|
|
||||||
void ParseParagraph(string paragraph)
|
void ParseParagraph(string paragraph)
|
||||||
{
|
{
|
||||||
if (_timeStampRegex.IsMatch(paragraph))
|
Match m = _timeStampRegex.Match(paragraph);
|
||||||
|
if (m.Success)
|
||||||
{
|
{
|
||||||
DateTime dt;
|
DateTime dt;
|
||||||
if (DateTime.TryParseExact(
|
if (DateTime.TryParseExact(
|
||||||
_timeStampRegex.Match(paragraph).Groups["datetime"].Value,
|
m.Groups["datetime"].Value,
|
||||||
"dd.MM.yyyy HH:mm",
|
"dd.MM.yyyy HH:mm",
|
||||||
CultureInfo.InvariantCulture,
|
CultureInfo.InvariantCulture,
|
||||||
DateTimeStyles.AllowWhiteSpaces,
|
DateTimeStyles.AllowWhiteSpaces,
|
||||||
@ -208,8 +209,24 @@ namespace zaaReloaded2.Importer.ZaaImporter
|
|||||||
{
|
{
|
||||||
TimeStamp = dt;
|
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
|
else
|
||||||
|
{
|
||||||
|
paragraph = String.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!String.IsNullOrEmpty(paragraph))
|
||||||
{
|
{
|
||||||
LaurisParagraph lp = new LaurisParagraph(
|
LaurisParagraph lp = new LaurisParagraph(
|
||||||
paragraph,
|
paragraph,
|
||||||
@ -236,7 +253,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
|
|||||||
/// paragraph of a LaurisText.
|
/// paragraph of a LaurisText.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
static readonly Regex _timeStampRegex = new Regex(
|
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;
|
IList<String> _paragraphs;
|
||||||
Parameters _parameterDictionary;
|
Parameters _parameterDictionary;
|
||||||
Units _unitDictionary;
|
Units _unitDictionary;
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
2.1.3
|
2.1.7
|
||||||
2.1.3.0
|
2.1.7.0
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
<Button Height="40" DockPanel.Dock="Left" Command="{Binding SelectTypistsModeCommand}" Content="Sekretariatsmodus"
|
<Button Height="40" DockPanel.Dock="Left" Command="{Binding SelectTypistsModeCommand}" Content="Sekretariatsmodus"
|
||||||
Width="160" Margin="0 0 10 0" VerticalAlignment="Center" />
|
Width="160" Margin="0 0 10 0" VerticalAlignment="Center" />
|
||||||
<TextBlock TextWrapping="Wrap" 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>
|
</TextBlock>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
<TextBlock TextWrapping="Wrap" Foreground="Gray">
|
<TextBlock TextWrapping="Wrap" Foreground="Gray">
|
||||||
|
@ -19,6 +19,6 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
|
<package id="Bovender" version="0.4.0.0" targetFramework="net40" />
|
||||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||||
</packages>
|
</packages>
|
@ -134,8 +134,8 @@
|
|||||||
-->
|
-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Accessibility" />
|
<Reference Include="Accessibility" />
|
||||||
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
<Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
|
<HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
|
Reference in New Issue
Block a user