|
@@ -67,7 +67,6 @@ public class YwzxyyBeHospitalizedXmlAnalysis implements YwzxyyXmlAnalysis {
|
|
text
|
|
text
|
|
);
|
|
);
|
|
CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, structureMap);
|
|
CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, structureMap);
|
|
- structureMap = keyRemoveBlank(structureMap);
|
|
|
|
if (structureMap.containsKey("体格检查(一)")) {
|
|
if (structureMap.containsKey("体格检查(一)")) {
|
|
structureMap.put("体格检查", structureMap.get("体格检查(一)"));
|
|
structureMap.put("体格检查", structureMap.get("体格检查(一)"));
|
|
structureMap.remove("体格检查(一)");
|
|
structureMap.remove("体格检查(一)");
|
|
@@ -82,14 +81,6 @@ public class YwzxyyBeHospitalizedXmlAnalysis implements YwzxyyXmlAnalysis {
|
|
return structureMap;
|
|
return structureMap;
|
|
}
|
|
}
|
|
|
|
|
|
- private Map<String, String> keyRemoveBlank(Map<String, String> sourceMap) {
|
|
|
|
- Map<String, String> structureMap = Maps.newHashMap();
|
|
|
|
- sourceMap.forEach((key, value) -> {
|
|
|
|
- structureMap.put(StringUtil.removeBlank(key), sourceMap.get(key));
|
|
|
|
- });
|
|
|
|
- return structureMap;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
private String matRegx(String source, String regex1, String regex2, String val) {
|
|
private String matRegx(String source, String regex1, String regex2, String val) {
|
|
if (StringUtil.isNotBlank(source) && StringUtil.isNotBlank(regex1)
|
|
if (StringUtil.isNotBlank(source) && StringUtil.isNotBlank(regex1)
|
|
&& StringUtil.isNotBlank(regex2) && StringUtil.isNotBlank(val)) {
|
|
&& StringUtil.isNotBlank(regex2) && StringUtil.isNotBlank(val)) {
|