diff --git a/HISTORY.md b/HISTORY.md index 2ebb5a3..eff1139 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -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) ------------------------------------------------------------------------ diff --git a/www/versioninfo.txt b/www/versioninfo.txt index da2ae51..bca10f4 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.4.0 +2.4.1 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe -e84d6b542c14220965c61beb9406a5500fe3d6e9d7ee6137e15bb13d337808d6 deploy/releases/zaaReloaded-2.4.0.exe +b98ec2c5ad39dc4d54c97599f32634f8a41636eb0b0d8bf10c6d1c520e260e8b deploy/releases/zaaReloaded-2.4.1.exe diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index a7b7788..06bec8c 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/zaaReloaded2/Defaults/parameters.txt @@ -1,7 +1,9 @@ # LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST" # =========== ================== ======== ============== ======================= =========== +"- Multiresistenz" Multiresistenz MSU "a1-Microglobulin (SU)" a1-Microglobulin SU "a1-Microglobulin (SU)/die" a1-Microglobulin SU +"Aerobe Kultur" Keim MSU "AFP (ECL, Elecsys, Roche)" AFP S --- X "aktuelles Bicarbonat" Bic BGA Albumin Alb S @@ -132,6 +134,7 @@ Transferrin Transferrin S TSH TSH S "Übergangsepithelien (U)" Übergangsep. U "Unreife Granulozyten" Gran E +"Untersuchungsmaterial" Material MSU "Urobilinogen (U)" Urobilinogen U "Vitamin B12" B12 S --- X # vim: tw=160 et nowrap fo-=t diff --git a/zaaReloaded2/Demo/Demo.docx b/zaaReloaded2/Demo/Demo.docx index c54495e..5976508 100755 Binary files a/zaaReloaded2/Demo/Demo.docx and b/zaaReloaded2/Demo/Demo.docx differ diff --git a/zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs b/zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs index 3716ce7..5e76ddb 100755 --- a/zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs +++ b/zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs @@ -121,7 +121,9 @@ namespace zaaReloaded2.Importer.ClinicImporter #region Fields - static readonly Regex _expectedFormat = new Regex(@"\t(?[^:]+:(\t([^\t]+)?){3})"); + // Microbiology report has different format, gets special treatment + // static readonly Regex _expectedFormat = new Regex(@"^\t(?[^:]+:(\t([^\t]+)?){3})|\t(?(- Multiresistenz|Aerobe Kultur|Befundstatus Auftrag|Negatives Kulturergebnis|Untersuchungsmaterial:|Wachstum):(\t([^\t]+)))"); + static readonly Regex _expectedFormat = new Regex(@"^\t(?[^:]+:{1,2}(\t([^\t]+)?){1,3})"); Thesaurus.Parameters _parameterDictionary; Thesaurus.Units _unitDictionary; diff --git a/zaaReloaded2/LabModel/Material.cs b/zaaReloaded2/LabModel/Material.cs index fc5f418..3d3e73e 100755 --- a/zaaReloaded2/LabModel/Material.cs +++ b/zaaReloaded2/LabModel/Material.cs @@ -43,6 +43,9 @@ namespace zaaReloaded2.LabModel [Description("Sammelurin")] /// Collected urine SU, + [Description("Mittelstrahlurin")] + /// Collected urine + MSU, } /// diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 076dbb3..dea618d 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.4.0 -2.4.0.0 +2.4.1 +2.4.1.0