Merge branch 'beilun/dev-fqw' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0333.java

@@ -27,7 +27,7 @@ public class PRE0333 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主要术中、术后风险及防范措施"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主要术中、术后风险及防范措施"))) {
                 status.set("-1");
             }
         }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -166,7 +166,6 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "随访安排=随访计划",
             "活动能力与生活自理情况=出院医嘱",
             "患者籍贯新=籍贯",
-            "活动能力与生活自理情况=出院医嘱",
             "病历内容=初步诊断医师签名"
 
     );

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -341,7 +341,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "患者签名日期=记录时间",
             "手术名称=拟施手术方式名称及可能的变更与禁忌症",
             "病历内容=历史摘要",
-            "麻醉方式=拟施麻醉方式"
+            "麻醉方式=拟施麻醉方式",
+            "拟施手术名称和方式及可能的变更=拟施手术方式名称及可能的变更与禁忌症"
     );
 
     /**********************************************手术知情同意书****************************************************/