|
@@ -59,27 +59,12 @@ public class NingBoZhongYiLeaveHospitalHtmlAnalysis implements NingBoZhongYiHtml
|
|
|
String discharge = structureMap.get("出院诊断");
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
int num =0;
|
|
|
- if(discharge.contains("中医诊断") && !discharge.contains("西医诊断")){
|
|
|
- String zdischarge = discharge.split("中医诊断")[1].replace(":","");
|
|
|
- num = extractDischarge(num, sb, zdischarge);
|
|
|
-
|
|
|
- }
|
|
|
- if(discharge.contains("中医诊断") && discharge.contains("西医诊断")){
|
|
|
- String zdischarge = discharge.split("西医诊断")[0].split("中医诊断")[1].replace(":","");
|
|
|
+ if(discharge.contains("西医诊断")){
|
|
|
String xdischarge = discharge.split("西医诊断")[1].replace(":","");
|
|
|
- num = extractDischarge(num,sb,zdischarge);
|
|
|
- String[] xleaveDiags = xdischarge.split(",?,?[0-9]\\.");
|
|
|
- for (String leaveDiag : xleaveDiags) {
|
|
|
- leaveDiag = leaveDiag.trim();
|
|
|
- if(StringUtil.isNotBlank(leaveDiag)){
|
|
|
- num++;
|
|
|
- sb.append(num+"."+leaveDiag.trim());
|
|
|
- }
|
|
|
+ String sbStr = extractDischarge(num, sb, xdischarge);
|
|
|
+ if(StringUtil.isNotBlank(sbStr)){
|
|
|
+ structureMap.put("出院诊断规则",sbStr);
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- if(StringUtil.isNotBlank(sb.toString())){
|
|
|
- structureMap.put("出院诊断规则",sb.toString());
|
|
|
}
|
|
|
}
|
|
|
CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
|
|
@@ -90,7 +75,7 @@ public class NingBoZhongYiLeaveHospitalHtmlAnalysis implements NingBoZhongYiHtml
|
|
|
return structureMap;
|
|
|
}
|
|
|
|
|
|
- public int extractDischarge( int num, StringBuilder sb,String zdischarge){
|
|
|
+ public String extractDischarge( int num, StringBuilder sb,String zdischarge){
|
|
|
String rex =",?,?[0-9]\\.";
|
|
|
boolean matches = zdischarge.matches(rex);
|
|
|
String[] zleaveDiags = null;
|
|
@@ -110,6 +95,6 @@ public class NingBoZhongYiLeaveHospitalHtmlAnalysis implements NingBoZhongYiHtml
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return num;
|
|
|
+ return sb.toString();
|
|
|
}
|
|
|
}
|