|
@@ -46,8 +46,11 @@ public class EzXmlAnalysis {
|
|
|
List<String> titles = Lists.newArrayList(
|
|
|
"主诉", "现病史", "既往史", "手术史", "输血史", "过敏史", "个人史", "预防接种史", "家族史", "婚育史", "月经史"
|
|
|
);
|
|
|
-
|
|
|
String rootText = elementTxt(rootElement);
|
|
|
+ String signTimeStr = findTimeStr(rootText.substring(rootText.length() - 18));
|
|
|
+ if (StringUtil.isNotBlank(signTimeStr)) {
|
|
|
+ rootText = rootText.substring(0, rootText.lastIndexOf(signTimeStr));
|
|
|
+ }
|
|
|
titles = CommonAnalysisUtil.sortTitles(titles, rootText);
|
|
|
CommonAnalysisUtil.cutByTitles(rootText, titles, 0, map);
|
|
|
}
|
|
@@ -181,4 +184,14 @@ public class EzXmlAnalysis {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ public static String findTimeStr(String text) {
|
|
|
+ String ret = "";
|
|
|
+ Pattern pattern = Pattern.compile("[0-9]+[年/-][0-9]+[月/-][0-9]+[日]{0,}");
|
|
|
+ Matcher matcher = pattern.matcher(text);
|
|
|
+ if (matcher.find()) {
|
|
|
+ ret = matcher.group();
|
|
|
+ }
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
}
|