|
@@ -42,8 +42,10 @@ public class THR02900 extends QCCatalogue {
|
|
|
continue;
|
|
|
}
|
|
|
Map<String, String> structureMap = operationRecordDoc.getStructureMap();
|
|
|
+ String opeAssName = structureMap.get("手术者及助手名称");
|
|
|
+ String[] split = opeAssName.split("、");
|
|
|
String chiefSurgeon = structureMap.get("主刀医师");
|
|
|
- String firstAssistant = structureMap.get("一助");
|
|
|
+ String firstAssistant = structureMap.get("助手");
|
|
|
String opeEndTime = structureMap.get("手术结束时间");
|
|
|
Date opeEndDate = CatalogueUtil.parseStringDate(opeEndTime);
|
|
|
if (opeEndDate == null) {
|
|
@@ -74,12 +76,20 @@ public class THR02900 extends QCCatalogue {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (!allTitle.contains(chiefSurgeon) && !allTitle.contains(firstAssistant)) {
|
|
|
+ if (allTitle.contains("术后主刀")) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (StringUtil.isNotBlank(chiefSurgeon) && !allTitle.contains(chiefSurgeon) &&
|
|
|
+ StringUtil.isNotBlank(firstAssistant) && !allTitle.contains(firstAssistant)) {
|
|
|
status.set("-1");
|
|
|
return;
|
|
|
+ } else if (StringUtil.isBlank(chiefSurgeon) && StringUtil.isBlank(firstAssistant) && split.length > 1) {
|
|
|
+ for (int i = 0; i < split.length; i++) {
|
|
|
+ if (allTitle.contains(split[i])) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|