|
@@ -135,6 +135,7 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
private DirectorDoctorWardDoc findDirectorDoctorWardDoc(Map<String, String> structureMap) {
|
|
|
String title = structureMap.get("查房标题");
|
|
|
String content = structureMap.get("病情记录");
|
|
|
+ String writTitle = structureMap.get("文书标题");
|
|
|
String recordDateStr = structureMap.get("查房日期");
|
|
|
Date recordDate = StringUtil.parseDateTime(recordDateStr);
|
|
|
//标题有代字
|
|
@@ -154,6 +155,22 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
directorDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if (StringUtil.isNotBlank(writTitle)) {
|
|
|
+ if (writTitle.contains("主刀")) {
|
|
|
+ String doctorTitle = getDoctorTitle(operationDocs, recordDate, "主刀医师");
|
|
|
+ writTitle = writTitle.replace("主刀", doctorTitle);
|
|
|
+ } else if (writTitle.contains("一助")) {
|
|
|
+ String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
|
|
|
+ writTitle = writTitle.replace("一助", doctorTitle);
|
|
|
+ }
|
|
|
+ if ((StringUtils.isNotEmpty(subTitle(writTitle)) && subTitle(writTitle).contains("主任")) || findDirector(content)
|
|
|
+ || writTitle.contains("三级医师查房")) {
|
|
|
+ directorDoctorWardDoc = new DirectorDoctorWardDoc();
|
|
|
+ directorDoctorWardDoc.setStructureMap(structureMap);
|
|
|
+ directorDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
+ }
|
|
|
+ }
|
|
|
return directorDoctorWardDoc;
|
|
|
}
|
|
|
|
|
@@ -164,6 +181,7 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
*/
|
|
|
private AttendingDoctorWardDoc findAttendingDoctorWardDoc(Map<String, String> structureMap) {
|
|
|
String title = structureMap.get("查房标题");
|
|
|
+ String writTitle = structureMap.get("文书标题");
|
|
|
String content = structureMap.get("病情记录");
|
|
|
String recordDateStr = structureMap.get("查房日期");
|
|
|
Date recordDate = StringUtil.parseDateTime(recordDateStr);
|
|
@@ -184,9 +202,27 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
attendingDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //文书标题和模板标题不一致
|
|
|
+ if (StringUtil.isNotBlank(writTitle)) {
|
|
|
+ if (writTitle.contains("主刀")) {
|
|
|
+ String doctorTitle = getDoctorTitle(operationDocs, recordDate, "主刀医师");
|
|
|
+ writTitle = writTitle.replace("主刀", doctorTitle);
|
|
|
+ } else if (writTitle.contains("一助")) {
|
|
|
+ String doctorTitle = getDoctorTitle(operationDocs, recordDate, "一助");
|
|
|
+ writTitle = writTitle.replace("一助", doctorTitle);
|
|
|
+ }
|
|
|
+ if ((StringUtils.isNotEmpty(subTitle(writTitle)) && subTitle(writTitle).contains("主治"))
|
|
|
+ || findAttend(content) || writTitle.contains("三级医师查房")) {
|
|
|
+ attendingDoctorWardDoc = new AttendingDoctorWardDoc();
|
|
|
+ attendingDoctorWardDoc.setStructureMap(structureMap);
|
|
|
+ attendingDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
+ }
|
|
|
+ }
|
|
|
return attendingDoctorWardDoc;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 共同照护讨论记录中找主任查房
|
|
|
*
|