|
@@ -111,7 +111,7 @@ public class THR0126 extends QCCatalogue {
|
|
|
operatorName = operationDocStructureMap.get("主刀医师");
|
|
|
if (StringUtil.isBlank(operatorName) && StringUtil.isNotBlank(operationDocStructureMap.get("手术者及助手名称"))) {
|
|
|
operatorName = operationDocStructureMap.get("手术者及助手名称").split("、")[0];
|
|
|
- if(operatorName.contains("主刀:")){
|
|
|
+ if (operatorName.contains("主刀:")) {
|
|
|
operatorName = operatorName.split(":")[1];
|
|
|
}
|
|
|
}
|
|
@@ -125,16 +125,25 @@ public class THR0126 extends QCCatalogue {
|
|
|
String wardDateStr = structureMap.get("查房日期");
|
|
|
if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(wardDateStr), 48 * 60L)) {
|
|
|
String makeTitle = structureMap.get("查房标题");
|
|
|
- if (makeTitle.contains("主治")) {
|
|
|
- status.set("0");
|
|
|
- return;
|
|
|
- } else if (makeTitle.contains("主刀")) {
|
|
|
- String operationProfessor = getFirstCourseProfessor(operatorName);
|
|
|
- if (operationProfessor.contains("主治") || operationProfessor.contains("主任")) {
|
|
|
+ String pathography = structureMap.get("病情记录");
|
|
|
+ //判断标题
|
|
|
+ if (StringUtil.isNotBlank(makeTitle)) {
|
|
|
+ if (makeTitle.contains("主治")) {
|
|
|
status.set("0");
|
|
|
return;
|
|
|
+ } else if (makeTitle.contains("主刀")) {
|
|
|
+ String operationProfessor = getFirstCourseProfessor(operatorName);
|
|
|
+ if (operationProfessor.contains("主治") || operationProfessor.contains("主任")) {
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ //判断病情记录
|
|
|
+ if (StringUtil.isNotBlank(pathography) && pathography.contains("主治")) {
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|