|
@@ -163,8 +163,6 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
|
|
String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
|
|
String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
|
|
title = title.replace("一助", doctorTitle);
|
|
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("主治"))
|
|
if ((StringUtils.isNotEmpty(subTitle(title)) && subTitle(title).contains("主治"))
|
|
|| findAttend(title, content)) {
|
|
|| findAttend(title, content)) {
|
|
attendingDoctorWardDoc = new AttendingDoctorWardDoc();
|
|
attendingDoctorWardDoc = new AttendingDoctorWardDoc();
|
|
@@ -201,7 +199,7 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
|
|
{
|
|
{
|
|
result = m.group().trim();
|
|
result = m.group().trim();
|
|
}
|
|
}
|
|
- return title.contains("共同照护讨论记录") && result.replace(":","").replace(":","").contains("主治");
|
|
|
|
|
|
+ return title.contains("共同照护讨论记录") && StringUtil.isNotEmpty(result.replace(":","").replace(":",""));
|
|
}
|
|
}
|
|
|
|
|
|
private String subTitle(String srcText) {
|
|
private String subTitle(String srcText) {
|