|
@@ -500,10 +500,10 @@ public class XyCommonAnalysisUtil {
|
|
|
public static void extractWardInfo(String recTitle, String htmlText, Map<String, String> structureMap) {
|
|
|
if (StringUtil.isNotBlank(htmlText)) {
|
|
|
htmlText = htmlText.replaceAll("[ \n]", " ").replace("第1页", "")
|
|
|
- .replace("\n", " ").replace(" ","");
|
|
|
+ .replace("\n", " ").replace(" ", "");
|
|
|
String date = extractDate(htmlText);
|
|
|
if (date != null) {
|
|
|
- String dateTime =date.replace(","," ");
|
|
|
+ String dateTime = date.replace(",", " ");
|
|
|
structureMap.put("病历日期", dateTime);
|
|
|
htmlText = htmlText.replace(date, "").trim();
|
|
|
}
|
|
@@ -515,10 +515,10 @@ public class XyCommonAnalysisUtil {
|
|
|
} else {
|
|
|
structureMap.put("病历标题", recTitle);
|
|
|
structureMap.put("文书标题", title);
|
|
|
- if (titleContent.size() > 2) {
|
|
|
- titleContent.remove(0);
|
|
|
- titleContent.remove(0);
|
|
|
- }
|
|
|
+// if (titleContent.size() > 2) {
|
|
|
+ titleContent.remove(0);
|
|
|
+// titleContent.remove(0);
|
|
|
+// }
|
|
|
}
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
for (String text : titleContent) {
|
|
@@ -536,18 +536,17 @@ public class XyCommonAnalysisUtil {
|
|
|
String info = structureMap.get("病情记录");
|
|
|
if (info.contains("医师签名")) {
|
|
|
structureMap.put("医师签名", info.substring(info.indexOf("医师签名") + "医生签名".length(), info.length()));
|
|
|
- //解决病情记录包括医师签名
|
|
|
+ //解决病情记录包括医师签名
|
|
|
Integer index = info.indexOf("医师签名");
|
|
|
structureMap.put("病情记录", info.substring(0, index));
|
|
|
structureMap.put("记录医生", "");
|
|
|
//解决医师签名里包含上级医师签名
|
|
|
- if (structureMap.get("医师签名").contains("上级医师签名")){
|
|
|
- structureMap.put("医师签名",structureMap.get("医师签名").substring(0,structureMap.get("医师签名").indexOf("上级医师签名")));
|
|
|
+ if (structureMap.get("医师签名").contains("上级医师签名")) {
|
|
|
+ structureMap.put("医师签名", structureMap.get("医师签名").substring(0, structureMap.get("医师签名").indexOf("上级医师签名")));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|