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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0323.java

@@ -36,7 +36,7 @@ public class OPE0323 extends QCCatalogue {
                     long count = operationDocs.stream().filter(operationDoc -> {
                         boolean flag = false;
                         if (operationDoc.getOperationRecordDoc() != null) {
-                            String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师");
+                            String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师");
                             String assist1 = operationDoc.getOperationRecordDoc().getStructureMap().get("一助");
                             String signature = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师签名");
                             if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0636.java

@@ -33,7 +33,7 @@ public class OPE0636 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师"))) {
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("主治医师"))) {
                         flag = true;
                     }
                     return flag;

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

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