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

Accept clinic-system time stamps with lab data. 

- Geändert: Wenn das Laborsystem Zeitstempel ausgibt, die in derselben Zeile auch noch einen Laborwert enthalten, wird das jetzt korrekt erkannt.
This commit is contained in:
daniel 2017-09-29 06:07:36 +02:00
parent 24dc95f7a8
commit b7cda4c9a7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zaaReloaded2/Importer/AutoDetector.cs
View File

@ -175,15 +175,15 @@ namespace zaaReloaded2.Importer
string text = paragraph.Range.Text; string text = paragraph.Range.Text;
bool isCinicTimePoint = ClinicTimePoint.IsTimeStampLine(text); bool isCinicTimePoint = ClinicTimePoint.IsTimeStampLine(text);
bool isZaaTimePoint = LaurisTimePoint.IsTimeStampLine(text); bool isZaaTimePoint = LaurisTimePoint.IsTimeStampLine(text);
// If the line is a ZAA time point, but not a clinic timepoint, we can deduct that // // If the line is a ZAA time point, but not a clinic timepoint, we can deduct that
// the lab mode *must* be ZAA, because it will be a line in the form // // the lab mode *must* be ZAA, because it will be a line in the form
// "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not // // "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not
// occur in the clinic format. // // occur in the clinic format.
if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint) // if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint)
{ // {
Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA"); // Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA");
ImportMode = ImportMode.Zaa; // ImportMode = ImportMode.Zaa;
} // }
return isCinicTimePoint || isZaaTimePoint; return isCinicTimePoint || isZaaTimePoint;
} }

2
zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs
View File

@ -240,7 +240,7 @@ namespace zaaReloaded2.Importer.ClinicImporter
/// 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)(:00)?\)\s*$"); @"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00)?\)");
IList<String> _lines; IList<String> _lines;
Parameters _parameterDictionary; Parameters _parameterDictionary;
Units _unitDictionary; Units _unitDictionary;