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

# Conflicts:
#	trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0043.java

@@ -30,8 +30,8 @@ public class BEH0043 extends QCCatalogue {
         }
         //台州结构化
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        if (StringUtils.isNotEmpty(structureMap.get("联系地址")) || StringUtils.isNotEmpty(structureMap.get("现住址"))
-                || StringUtils.isNotEmpty(structureMap.get("家庭住址"))) {
+        if (StringUtils.isNotEmpty(structureMap.get("户口地址")) || StringUtils.isNotEmpty(structureMap.get("出生地"))
+        ) {
             status.set("0");
             return;
         }

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

@@ -28,8 +28,8 @@ public class PRE0329 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征与禁忌"))) {
-                status.set("0");
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征与禁忌"))) {
+                status.set("-1");
             }
         }
 

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

@@ -27,8 +27,8 @@ public class PRE0332 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isNotBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备"))) {
-                status.set("0");
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备"))) {
+                status.set("-1");
             }
         }
     }

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

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

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

@@ -162,11 +162,12 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "患者姓名=姓名",
             "年月日=初步诊断日期",
             "年月日时分=初步诊断日期",
-            "病历内容=个人史",
             "诊疗经过=诊疗情况",
             "随访安排=随访计划",
             "活动能力与生活自理情况=出院医嘱",
-            "患者籍贯新=籍贯"
+            "患者籍贯新=籍贯",
+            "活动能力与生活自理情况=出院医嘱",
+            "病历内容=初步诊断医师签名"
 
     );
 

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

@@ -235,7 +235,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术简要经过（包括“术中所见”）=手术经过及处理",
             "第一助手=一助",
             "洗手护士=手术护士",
-            "手术经过=手术经过及处理"
+            "手术经过=手术经过及处理",
+            "助手医师=助手"
     );