|
@@ -163,6 +163,8 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
|
|
|
title = title.replace("一助", doctorTitle);
|
|
|
}
|
|
|
+ System.out.println((StringUtils.isNotEmpty(subTitle(title)) && subTitle(title).contains("主治")));
|
|
|
+ System.out.println(findAttend(title, content));
|
|
|
if ((StringUtils.isNotEmpty(subTitle(title)) && subTitle(title).contains("主治"))
|
|
|
|| findAttend(title, content)) {
|
|
|
attendingDoctorWardDoc = new AttendingDoctorWardDoc();
|
|
@@ -192,7 +194,14 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
* @return
|
|
|
*/
|
|
|
private boolean findAttend(String title, String content) {
|
|
|
- return title.contains("共同照护讨论记录") && content.contains("主治");
|
|
|
+ Pattern p = Pattern.compile("(?<=主治医师).+?(?=住院医师)");
|
|
|
+ Matcher m = p.matcher(content);
|
|
|
+ String result = "";
|
|
|
+ while(m.find())
|
|
|
+ {
|
|
|
+ result = m.group().trim();
|
|
|
+ }
|
|
|
+ return title.contains("共同照护讨论记录") && result.replace(":","").replace(":","").contains("主治");
|
|
|
}
|
|
|
|
|
|
private String subTitle(String srcText) {
|