Merge remote-tracking branch 'origin/beilun/dev-fqw' into beilun/dev

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

@@ -93,9 +93,10 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
             "体温(耳)=体温耳",
             "体温(口)=体温口",
             "病历日期=记录时间",
-            "病程时间=病例日期",
+            "病程时间=病历日期",
             "记录医师=记录医生",
-            "诊疗计划=诊疗计划方案"
+            "诊疗计划=诊疗计划方案",
+            "病例日期=病历日期"
     );
 
 }

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

@@ -170,7 +170,13 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "医生=主刀医师签名",
             "手术医师=主刀医师",
             "助手=一助",
-            "本人姓名=姓名"
+            "本人姓名=姓名",
+            "手术开始日期时间=开始时间",
+            "手术结束日期时间=结束时间",
+            "术后诊断=术中后诊断",
+            "麻醉方法代码=麻醉方式",
+            "麻醉医师签名=麻醉医师",
+            "手术过程的详细描述=手术经过及处理"
     );
 
 
@@ -227,7 +233,12 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "术中、术后防范措施=可能意外和防范措施",
             "现病史- 发病情况=发病经过",
             "本人姓名=姓名",
-            "拟施手术名称和方式=拟行术式"
+            "拟施手术名称和方式=拟行术式",
+            "拟实施麻醉方法代码=拟施麻醉方式",
+            "拟实施手术及操作名称=拟施手术方式、名称及可能的变更与禁忌症",
+            "术前术后注意事项=主要术中、术后风险及防范措施",
+            "时间=讨论时间",
+            "术前准备内容=术前准备"
     );
 
     /**********************************************手术知情同意书****************************************************/
@@ -278,12 +289,13 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术医生=",
             "目前诊断=",
             "手术名称=",
-            "手术指征=",
+            "手术指征=手术指征与禁忌",
             "风险及并发症=",
             "++++保守治疗=保守治疗",
             "++++其他手术=其他手术",
             "签名++++=签名",
-            "签名时间=签名时间"
+            "签名时间=签名时间",
+            "术前准备内容=术前准备"
     );