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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0534.java

@@ -32,7 +32,7 @@ public class CON0534 extends QCCatalogue {
             }
             Map<String, String> consultationResultStructureMap = consultationApplicationDoc.getStructureMap();
             String consultationDateStr = consultationResultStructureMap.get("会诊科室");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
+            if (CatalogueUtil.isEmpty(consultationDateStr) || "【会诊科室】".equals(consultationDateStr)) {
                 status.set("-1");
                 return;
             }

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

@@ -149,8 +149,8 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
             "结束时间=手术结束时间",
             "开始时间=手术开始时间",
-            "医生=手术医师",
-            "手术医师=主刀医师签名",
+            "医生=主刀医师签名",
+//            "手术医师=主刀医师签名",
             "助手=一助",
             "本人姓名=姓名"
     );