Merge branch 'release-2.1.3'

This commit is contained in:
Daniel Kraus 2015-09-18 17:24:43 +02:00
commit 174a49373c
8 changed files with 52 additions and 10 deletions

View File

@ -1,3 +1,12 @@
Version 2.1.3 (2015-09-18)
========================================================================
- VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf.
- VERBESSERT: Extreme Werte (mit "<" oder ">") wurden nicht sehr schön formatiert.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 2.1.2 (2015-09-11) Version 2.1.2 (2015-09-11)
======================================================================== ========================================================================

View File

@ -40,6 +40,7 @@ namespace Tests.Importer.ZaaImporter
LaurisItem i = new LaurisItem(laurisString); LaurisItem i = new LaurisItem(laurisString);
Assert.AreEqual(name, i.Name, "Name"); Assert.AreEqual(name, i.Name, "Name");
Assert.AreEqual(unit, i.Unit, "Unit"); Assert.AreEqual(unit, i.Unit, "Unit");
Assert.IsFalse(i.IsExtreme, "IsExtreme");
Assert.IsTrue(i.IsNumerical, "IsNumerical"); Assert.IsTrue(i.IsNumerical, "IsNumerical");
Assert.AreEqual(value, i.NumericalValue, "NumericalValue"); Assert.AreEqual(value, i.NumericalValue, "NumericalValue");
Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit"); Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit");
@ -50,6 +51,25 @@ namespace Tests.Importer.ZaaImporter
Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit"); Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit");
} }
[TestCase("Folsäure: > 20 [2.0 - 9.1] ng/ml; ", "Folsäure", "> 20", "ng/ml", 2, 9.1, false)]
public void ParseLaurisWithGreaterOrLowerValue(
string laurisString, string name, string value,
string unit, double lowerLimit, double upperLimit, bool isNormal)
{
LaurisItem i = new LaurisItem(laurisString);
Assert.AreEqual(name, i.Name, "Name");
Assert.AreEqual(unit, i.Unit, "Unit");
Assert.IsTrue(i.IsExtreme, "IsExtreme");
Assert.IsFalse(i.IsNumerical, "IsNumerical");
Assert.AreEqual(value, i.Value, "Value");
Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit");
Assert.AreEqual(upperLimit, i.UpperLimit, "Upper limit");
Assert.AreEqual(isNormal, i.IsNormal, "IsNormal");
Assert.IsTrue(i.HasLimits, "HasLimits");
Assert.IsTrue(i.HasLowerLimit, "HasLowerLimit");
Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit");
}
[TestCase("HDL - Cholesterin: 45 [>= 35] mg/dl", "HDL - Cholesterin", 45, "mg/dl", 35, true)] [TestCase("HDL - Cholesterin: 45 [>= 35] mg/dl", "HDL - Cholesterin", 45, "mg/dl", 35, true)]
public void ParseLaurisWithLowerLimit( public void ParseLaurisWithLowerLimit(
string laurisString, string name, double value, string laurisString, string name, double value,

View File

@ -22,9 +22,7 @@
<![endif]--> <![endif]-->
<title>zaaReloaded2</title> <title>zaaReloaded2</title>
<meta name="author" content="Daniel Kraus"> <meta name="author" content="Daniel Kraus">
<meta name="descrption" content="Add-in für Microsoft Word 2010-2013, <meta name="description" content="Add-in für Microsoft Word 2010-2013, das die Zentrale Arztbriefablage um Funktionen für das Formatieren von Laborwerten erweitert.">
das die Zentrale Arztbriefablage um Funktionen für das Formatieren von
Laborwerten erweitert.">
<link rel="icon" type="image/png" href="img/icon.png"> <link rel="icon" type="image/png" href="img/icon.png">
<style> <style>
floatbox { floatbox {

View File

@ -1,4 +1,4 @@
2.1.2 2.1.3
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.3.exe
057270076d9bebb896866e5ce12ad76bb3ea7a7b publish/release/zaaReloaded-2.1.2.exe 38971b670eb061ada475c7ab2f98a57299f25ff7 publish/release/zaaReloaded-2.1.3.exe

View File

@ -150,7 +150,7 @@
</a4:Items> </a4:Items>
<a4:Items id="ref-26" 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-26" 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-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CSA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content> <Content id="ref-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CsA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
</a4:Items> </a4:Items>
<a2:UnitySerializationHolder id="ref-27" xmlns:a2="http://schemas.microsoft.com/clr/ns/System"> <a2:UnitySerializationHolder id="ref-27" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
<Data id="ref-51">zaaReloaded2.Controller.Elements.CustomText</Data> <Data id="ref-51">zaaReloaded2.Controller.Elements.CustomText</Data>

View File

@ -203,7 +203,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
#region Fields #region Fields
static readonly Regex _numericalRegex = new Regex( static readonly Regex _numericalRegex = new Regex(
@"(?<name>[^:]+):\s*(?<value>[\d,.]+)\s*(?<limits>\[[^\]]+])?\s*(?<unit>[^;]+)?"); @"(?<name>[^:]+):\s*(?<value>([\<\>]\s)?[\d,.]+)\s*(?<limits>\[[^\]]+])?\s*(?<unit>[^;]+)?");
static readonly Regex _categoricalRegex = new Regex( static readonly Regex _categoricalRegex = new Regex(
@"(?<name>[^:]+):\s*(?<value>[^[;]+)\s*(\[(?<normal>[^\]]+)])?"); @"(?<name>[^:]+):\s*(?<value>[^[;]+)\s*(\[(?<normal>[^\]]+)])?");
static readonly Regex _limitRegex = new Regex(@"\[(?<limit1>[-\d,.]+)?\s*(?<operator>\S+)\s*(?<limit2>[-\d,.]+)?]"); static readonly Regex _limitRegex = new Regex(@"\[(?<limit1>[-\d,.]+)?\s*(?<operator>\S+)\s*(?<limit2>[-\d,.]+)?]");

View File

@ -74,6 +74,19 @@ namespace zaaReloaded2.LabModel
} }
} }
/// <summary>
/// Returns whether or not the value is an 'extreme' value,
/// i.e. marked with "&gt;" or "&lt;". These values are not
/// strictly numeric, and IsNumerical returns false for them.
/// </summary>
public bool IsExtreme
{
get
{
return "<>".Contains(Value.Substring(0, 1));
}
}
/// <summary> /// <summary>
/// Gets the normal value of the item. Need not be set. This is /// Gets the normal value of the item. Need not be set. This is
/// used for items with nominal values (as opposed to numbers). /// used for items with nominal values (as opposed to numbers).
@ -130,6 +143,8 @@ namespace zaaReloaded2.LabModel
{ {
get get
{ {
if (IsExtreme) return false;
if (HasLimits) if (HasLimits)
{ {
if (HasLowerLimit && HasUpperLimit) if (HasLowerLimit && HasUpperLimit)

View File

@ -1,2 +1,2 @@
2.1.2 2.1.3
2.1.2.0 2.1.3.0