Merge branch 'feature/dxp' into 'release'

Feature/dxp

See merge request !232

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -1128,7 +1128,7 @@
         this.userName = row.userName;
         this.userNamePhone = row.userMobile;
         this.triageDepartment = row.triageDepartment;
-        this.departmentId = row.departmentId;
+        this.departmentId = row.triageDepartmentId;
         this.diagnosisTimeVisible = true;
         this.bizType = 5;
       // }