Merge branch 'hotfix-2.2.1' into develop

This commit is contained in:
daniel 2015-12-03 16:17:22 +01:00
commit 3f6383b076
7 changed files with 22 additions and 7 deletions

View File

@ -1,3 +1,12 @@
Version 2.2.1 (2015-12-03)
========================================================================
- VERBESSERT: 'Alternative' Verordnungen wurden nicht erkannt, wenn in der selben Zeile nicht auch eine 'kanonische' Verordnung stand.
- VERBESSERT: Fehlermeldung "Ein Name darf nicht mit dem Zeichen ' ' beginnen" wurde abgestellt (Fehlernr. 6a36e38b).
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 2.2.0 (2015-12-03)
========================================================================

View File

@ -1,4 +1,4 @@
2.2.0
2.2.1
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
aef576f192cb58aef59670df6407e36e2403675dc558af56430babbd218b6c0e publish/release/zaaReloaded-2.2.0.exe
5d961a309294b43c88b17905206f1162791e14e7dad8d367dc47c21205a60e3e publish/release/zaaReloaded-2.2.1.exe

View File

@ -171,7 +171,7 @@
</a4:CustomText>
<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">Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
<Content id="ref-55">Autoantikörper: ANCA (IF) 1: (Ref. &#60; 1:40), MPO-ANCA (ELISA) IU/ml (Ref. &#60; 9), PR3-ANCA (ELISA) IU/ml (Ref. &#60; 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
</a4:CustomText>
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>

Binary file not shown.

View File

@ -180,7 +180,7 @@ namespace zaaReloaded2.Medication
string[] lines = Helpers.SplitParagraphs(text);
foreach (string line in lines)
{
if (Prescription.IsCanonicalPrescriptionLine(line))
if (Prescription.IsPotentialPrescriptionLine(line))
{
addition = Prescription.ManyFromLine(line);
columns = System.Math.Max(columns, addition.Count);

View File

@ -40,9 +40,15 @@ namespace zaaReloaded2.Medication
return canonicalRegex.IsMatch(line);
}
/// <summary>
/// Determines if a line contains prescriptions, either canonical
/// ones or alternative ones (in the form "Ramipril 5 mg \t alle 2 Tage").
/// </summary>
/// <param name="line">Line to examine.</param>
/// <returns>True if the line potentially contains prescriptions.</returns>
public static bool IsPotentialPrescriptionLine(string line)
{
return alternativeRegex.IsMatch(line);
return unifiedRegex.IsMatch(line);
}
#endregion

View File

@ -1,2 +1,2 @@
2.2.0
2.2.0.0
2.2.1
2.2.1.0