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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0414.java

@@ -28,9 +28,18 @@ public class BEH0414 extends QCCatalogue {
         String contactAddress_bh = structureMap.get("年龄");
         String contactAddress_first = firstStructMap.get(Content.age);
         if (StringUtil.isNotBlank(contactAddress_bh) && StringUtil.isNotBlank(contactAddress_first)) {
+            contactAddress_bh = removeUnit(contactAddress_bh);
+            contactAddress_first = removeUnit(contactAddress_first);
             if (!contactAddress_first.equals(contactAddress_bh)) {
                 status.set("-1");
             }
         }
     }
+
+    private String removeUnit(String str) {
+        if (str.contains("岁")) {
+            return str.replace("岁", "");
+        }
+        return str;
+    }
 }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

@@ -181,6 +181,10 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
             "病程记录标题=查房标题",
             "在此输入查房记录=病情记录",
             "签名++++=记录医师",
+            "在此输入副主任医师代主治医师查房记录++++文本框=病情记录",
+            "日常病程记录++++文本框=病情记录",
+            "在此输入副主任医师查房记录++++文本框=病情记录",
+            "在此输入副主任兼主刀医师查房记录++++文本框=病情记录",
             "科主任=三级医师",
             "入院诊断++++初步诊断=入院诊断",
             "记录日期=记录时间"