Merge remote-tracking branch 'origin/beilun/dev' 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/BEH0041.java

@@ -34,7 +34,7 @@ public class BEH0041 extends QCCatalogue {
             return;
         }
 
-        if (StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPersonalLabel().getText())) {
+        if (inputInfo.getBeHospitalizedDoc().getPersonalLabel() != null && StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPersonalLabel().getText())) {
             status.set("0");
         }
     }

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

@@ -28,7 +28,8 @@ public class PRE0330 extends QCCatalogue {
         }
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟施手术方式名称及可能的变更与禁忌症"))) {
+                    && StringUtil.isEmpty(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,6 +166,9 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "随访安排=随访计划",
             "活动能力与生活自理情况=出院医嘱",
             "患者籍贯新=籍贯"
+            "患者籍贯新=籍贯",
+            "病历内容=初步诊断医师签名",
+            "现住址邮编=邮政编码"
 
     );