Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/api/residentWX/nim.js

@@ -9,3 +9,8 @@ export function getServiceDoc(params) {
 export function getAccount(idCard) {
     return fetchBase({ url: `/chronic-resident/v1/chronic-resident-im/refresh-token/${idCard}`, loading: true })
 }
+
+// 获取聊天信息
+export function getSessionInfo(accountId) {
+    return fetchBase({ url: `/chronic-resident/v1/chronic-resident-im/doctorInfo/${accountId}`, loading: true })
+}

src/resident/screening/first/form/BaseInfo.vue

@@ -240,6 +240,10 @@ const defaultForm = (info = {}) => {
         highTags: undefined,
         latelyDiagnoseDate: undefined,
         latelyScreenDate:undefined,
+        // 当前人群-显示type=CP00181
+        groupsArrays: undefined,
+        // 当前人群-查询
+        groups: undefined,
     }
     Reflect.ownKeys(form).forEach(key => {
         if (info[key] != undefined) {

src/resident/screening/first/form/Index.vue

@@ -90,6 +90,7 @@ export default {
             if (this.step === 1) {
                 this.recordForm = {}
                 this.checkInfo = {}
+                this.recordForm.doctorId = this.doctorId
             }
         },
         onClose() {

src/resident/screening/first/form/ScreenInfo.vue

@@ -580,8 +580,11 @@ export default {
     font-size: 12px;
     position: absolute;
     bottom: -12px;
-    left: -100px;
+    // left: -100px;
     right: 0;
+    width: 100vw;
+    overflow: hidden;
+    white-space: nowrap;
 }
 table {
     text-align: left;

src/residentWX/nim/Index.vue

@@ -38,6 +38,7 @@
 import { useStore } from '@/residentWX/store'
 import { getServiceDoc } from '@/api/residentWX/nim.js'
 import { showFailToast  } from 'vant'
+import { getSessionInfo } from '@/api/residentWX/nim.js'
 
 export default {
     inject:['showNav', 'isResidentInfo'],
@@ -85,6 +86,21 @@ export default {
                 this.doctorList = doctorList
                 this.orgList = ['咨询过的专家'].concat(orgList)
                 this.activeOrg = this.orgList[0]
+                
+                // 获取咨询过的医生列表
+                this.loadRecord()
+            })
+        },
+        loadRecord() {
+            getSessionInfo(this.userInfo.idCard).then(res =>{
+                console.log('getSessionInfo', res)
+                const result = res.data || []
+                const array = []
+                result.forEach(e => {
+                    const item = this.doctorList.find(i => e.idCard === i.identityCard)
+                    item && array.push(item)
+                })
+                this.recordList = array
             })
         },
         onOrgChange(item) {

src/residentWX/nim/Session.vue

@@ -92,7 +92,6 @@ export default {
             accountId: '',
             token: '',
             msgs: [],
-            nim: null,
             // 输入的信息
             inputValue: '',
             // 是否已连接
@@ -113,6 +112,11 @@ export default {
             ]
         }
     },
+    setup() {
+        return {
+            nim: null
+        }
+    },
     computed: {
         userInfo() {
             return this.store.userInfo
@@ -176,14 +180,18 @@ export default {
                 },
                 onmsg: (msg) => {
                     console.log('收到新消息===========>', msg);
+                    if (msg.from === this.targetId) {
                         this.msgs.push(msg)
                         this.toBottom()
+                    }
                 },
                 onofflinemsgs: (obj) => {
                     console.log('收到离线消息===========>', obj);
+                    if (obj.to === this.targetId) {
                         this.msgs.push(...obj.msgs)
                         this.toBottom()
                     }
+                }
             })
         },
         // 发送信息