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

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

@@ -115,7 +115,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "++++胸闷心悸史=胸闷心悸史",
             "实验室检查++++辅助检查=辅助检查",
             "签名++++=医师签名",
-            "兄弟姐妹健康状况++++兄弟姐妹=兄弟姐妹健康状况"
+            "兄弟姐妹健康状况++++兄弟姐妹=兄弟姐妹健康状况",
+            "++++（外）祖父母=外祖父母"
     );
 
     private String concatString(String item) {

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

@@ -139,7 +139,9 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "手术结束时间=",
             "麻醉方式=",
             "手术方式=",
+            "手术方式++++手术名称=手术方式",
             "术中诊断++++初步诊断=术中诊断",
+            "术中诊断++++术后诊断=术中诊断",
             "手术经过=手术简要经过",
             "患者术后情况=",
             "术后处理措施=",