Merge branch 'dev-1.2' of http://192.168.2.236:10080/louhr/qc into dev-1.2

Conflicts:
	trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java

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

@@ -241,6 +241,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
             "新会诊-会诊地点=会诊地点",
             "新会诊-接待医生=会诊医师",
             "新会诊-会诊意见=会诊意见",
+            "新会诊-会诊科室=会诊科室",
             "签名++++=签名",
             "++++会诊医师=会诊医师"
     );