|
|
@@ -68,21 +68,21 @@ public class THR0144 extends QCCatalogue {
|
|
|
}
|
|
|
int j = 0; //最后两次查房记录
|
|
|
Boolean lastFlag = true;
|
|
|
- for (int i = allDoctorWradDocs.size() - 1; i >= 0 && j < 3; i--) {
|
|
|
+ for (int i = allDoctorWradDocs.size() - 1; i >= 0 && j < 2; i--) {
|
|
|
j++;
|
|
|
ThreeLevelWardDoc lastWardDoc = allDoctorWradDocs.get(i);
|
|
|
Map<String, String> structureMap = lastWardDoc.getStructureMap();
|
|
|
String conditionRecord = structureMap.get("病情记录");
|
|
|
String treatmentPlan = structureMap.get("治疗计划和措施");
|
|
|
String title = structureMap.get("查房标题");
|
|
|
- if (StringUtil.isBlank(title) || title.equals("病理报告") || title.equals("病理记录") || title.equals("化验记录")) {
|
|
|
+ if (StringUtil.isBlank(title) || title.contains("病理报告") || title.contains("病理记录") || title.contains("化验记录")) {
|
|
|
continue;
|
|
|
}
|
|
|
conditionRecord = StringUtil.isBlank(conditionRecord) ? "" : conditionRecord;
|
|
|
conditionRecord = conditionRecord.replace(" ", "");
|
|
|
treatmentPlan = StringUtil.isBlank(treatmentPlan) ? "" : treatmentPlan;
|
|
|
//主任或主治查房 标题需要包含“主任”或“主治”，内容需要包含“出院”
|
|
|
- if ((!conditionRecord.contains("出院") || treatmentPlan.contains("出院") || conditionRecord.contains("转上级医院"))
|
|
|
+ if ((conditionRecord.contains("出院") || conditionRecord.contains("转上级医院") || treatmentPlan.contains("出院"))
|
|
|
&& (CatalogueUtil.subTitle(title).contains(Content.attend)
|
|
|
|| CatalogueUtil.subTitle(title).contains(Content.director)
|
|
|
|| CatalogueUtil.subTitle(title).contains("主刀"))) {
|
wangsy