取得主刀医师返回

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

@@ -87,11 +87,13 @@ public class THR0125 extends QCCatalogue {
                 for (OperationDoc operationDoc : operationDocs) {
                     if (operationDoc.getOperationRecordDoc() != null) {
                         Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
-                        operatorName = operationDocStructureMap.get("主刀医师");
-                        if (StringUtil.isBlank(operatorName) && StringUtil.isNotBlank(operationDocStructureMap.get("手术者及助手名称"))) {
-                            operatorName = operationDocStructureMap.get("手术者及助手名称").split("、")[0];
-                            if (operatorName.contains("主刀：") && operatorName.split("：").length > 1) {
-                                operatorName = operatorName.split("：")[1];
+                        if (StringUtil.isBlank(operatorName)) {
+                            operatorName = operationDocStructureMap.get("主刀医师");
+                            if (StringUtil.isBlank(operatorName) && StringUtil.isNotBlank(operationDocStructureMap.get("手术者及助手名称"))) {
+                                operatorName = operationDocStructureMap.get("手术者及助手名称").split("、")[0];
+                                if (operatorName.contains("主刀：") && operatorName.split("：").length > 1) {
+                                    operatorName = operatorName.split("：")[1];
+                                }
                             }
                         }
                     }

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

@@ -1,11 +1,9 @@
 package com.lantone.qc.kernel.catalogue.threelevelward;
 
 import com.lantone.qc.dbanaly.util.KernelConstants;
-import com.lantone.qc.dbanaly.util.RedisUtil;
 import com.lantone.qc.dbanaly.util.SpecialStorageUtil;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
@@ -112,11 +110,13 @@ public class THR0126 extends QCCatalogue {
                 for (OperationDoc operationDoc : operationDocs) {
                     if (operationDoc.getOperationRecordDoc() != null) {
                         Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
-                        operatorName = operationDocStructureMap.get("主刀医师");
-                        if (StringUtil.isBlank(operatorName) && StringUtil.isNotBlank(operationDocStructureMap.get("手术者及助手名称"))) {
-                            operatorName = operationDocStructureMap.get("手术者及助手名称").split("、")[0];
-                            if (operatorName.contains("主刀：") && operatorName.split("：").length > 1) {
-                                operatorName = operatorName.split("：")[1];
+                        if (StringUtil.isBlank(operatorName)) {
+                            operatorName = operationDocStructureMap.get("主刀医师");
+                            if (StringUtil.isBlank(operatorName) && StringUtil.isNotBlank(operationDocStructureMap.get("手术者及助手名称"))) {
+                                operatorName = operationDocStructureMap.get("手术者及助手名称").split("、")[0];
+                                if (operatorName.contains("主刀：") && operatorName.split("：").length > 1) {
+                                    operatorName = operatorName.split("：")[1];
+                                }
                             }
                         }
                     }
@@ -160,7 +160,6 @@ public class THR0126 extends QCCatalogue {
         }
     }
 
-
     private String getFirstCourseProfessor(String doctorSign) {
         String professor = "";
 //        String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");