|
@@ -90,7 +90,7 @@ public class YwzxyyThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
}
|
|
|
//总的查房记录 汇总
|
|
|
ThreeLevelWardDoc allDoctorWradDoc = new ThreeLevelWardDoc();
|
|
|
- allDoctorWradDoc.setText(structureMap.get("原始文本"));
|
|
|
+ allDoctorWradDoc.setText(structureMap.get("病情记录"));
|
|
|
allDoctorWradDoc.setStructureMap(structureMap);
|
|
|
allDoctorWradDoc.setPageData((Map) structureMap);
|
|
|
result.addAllDoctorWradDoc(allDoctorWradDoc);
|
|
@@ -98,7 +98,7 @@ public class YwzxyyThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
//主任医师查房
|
|
|
DirectorDoctorWardDoc directorDoctorWardDoc = findDirectorDoctorWardDoc(structureMap);
|
|
|
if (directorDoctorWardDoc != null) {
|
|
|
- result.addDirectorDoctorWardDoc(findDirectorDoctorWardDoc(structureMap));
|
|
|
+ result.addDirectorDoctorWardDoc(directorDoctorWardDoc);
|
|
|
}
|
|
|
//主治医师查房
|
|
|
AttendingDoctorWardDoc attendingDoctorWardDoc = findAttendingDoctorWardDoc(structureMap);
|
|
@@ -108,6 +108,7 @@ public class YwzxyyThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
//普通医师查房
|
|
|
if (directorDoctorWardDoc == null && attendingDoctorWardDoc == null) {
|
|
|
GeneralDoctorWardDoc generalDoctorWardDoc = new GeneralDoctorWardDoc();
|
|
|
+ generalDoctorWardDoc.setText(structureMap.get("病情记录"));
|
|
|
generalDoctorWardDoc.setStructureMap(structureMap);
|
|
|
generalDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
result.addGeneralDoctorWardDoc(generalDoctorWardDoc);
|
|
@@ -135,6 +136,7 @@ public class YwzxyyThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(subTitle(title)) && subTitle(title).contains("主任")) { //标题有代字)
|
|
|
directorDoctorWardDoc = new DirectorDoctorWardDoc();
|
|
|
+ directorDoctorWardDoc.setText(structureMap.get("病情记录"));
|
|
|
directorDoctorWardDoc.setStructureMap(structureMap);
|
|
|
directorDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
}
|
|
@@ -163,6 +165,7 @@ public class YwzxyyThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(subTitle(title)) && subTitle(title).contains("主治")) { //标题有代字)
|
|
|
attendingDoctorWardDoc = new AttendingDoctorWardDoc();
|
|
|
+ attendingDoctorWardDoc.setText(structureMap.get("病情记录"));
|
|
|
attendingDoctorWardDoc.setStructureMap(structureMap);
|
|
|
attendingDoctorWardDoc.setPageData((Map) structureMap);
|
|
|
}
|
|
@@ -171,12 +174,10 @@ public class YwzxyyThreeLevelWardDocTrans extends ModelDocTrans {
|
|
|
}
|
|
|
|
|
|
private List<String> keyContrasts = Lists.newArrayList(
|
|
|
- "病程时间=查房日期",
|
|
|
- "病程内容=病情记录",
|
|
|
- "病程标题=查房标题",
|
|
|
- "记录医师=记录医生",
|
|
|
- "记录医师签名=记录医生",
|
|
|
- "医师签名=记录医生"
|
|
|
+ "病历记录时间=查房日期",
|
|
|
+ "原始文本=病情记录",
|
|
|
+ "病历记录标题=查房标题",
|
|
|
+ "记录医师=记录医生"
|
|
|
);
|
|
|
|
|
|
public static String subTitle(String srcText) {
|