|
@@ -284,6 +284,12 @@ public class CommonAnalysisUtil {
|
|
|
Matcher m1 = p1.matcher(top);
|
|
|
if (m1.find()) {
|
|
|
return m1.group(0);
|
|
|
+ } else {
|
|
|
+ Pattern p2 = Pattern.compile("[0-9]{4}年[0-9]+月[0-9]+日 [0-9]+:[0-9]+");
|
|
|
+ Matcher m2 = p2.matcher(top);
|
|
|
+ if (m2.find()) {
|
|
|
+ return m2.group(0);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return null;
|
|
@@ -392,6 +398,9 @@ public class CommonAnalysisUtil {
|
|
|
if (info.contains("医生签名")) {
|
|
|
structureMap.put("病情记录", info.substring(0, info.lastIndexOf("医生签名")));
|
|
|
structureMap.put("记录医生", "");
|
|
|
+ }else if(info.contains("医师签名")){
|
|
|
+ structureMap.put("病情记录", info.substring(0, info.lastIndexOf("医师签名")));
|
|
|
+ structureMap.put("记录医生", "");
|
|
|
}
|
|
|
}
|
|
|
}
|