daniel/zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Merge branch 'release-2.4.1'

Browse Source
This commit is contained in:
daniel 2017-09-21 21:46:16 +02:00
commit 0e955dc7a1
7 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HISTORY.md
View File

@ -1,3 +1,12 @@
Version 2.4.1 (2017-09-21)
------------------------------------------------------------------------
- Neu: Parameter für Hygienebefunde hinzugefügt ("MSU-Keim" und "MSU-Multiresistenz").
- Verbessert: Ambulanzausgabe von Hygienebefunden wird jetzt korrekt erkannt.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 2.4.0 (2017-09-18) Version 2.4.0 (2017-09-18)
------------------------------------------------------------------------ ------------------------------------------------------------------------

4
www/versioninfo.txt
View File

@ -1,4 +1,4 @@
2.4.0 2.4.1
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
e84d6b542c14220965c61beb9406a5500fe3d6e9d7ee6137e15bb13d337808d6 deploy/releases/zaaReloaded-2.4.0.exe b98ec2c5ad39dc4d54c97599f32634f8a41636eb0b0d8bf10c6d1c520e260e8b deploy/releases/zaaReloaded-2.4.1.exe

3
zaaReloaded2/Defaults/parameters.txt
View File

@ -1,7 +1,9 @@
# LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST" # LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST"
# =========== ================== ======== ============== ======================= =========== # =========== ================== ======== ============== ======================= ===========
"- Multiresistenz" Multiresistenz MSU
"a1-Microglobulin (SU)" a1-Microglobulin SU "a1-Microglobulin (SU)" a1-Microglobulin SU
"a1-Microglobulin (SU)/die" a1-Microglobulin SU "a1-Microglobulin (SU)/die" a1-Microglobulin SU
"Aerobe Kultur" Keim MSU
"AFP (ECL, Elecsys, Roche)" AFP S --- X "AFP (ECL, Elecsys, Roche)" AFP S --- X
"aktuelles Bicarbonat" Bic BGA "aktuelles Bicarbonat" Bic BGA
Albumin Alb S Albumin Alb S
@ -132,6 +134,7 @@ Transferrin Transferrin S
TSH TSH S TSH TSH S
"Übergangsepithelien (U)" Übergangsep. U "Übergangsepithelien (U)" Übergangsep. U
"Unreife Granulozyten" Gran E "Unreife Granulozyten" Gran E
"Untersuchungsmaterial" Material MSU
"Urobilinogen (U)" Urobilinogen U "Urobilinogen (U)" Urobilinogen U
"Vitamin B12" B12 S --- X "Vitamin B12" B12 S --- X
# vim: tw=160 et nowrap fo-=t # vim: tw=160 et nowrap fo-=t

BIN
zaaReloaded2/Demo/Demo.docx
View File

Binary file not shown.

4
zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs
View File

@ -121,7 +121,9 @@ namespace zaaReloaded2.Importer.ClinicImporter
#region Fields #region Fields
static readonly Regex _expectedFormat = new Regex(@"\t(?<item>[^:]+:(\t([^\t]+)?){3})"); // Microbiology report has different format, gets special treatment
// static readonly Regex _expectedFormat = new Regex(@"^\t(?<item>[^:]+:(\t([^\t]+)?){3})|\t(?<item>(- Multiresistenz|Aerobe Kultur|Befundstatus Auftrag|Negatives Kulturergebnis|Untersuchungsmaterial:|Wachstum):(\t([^\t]+)))");
static readonly Regex _expectedFormat = new Regex(@"^\t(?<item>[^:]+:{1,2}(\t([^\t]+)?){1,3})");
Thesaurus.Parameters _parameterDictionary; Thesaurus.Parameters _parameterDictionary;
Thesaurus.Units _unitDictionary; Thesaurus.Units _unitDictionary;

3
zaaReloaded2/LabModel/Material.cs
View File

@ -43,6 +43,9 @@ namespace zaaReloaded2.LabModel
[Description("Sammelurin")] [Description("Sammelurin")]
/// Collected urine /// Collected urine
SU, SU,
[Description("Mittelstrahlurin")]
/// Collected urine
MSU,
} }
/// <summary> /// <summary>

4
zaaReloaded2/VERSION
View File

@ -1,2 +1,2 @@
2.4.0 2.4.1
2.4.0.0 2.4.1.0