Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/page-subspecialty/router/index.js

@@ -198,7 +198,6 @@ router.beforeEach((to, from, next) => {
       // window.SITE_CONFIG['menuList'] = res.data
       const menuListChild = res.data.filter(item => item.children.length > 0)
       fnAddDynamicMenuRoutes(JSON.parse(JSON.stringify(res.data)), menuListChild.length)
-
       next({ ...to, replace: true })
     }).catch(() => {
       return next({ name: 'login' })
@@ -252,7 +251,7 @@ function loginByDocId(doctorId, next, to) {
 }
 function loginByUserId(userIdNumber, next, to) {
   const params = {
-    userIdNumber: userIdNumber
+    userIdNumber: userIdNumber.slice(2)
   }
   http.post('/loginByPidNum', params).then(({ data: res }) => {
     if (res.code !== 0) {

src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue

@@ -316,7 +316,7 @@ export default {
     async handleCall(scopeRow, status) {
       this.patientId = scopeRow.patientId
       const risNo = scopeRow.risNo
-      const examItemId = scopeRow.zlProjectList.length ? scopeRow.zlProjectList[0].id : ''
+      const examItemId = scopeRow.zlProjectList.length ? scopeRow.zlProjectList[0].porjectCode : ''
       const { data: res } = await this.$http.get('/zlCall/callByPatient', {
         params: {
           patientId: this.patientId,
@@ -326,6 +326,7 @@ export default {
         }
       })
       if (res.code === 0) {
+        this.pageCurrentChangeHandle(this.page)
       } else {
         this.$message.error(res.msg)
       }