北仑：病情记录中含有主刀医师名字，判断主刀医生是否为主治医生

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0126.java

@@ -128,28 +128,36 @@ public class THR0126 extends QCCatalogue {
                     String makeTitle = structureMap.get("查房标题");
                     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;
-                            }
-                        }
-                    }
+                    visitingPhysicianHouse(operatorName, makeTitle);
                     //判断病情记录
-                    if (StringUtil.isNotBlank(pathography) && pathography.contains("主治")) {
-                        status.set("0");
-                        return;
-                    }
+                    visitingPhysicianHouse(operatorName, pathography);
+                }
+            }
+        }
+    }
+
+    /**
+     * 判断查房记录是否含有主治医师查房
+     *
+     * @param operatorName     主刀医师
+     * @param titlePathography 查房标题或病情记录
+     */
+    private void visitingPhysicianHouse(String operatorName, String titlePathography) {
+        if (StringUtil.isNotBlank(titlePathography)) {
+            if (titlePathography.contains("主治") || titlePathography.contains("主任")) {
+                status.set("0");
+                return;
+            } else if (StringUtil.isNotBlank(operatorName) && (titlePathography.contains(operatorName) || titlePathography.contains("主刀"))) {
+                String operationProfessor = getFirstCourseProfessor(operatorName);
+                if (operationProfessor.contains("主治") || operationProfessor.contains("主任")) {
+                    status.set("0");
+                    return;
                 }
             }
         }
     }
 
+
     private String getFirstCourseProfessor(String doctorSign) {
         String professor = "";
 //        String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");