Merge branch 'feature/wxl' into 'release'

feat: 新增新诊室跳转 & 敏感信息卡片

See merge request !301

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=94F2E2E006D74C6EB5CCFC15F67DE31A
+VUE_APP_TOKEN=E214A2D6B40345F98DE538DA793CF918

src/api/diagnosis.js

@@ -96,7 +96,7 @@ export const getCountQuery = async (params) => {
   return request({
     url: '/diagnose/admin/diagnose/countQuery',
     method: 'post',
-    data: params
+    data: params,
   });
 };
 
@@ -337,3 +337,11 @@ export const personnelList = async () => {
     method: 'get',
   });
 };
+
+// 根据订单id获取群ID和群用户名
+export const getUserIdByDiagnoseLogId = async (diagnoseLogId) => {
+  return request({
+    url: `/diagnose/admin/diagnose/team/${diagnoseLogId}`,
+    method: 'get',
+  });
+};

src/main.js

@@ -5,6 +5,7 @@ console.log('store ', store);
 
 // 本地调试增加token和systemType
 if (process.env.VUE_APP_ENV === 'development') {
+  console.log(123);
   window.localStorage.setItem('token', process.env.VUE_APP_TOKEN);
   window.localStorage.setItem('systemType', process.env.VUE_APP_SYSTEM_TYPE);
 }

src/views/IM/diagnosis-admin/diagnosis-im.vue

@@ -61,6 +61,15 @@
                     src="../../../assets/image/IM/loading-icon-new.png"
                     alt
                   >
+                  <div
+                    v-if="item.showType == -1"
+                    class="mid-text-wrapper"
+                    style="max-width: 520px;"
+                  >
+                    <div class="mid-text">
+                      {{ item.text }}
+                    </div>
+                  </div>
                   <div
                     v-if="item.showType == 1"
                     class="mid-text-wrapper"

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

@@ -670,7 +670,8 @@ import {
   getCountQuery,
   getDepartments,
   reMatchDoctor,
-  personnelList
+  personnelList,
+  getUserIdByDiagnoseLogId,
 } from '@/api/diagnosis';
 import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
 import {
@@ -685,7 +686,7 @@ import {
   TRIAGE_TAB_LIST,
   TYPE_LIST,
   DIAGNOSE_CHANNEL,
-  FOLLOW_STATUS_LIST
+  FOLLOW_STATUS_LIST,
 } from '@/utils/constants';
 import { outbounNote } from '../../../api/diagnosis';
 import { callAssistantDoctor, updateDiagnosis } from '../../../utils/diagnosis';
@@ -734,7 +735,7 @@ export default {
       orderRangeTime: '',
       completeRangeTime: '',
       assistantTime: '',
-      followDateTime:'',
+      followDateTime: '',
       depList: [],
       tabrefresh: true,
       searchParam: {
@@ -756,8 +757,8 @@ export default {
         doneTimeEnd: '',
         assistantBeginTime: '',
         assistantEndTime: '',
-        followDateBegin:'',
-        followDateEnd:'',
+        followDateBegin: '',
+        followDateEnd: '',
         pageSize: 15,
         pageNo: 1,
         menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊 5、外呼
@@ -769,8 +770,8 @@ export default {
         consultRoadList: [],
         diagnoseChannelList: [],
         patientName: null,
-        followOperatorId:'', // 运营id
-        followStatusList:[], // 跟进状态
+        followOperatorId: '', // 运营id
+        followStatusList: [], // 跟进状态
       },
       noteList: [],
       alltabslist: [],
@@ -856,7 +857,7 @@ export default {
       triageDepartment: '',
       departmentId: '',
       allTilst: [],
-      allPersonnelList:[],
+      allPersonnelList: [],
       allList: {},
       consultationTypeList: [
         {
@@ -1164,7 +1165,7 @@ export default {
         orderRangeTime,
         completeRangeTime,
         assistantTime,
-        followDateTime
+        followDateTime,
       } = this;
       this.setTime('createdTimeBegin', 'createdTimeEnd', createRangeTime);
       this.setTime('cancelTimeBegin', 'cancelTimeEnd', cancelRangeTime);
@@ -1208,7 +1209,7 @@ export default {
         data.order == 'descending'
       ) {
         this.searchParam.sort = 4;
-      } else if(data.prop == 'assistantTime') {
+      } else if (data.prop == 'assistantTime') {
         if (data.order == 'ascending') {
           this.searchParam.sort = 5;
         } else {
@@ -1296,14 +1297,14 @@ export default {
         doneTimeEnd: '',
         assistantBeginTime: '',
         assistantEndTime: '',
-        followDateBegin:'',
-        followDateEnd:'',
+        followDateBegin: '',
+        followDateEnd: '',
         inNewTimeObj: {},
         consultRoadList: [],
         patientName: null,
         diagnoseChannelList: [],
-        followStatusList:[],
-        followOperatorId:''
+        followStatusList: [],
+        followOperatorId: '',
       });
       this.getsearch();
     },
@@ -1430,16 +1431,28 @@ export default {
     },
     // 发送消息
     sendMessage(row) {
-      // this.$router.push({
-      //   path: '/diagnosis-im',
-      //   query: { tid: row.imTeamId },
-      // });
-
+      console.log('sendMessage', row);
       const target = this.$refs.target;
       const { origin } = window.location;
-      const u = `${origin}/consultation/pica-admin-consultation/diagnosis-im?tid=${row.imTeamId}`;
-      target.setAttribute('href', u);
-      target.click();
+      let url = `${origin}/consultation/pica-admin-consultation/diagnosis-im?tid=${row.imTeamId}`;
+      // 小程序问诊跳新的项目，本地跳转会不生效。 需要启动该项目 http://192.168.110.53/com.pica.cloud.education.frontend/pica-turborepo/tree/release/apps/pica-chat
+      if (row.diagnoseChannel === 3) {
+        getUserIdByDiagnoseLogId(row.diagnoseLogId)
+          .then((res) => {
+            if (res.code === '000000') {
+              const { userId } = res.data;
+              url = `${origin}/new-pica-consultation?userId=${userId}`;
+              target.setAttribute('href', url);
+              target.click();
+            }
+          })
+          .catch((err) => {
+            console.log('err', err);
+          });
+      } else {
+        target.setAttribute('href', url);
+        target.click();
+      }
     },
 
     // 加入问诊
@@ -1533,7 +1546,7 @@ export default {
           '上级医生日程改变，提前取消',
           '操作失误，重新匹配医生',
           '助诊医生爽约',
-          '科室不对'
+          '科室不对',
         ];
       }
       // this.rematchingOptions=

vue.config.js

@@ -70,7 +70,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://dev-sc.yunqueyi.com/',
+        target: 'https://uat-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,