Merge remote-tracking branch 'origin/dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0416.java

@@ -1,7 +1,6 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 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;
@@ -30,7 +29,9 @@ public class BEH0416 extends QCCatalogue {
             String contactAddress_bh = structureMap.get("职业");
             String contactAddress_first = firstStructMap.get(Content.job);
             if (StringUtil.isNotBlank(contactAddress_bh) && StringUtil.isNotBlank(contactAddress_first)) {
-                if (!removeBrackets(contactAddress_first).equals(removeBrackets(contactAddress_bh))) {
+                contactAddress_first = removeBrackets(contactAddress_first);
+                contactAddress_bh = removeBrackets(contactAddress_bh);
+                if (!contactAddress_first.contains(contactAddress_bh) && !contactAddress_bh.contains(contactAddress_first)) {
                     status.set("-1");
                 }
             }
@@ -40,7 +41,7 @@ public class BEH0416 extends QCCatalogue {
     /*
     去除括号
      */
-    private String removeBrackets(String str){
-        return str.replaceAll("[()（）]","");
+    private String removeBrackets(String str) {
+        return str.replaceAll("[()（）]", "");
     }
 }

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

@@ -18,6 +18,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName : THR0602
@@ -31,7 +32,8 @@ public class THR0602 extends QCCatalogue {
         status.set("0");
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
         List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-        if (ListUtil.isEmpty(operationDocs) || ListUtil.isEmpty(threeLevelWardDocs)) {
+        long operationCount = operationDocs.stream().filter(operationDoc -> operationDoc.getOperationRecordDoc() != null).count();
+        if (operationCount == 0 || ListUtil.isEmpty(threeLevelWardDocs)) {
             return;
         }
         //所有医师查房记录

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -150,7 +150,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
             "结束时间=手术结束时间",
             "开始时间=手术开始时间",
             "医生=手术医师",
-            "手术医师=主刀医师",
+            "手术医师=主刀医师签名",
             "助手=一助",
             "本人姓名=姓名"
     );