|
@@ -325,10 +325,10 @@ public class CommonAnalysisUtil {
|
|
|
*/
|
|
|
public static void extractWardInfo(String htmlText, Map<String, String> structureMap) {
|
|
|
if (StringUtil.isNotBlank(htmlText)) {
|
|
|
- htmlText = htmlText.replaceAll("[ ]", " ").replace("第1页", "");
|
|
|
+ htmlText = htmlText.replaceAll("[ \n]", " ").replace("第1页", "");
|
|
|
String date = extractDate(htmlText);
|
|
|
if (date != null) {
|
|
|
- structureMap.put("病历日期", date);
|
|
|
+ structureMap.put("查房日期", date);
|
|
|
htmlText = htmlText.replace(date, "").trim();
|
|
|
}
|
|
|
List<String> titleContent = Lists.newArrayList(htmlText.split(" "));
|
|
@@ -344,10 +344,10 @@ public class CommonAnalysisUtil {
|
|
|
String content = sb.toString();
|
|
|
if (content.contains("<img")) {
|
|
|
String[] contentDoctor = content.split("<img");
|
|
|
- structureMap.put("病历内容", contentDoctor[0]);
|
|
|
+ structureMap.put("病情记录", contentDoctor[0]);
|
|
|
structureMap.put("记录医生", "<img" + contentDoctor[1]);
|
|
|
} else {
|
|
|
- structureMap.put("病历内容", content);
|
|
|
+ structureMap.put("病情记录", content);
|
|
|
}
|
|
|
}
|
|
|
}
|