Merge branch 'dev-patients-20190513' into 'release-0612'

Dev patients 20190513



See merge request !31

src/utils/followup/followapis.js

@@ -8,7 +8,8 @@ import utils from './followupUtils';
 
 
 const headers = {
-  sysCode: 45
+  sysCode: 45,
+  hospitalAuth:true
 } /**/
 /*工作台*/
 export const getTodayAppointsList = (params) => {
@@ -41,301 +42,396 @@ export const getTodayPlans = (params) => {
 
 /*计划管理*/
 export const createFollowPlan = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans`),
-    method: 'post',
-    data: data,
-    description: '新增、修改随访计划',
-  },)
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans`),
+      method: 'post',
+      data: data,
+      description: '新增、修改随访计划',
+    })
+  })
+
 }
 export const getPlanList = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans`),
-    method: 'get',
-    params: params,
-    description: '获取计划列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans`),
+      method: 'get',
+      params: params,
+      description: '获取计划列表',
+    })
   })
+
 };
 export const getPlanDetail = (planId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/${planId}`),
-    method: 'get',
-    description: '获取计划详情',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/${planId}`),
+      method: 'get',
+      description: '获取计划详情',
+    })
   })
+
 };
 export const getNodeTimeList = (planId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/${planId}/time`),
-    method: 'get',
-    description: '获取随访时间节点列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/${planId}/time`),
+      method: 'get',
+      description: '获取随访时间节点列表',
+    })
   })
+
 };
 export const getNodeTimeContent = (planTimeId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/time/${planTimeId}`),
-    method: 'get',
-    description: '获取节点详情',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/time/${planTimeId}`),
+      method: 'get',
+      description: '获取节点详情',
+    })
   })
+
 };
 export const getResidentList = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/planPatient/`),
-    method: 'get',
-    params: params,
-    description: '获取居民列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/planPatient/`),
+      method: 'get',
+      params: params,
+      description: '获取居民列表',
+    })
   })
+
 };
 export const getGroupList = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/planPatient/group`),
-    method: 'get',
-    params: params,
-    description: '获取分组列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/planPatient/group`),
+      method: 'get',
+      params: params,
+      description: '获取分组列表',
+    })
   })
+
 };
 export const getFollowStartTimeList = (planId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/planPatient/${planId}/times`),
-    method: 'get',
-    description: '获取随访开始时间列表（居民相关）',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/planPatient/${planId}/times`),
+      method: 'get',
+      description: '获取随访开始时间列表（居民相关）',
+    })
   })
+
 };
 export const getResidentDetail = (planId,patientId,fuPlanPatientId ) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/planPatient/${planId}/detail/${patientId}?planPatientsId=${fuPlanPatientId}`),
-    method: 'get',
-    description: '获取居民详情',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/planPatient/${planId}/detail/${patientId}?planPatientsId=${fuPlanPatientId}`),
+      method: 'get',
+      description: '获取居民详情',
+    })
   })
+
 };
 export const changePlan = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/planPatient/change`),
-    method: 'put',
-    data: data,
-    description: '变更计划',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/planPatient/change`),
+      method: 'put',
+      data: data,
+      description: '变更计划',
+    })
   })
+
 };
 export const finishPlan = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/planPatient/status`),
-    method: 'put',
-    data: data,
-    description: '变更计划',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/planPatient/status`),
+      method: 'put',
+      data: data,
+      description: '变更计划',
+    })
   })
+
 };
 export const deletePlan = (planId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/${planId}`),
-    method: 'delete',
-    description: '删除计划',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/${planId}`),
+      method: 'delete',
+      description: '删除计划',
+    })
   })
+
 };
 export const getVerifyStatus = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/validate/status`),
-    method: 'get',
-    params: params,
-    description: '认证校验',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/validate/status`),
+      method: 'get',
+      params: params,
+      description: '认证校验',
+    })
   })
+
 };
 /*预约管理*/
 export const getReservationList = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/appoint/appointed/list`),
-    method: 'post',
-    data: data,
-    description: '获取预约列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/appoint/appointed/list`),
+      method: 'post',
+      data: data,
+      description: '获取预约列表',
+    })
   })
+
 };
 export const getCheckReservation = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/healths/notice/fu/doctor/appoint/pushValid`),
-    method: 'post',
-    data: data,
-    description: '发送预约校验',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/healths/notice/fu/doctor/appoint/pushValid`),
+      method: 'post',
+      data: data,
+      description: '发送预约校验',
+    })
   })
+
 };
 export const getReservationPatients = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/appoint/appointed/count`),
-    method: 'post',
-    data: data,
-    description: '查看预约人数',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/appoint/appointed/count`),
+      method: 'post',
+      data: data,
+      description: '查看预约人数',
+    })
   })
+
 };
 export const changeReservationStatus = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/appoint/status/`),
-    method: 'post',
-    data: data,
-    description: '手动变更预约状态',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/appoint/status/`),
+      method: 'post',
+      data: data,
+      description: '手动变更预约状态',
+    })
   })
+
 };
 export const sendReservation = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/appoint/`),
-    method: 'post',
-    data: data,
-    description: '发送预约',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/appoint/`),
+      method: 'post',
+      data: data,
+      description: '发送预约',
+    })
   })
+
 };
 /*录入管理*/
 export const getEnteringList = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/entering/list`),
-    method: 'post',
-    data: data,
-    description: '录入列表查看',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/entering/list`),
+      method: 'post',
+      data: data,
+      description: '录入列表查看',
+    })
   })
+
 }
 export const changeEnteringStatus = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/entering/status/change`),
-    method: 'post',
-    data: data,
-    description: '变更随访状态',
-  },)
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/entering/status/change`),
+      method: 'post',
+      data: data,
+      description: '变更随访状态',
+    })
+  })
+
 }
 export const getEnteringInfo = (patientId, fuPlanPatientTimesId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/entering/${patientId}/fuInfo/${fuPlanPatientTimesId}`),
-    method: 'get',
-    // params: params,
-    description: '随访单条信息查看',
-  },)
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/entering/${patientId}/fuInfo/${fuPlanPatientTimesId}`),
+      method: 'get',
+      // params: params,
+      description: '随访单条信息查看',
+    },)
+  })
+
 }
 export const getFormList = (planTimesId) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/entering/scale/${planTimesId}/list`),
-    method: 'get',
-    // params: params,
-    description: '获取量表列表',
-  },)
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/entering/scale/${planTimesId}/list`),
+      method: 'get',
+      // params: params,
+      description: '获取量表列表',
+    },)
+  })
+
 }
 
 //获取新建计划居民列表
 export const getPlanPatientsList = (data) =>{
-  return fetch({
-    headers:{
-      sysCode: 9
-    },
-    url: getFollowUpSC(`/healths/patients/infolist`),
-    method: 'post',
-    data: data,
-    description: '获取新建计划居民列表',
-  },)
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers:{
+        sysCode: 9,
+        hospitalAuth:true
+      },
+      url: getFollowUpSC(`/healths/patients/infolist`),
+      method: 'post',
+      data: data,
+      description: '获取新建计划居民列表',
+    },)
+  })
+
 }
 
 // 获取随访计划模板列表
 export const getFollowupTemplate = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/templets`),
-    method: 'get',
-    data: data,
-    description: '获取随访计划模板列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/templets`),
+      method: 'get',
+      data: data,
+      description: '获取随访计划模板列表',
+    })
   })
+
 }
 
 // 获取随访量表固定模板
 export const getFollowupTableTemplate = (id) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans/templets/${id}`),
-    method: 'get',
-    data: {},
-    description: '获取随访量表固定模板',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/plans/templets/${id}`),
+      method: 'get',
+      data: {},
+      description: '获取随访量表固定模板',
+    })
   })
+
 }
 
 // 获取量表列表
 export const getFormOptions = (data)=>{
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/entering/scale/list`),
-    method: 'get',
-    data: data,
-    description: '获取量表列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/followup/entering/scale/list`),
+      method: 'get',
+      data: data,
+      description: '获取量表列表',
+    })
   })
+
 }
 
 /*常量*/
 export const getBasicData = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/basic-data/constants/`),
-    method: 'get',
-    params: params,
-    description: '获取常量',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/basic-data/constants/`),
+      method: 'get',
+      params: params,
+      description: '获取常量',
+    })
   })
+
 };
 
 // 获取所有漫画列表
 export const getAllEducationComtent = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/healths/comtent/workstation/list`),
-    method: 'post',
-    data: data,
-    description: '获取所有漫画列表'
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/healths/comtent/workstation/list`),
+      method: 'post',
+      data: data,
+      description: '获取所有漫画列表'
+    })
   })
+
 }
 
 // 获取所有疾病
 export const getAllDiseases = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/healths/patients/diseases/-1`),
-    method: 'get',
-    params: params,
-    description: '获取所有疾病',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/healths/patients/diseases/-1`),
+      method: 'get',
+      params: params,
+      description: '获取所有疾病',
+    })
   })
+
 }
 
 // 获取所有分组
 export const getAllLabels = (params) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/healths/labels/`),
-    method: 'get',
-    params: params,
-    description: '获取所有分组',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getFollowUpSC(`/healths/labels/`),
+      method: 'get',
+      params: params,
+      description: '获取所有分组',
+    })
   })
+
 }
 
 // 获取微信和短信病人数接口
 export const getPatientNumber = (data) => {
-  return fetch({
-    headers: {
-      sysCode: 9
-    },
-    url: getFollowUpSC(`/healths/patientEducation/getSendPatientTypeNum`),
-    method: 'post',
-    data: data,
-    description: '获取微信和短信病人数接口',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers: {
+        sysCode: 9,
+        hospitalAuth:true
+      },
+      url: getFollowUpSC(`/healths/patientEducation/getSendPatientTypeNum`),
+      method: 'post',
+      data: data,
+      description: '获取微信和短信病人数接口',
+    })
   })
+
 }
 
 
@@ -347,6 +443,9 @@ export const getPatientNumber = (data) => {
 export const getDomain = (data) => {
   return fetch({
     url: getFollowUpSC(`/followup/route/domain?type=1`),
+    headers:{
+      hospitalAuth:true
+    },
     method: 'get',
     data: {},
   })
@@ -356,6 +455,9 @@ export const getDomain = (data) => {
 export const getScaleModels = (domain,scaleNo) => {
   return fetch({
     url: `${domain}/scale/${scaleNo}/models`,
+    headers:{
+      hospitalAuth:true
+    },
     method: 'get',
     data: {},
   })
@@ -365,6 +467,9 @@ export const getScaleModels = (domain,scaleNo) => {
 export const getScaleDetail = (domain,planPatientsTimesId,scaleNo) => {
   return fetch({
     url: `${domain}/scale/${planPatientsTimesId}/${scaleNo}/info?type=2&isLine=2`,
+    headers:{
+      hospitalAuth:true
+    },
     method: 'get',
     data: {},
   })
@@ -374,6 +479,9 @@ export const getScaleDetail = (domain,planPatientsTimesId,scaleNo) => {
 export const postScale = ( domain,data ) => {
   return fetch({
     url: `${domain}/scale/save`,
+    headers:{
+      hospitalAuth:true
+    },
     method: 'post',
     data: JSON.stringify(data),
   })
@@ -383,6 +491,9 @@ export const postScale = ( domain,data ) => {
 export const updateScalesStatus = ( data ) => {
   return fetch({
     url: getFollowUpSC(`/followup/entering/scale/updateScalesStatus`),
+    headers:{
+      hospitalAuth:true
+    },
     method: 'post',
     data: data,
   })

src/utils/followup/followupUtils/index.js

 import dataConverter from './dataConverter';
+import fetch from '@/utils/fetch';
+import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
+import Vue from 'vue';
+
+function getSaasHost(){
+  var host;
+  if(location.host.indexOf('dev-work')>-1 || location.host.indexOf('localhost')>-1){
+    host = 'https://dev-saas.yunqueyi.com'
+  }else if(location.host.indexOf('test1-work')>-1){
+    host = 'https://test1.yunqueyi.com'
+  }else if(location.host.indexOf('uat-work')>-1){
+    host = 'https://uat.yunqueyi.com'
+  }else{
+    host = 'https://www.yunqueyi.com'
+  }
+  return host
+}
+
+function getWsHost(){
+  var host;
+  if(location.host.indexOf('dev-work')>-1 || location.host.indexOf('localhost')>-1){
+    host = 'https://dev-ws.yunqueyi.com'
+  }else if(location.host.indexOf('test1-work')>-1){
+    host = 'https://test1-ws.yunqueyi.com'
+  }else if(location.host.indexOf('uat-work')>-1){
+    host = 'https://uat-ws.yunqueyi.com'
+  }else{
+    host = 'https://ws.yunqueyi.com'
+  }
+  return host
+}
+
+const alertMessage = (msg, confirmButtonText, cancelButtonText, callback) => {
+  Vue.prototype.$confirm(msg, '提醒', {
+    confirmButtonText: confirmButtonText,
+    cancelButtonText: cancelButtonText,
+  }).then(() => {
+    callback();
+  }).catch(() => {
+    // 关闭弹窗
+  });
+}
 
 export default {
   DC: dataConverter,
+  checkAuth: (callback) => {
+    return new Promise((resolve, reject) => {
+      fetch({
+        headers: {
+          token: localStorage.getItem('storageToken')
+        },
+        url: getBaseUrl(`/healths/doctor/hospitalAuth`),
+        method: 'get',
+        description: '检查用户的机构权限',
+      }).then(res => {
+        // 1、未加入 2、审核中 3、加入成功
+        // res.data = 2
+        if (res.code == '000000') {
+          if (res.data == 1) {
+            // 点击 去加入,进入加入机构流程
+            alertMessage('您当前暂无机构，无法使用居民管理、随访管理和群发消息等功能，请在加入机构后重试。','去加入','暂不加入', ()=>{
+              location.href = getSaasHost() + '/pica-base/pica_join.html'
+            })
+            // return new Promise((resolve, reject) => {
+            // })
+          } else if (res.data == 2) {
+            alertMessage('您创建的机构正在审核中，暂无法使用居民管理、随访管理和群发消息等功能，请在审核通过后重试。','查看审核','取消', ()=>{
+              location.href = getWsHost() + '/outside/status?tk=' + localStorage.getItem('storageToken')
+            })
+            // return new Promise((resolve, reject) => {
+            // })
+          } else if (res.data == 3) {
+            return callback
+          }
+        }
+      })
+    })
+  }
 };

src/utils/patients/patientsapi.js

 import fetch from '../fetch';
 import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
-
+import utils from '@/utils/followup/followupUtils';
+// const utils.checkAuth = (callback) => {
+//   return new Promise((resolve, reject) => {
+//     fetch({
+//       headers: {
+//         token: localStorage.getItem('storageToken')
+//       },
+//       url: getBaseUrl(`/healths/doctor/hospitalAuth`),
+//       method: 'get',
+//       description: '检查用户的机构权限',
+//     }).then(res => {
+//       // res.data =1
+//       if (res.code == '000000') {
+//         // 1、未加入 2、审核中 3、加入成功
+//         if (res.data == 1) {
+//           return new Promise((resolve, reject) => {
+//           })
+//         } else if (res.data == 2) {
+//           return new Promise((resolve, reject) => {
+//           })
+//         } else if (res.data == 3) {
+//           return callback
+//         }
+//       }
+//     })
+//   })
+// }
 
 const headers = {
-  sysCode: 9
+  sysCode: 9,
+  hospitalAuth:true
 }
 
 /*常量API*/
 export const getConstants = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`basic-data/constants/`),
-    method: 'get',
-    params: params,
-    description: '获取常量',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`basic-data/constants/`),
+      method: 'get',
+      params: params,
+      description: '获取常量',
+    })
   })
 };
 /*获取省市县乡列表*/
 export const getProvinceList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`basic-data/position/provinces`),
-    method: 'get',
-    params: params,
-    description: '获取省列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`basic-data/position/provinces`),
+      method: 'get',
+      params: params,
+      description: '获取省列表',
+    })
   })
 };
 export const getCityList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`basic-data/position/cities`),
-    method: 'get',
-    params: params,
-    description: '获取市列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`basic-data/position/cities`),
+      method: 'get',
+      params: params,
+      description: '获取市列表',
+    })
   })
 };
 export const getCountyList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`basic-data/position/counties`),
-    method: 'get',
-    params: params,
-    description: '获取区县列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`basic-data/position/counties`),
+      method: 'get',
+      params: params,
+      description: '获取区县列表',
+    })
   })
 };
 export const getTownList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`basic-data/position/towns`),
-    method: 'get',
-    params: params,
-    description: '获取乡镇列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`basic-data/position/towns`),
+      method: 'get',
+      params: params,
+      description: '获取乡镇列表',
+    })
   })
 };
 /*居民管理*/
 export const getPatientList = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/infolist`),
-    method: 'post',
-    data: data,
-    description: '获取居民列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/infolist`),
+      method: 'post',
+      data: data,
+      description: '获取居民列表',
+    })
   })
 };
 export const getDiseasesList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/diseases/-1`),
-    method: 'get',
-    params: params,
-    description: '获取所有疾病',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/diseases/-1`),
+      method: 'get',
+      params: params,
+      description: '获取所有疾病',
+    })
   })
 };
 
 // 新增居民
 export const getQRCode = data => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/qrcodes/get`),
-    method: 'post',
-    data: data,
-    description: '获取二维码',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/qrcodes/get`),
+      method: 'post',
+      data: data,
+      description: '获取二维码',
+    })
   })
 }
 
 export const getUploadHistory = params => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/docImpPat/import/records`),
-    method: 'get',
-    params: params,
-    description: '获取上传历史记录',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/docImpPat/import/records`),
+      method: 'get',
+      params: params,
+      description: '获取上传历史记录',
+    })
   })
 }
 
 export const refreshCode = data => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/qrcodes/refresh`),
-    method: 'post',
-    data: data,
-    description: '刷新二维码有效期',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/qrcodes/refresh`),
+      method: 'post',
+      data: data,
+      description: '刷新二维码有效期',
+    })
   })
 }
 
 export const getLabelsInfo = params => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/qrcodes/getLabelsInfo`),
-    method: 'get',
-    params: params,
-    description: '获取分组信息',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/qrcodes/getLabelsInfo`),
+      method: 'get',
+      params: params,
+      description: '获取分组信息',
+    })
   })
 }
 
 export const downloadQRCode = data => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/qrcodes/shareUrl`),
-    method: 'post',
-    data: data,
-    description: '下载二维码',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/qrcodes/shareUrl`),
+      method: 'post',
+      data: data,
+      description: '下载二维码',
+    })
   })
 }
 
 export const uploadExcel = data => {
-  return fetch({
-    headers: {
-      noSysCode: true,
-    },
-    url: getSaasDomain('web/patientManages/import'),
-    method: 'post',
-    data: data,
-    description: '上传excel文件',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers: {
+        noSysCode: true,
+        hospitalAuth:true
+      },
+      url: getSaasDomain('web/patientManages/import'),
+      method: 'post',
+      data: data,
+      description: '上传excel文件',
+    })
   })
 }
 
 // 分组管理
 export const getLabelList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/labels/`),
-    method: 'get',
-    params: params,
-    description: '获取分组列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/labels/`),
+      method: 'get',
+      params: params,
+      description: '获取分组列表',
+    })
   })
 }
 
 export const createNewLabel = (data) => {
-  return fetch({
-    url: getBaseUrl(`healths/labels/`),
-    headers: {
-      "Content-Type": 'application/json'
-    },
-    method: 'post',
-    data: data,
-    description: '新增分组',
+  return utils.checkAuth(()=>{
+    return fetch({
+      url: getBaseUrl(`healths/labels/`),
+      headers: {
+        "Content-Type": 'application/json',
+        hospitalAuth:true
+      },
+      method: 'post',
+      data: data,
+      description: '新增分组',
+    })
   })
 }
 
 export const changeLabelName = (data) => {
-  return fetch({
-    url: getBaseUrl(`healths/labels/`),
-    // headers: {
-    //   "Content-Type": 'application/json'
-    // },
-    method: 'put',
-    data: data,
-    description: '修改分组名',
+  return utils.checkAuth(()=>{
+    return fetch({
+      url: getBaseUrl(`healths/labels/`),
+      headers,
+      method: 'put',
+      data: data,
+      description: '修改分组名',
+    })
   })
 }
 
 export const getLabelDetail = (labelId, params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/labels/v2/${labelId}/patients`),
-    method: 'get',
-    params: params,
-    description: '获取分组详情',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/labels/v2/${labelId}/patients`),
+      method: 'get',
+      params: params,
+      description: '获取分组详情',
+    })
   })
 }
 
 export const deleteCurrentLabel = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/labels/`),
-    method: 'delete',
-    data: data,
-    description: '删除分组',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/labels/`),
+      method: 'delete',
+      data: data,
+      description: '删除分组',
+    })
   })
 }
 
 export const deleteCurrentPatients = data => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/labels/patients`),
-    method: 'delete',
-    data: data,
-    description: '删除分组下的居民',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/labels/patients`),
+      method: 'delete',
+      data: data,
+      description: '删除分组下的居民',
+    })
   })
+
 }
 
 export const saveLabelsForPatient = (labelId, data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/labels/v2/${labelId}/patients`),
-    method: 'post',
-    data: data,
-    description: '分组中添加居民',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/labels/v2/${labelId}/patients`),
+      method: 'post',
+      data: data,
+      description: '分组中添加居民',
+    })
   })
+
 }
 
 // 获取七牛上传token
 export const getQiniuToken = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`file/image/token`),
-    method: 'get',
-    params: params,
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`file/image/token`),
+      method: 'get',
+      params: params,
+    })
   })
+
 };
 
 // 意见反馈 getSaasApiDomain
 export const submitFeedback = (data) => {
-  return fetch({
-    headers: {
-      noSysCode: true,
-      "Content-Type": 'application/json'
-    },
-    url: getSaasApiDomain(`web/companys/feedback`),
-    method: 'post',
-    data: data,
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers: {
+        hospitalAuth:true,
+        noSysCode: true,
+        "Content-Type": 'application/json'
+      },
+      url: getSaasApiDomain(`web/companys/feedback`),
+      method: 'post',
+      data: data,
+    })
   })
+
 };
 
 /*资料不全居民*/
 export const getNotCompleteList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/uncomplate/${params.pageNo}/${params.pageSize}`),
-    method: 'get',
-    description: '获取资料不全居民列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/uncomplate/${params.pageNo}/${params.pageSize}`),
+      method: 'get',
+      description: '获取资料不全居民列表',
+    })
   })
+
 };
 export const sendCompleteMessage = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/remind`),
-    method: 'post',
-    data: data,
-    description: '提醒居民完善信息',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/remind`),
+      method: 'post',
+      data: data,
+      description: '提醒居民完善信息',
+    })
   })
+
 };
 export const sendCompleteMessageList = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/list/remind`),
-    method: 'post',
-    data: data,
-    description: '批量提醒居民完善信息',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/list/remind`),
+      method: 'post',
+      data: data,
+      description: '批量提醒居民完善信息',
+    })
   })
+
 };
 export const getNotCompleteCount = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/uncomplate/counts`),
-    method: 'get',
-    params: params,
-    description: '获取未完善居民人数',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/uncomplate/counts`),
+      method: 'get',
+      params: params,
+      description: '获取未完善居民人数',
+    })
   })
+
 };
 export const getRedNum = (params) => {
+  // 这个方法暂不做权限校验
   return fetch({
     headers,
     url: getBaseUrl(`healths/patients/uncompleted/last/counts`),
@@ -280,66 +369,87 @@ export const getRedNum = (params) => {
   })
 };
 export const getPatientDetail = (patientId) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/${patientId}`),
-    method: 'get',
-    // params: params,
-    description: '获取居民详情',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/${patientId}`),
+      method: 'get',
+      // params: params,
+      description: '获取居民详情',
+    })
   })
+
 };
 export const deletePatient = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/batch`),
-    method: 'delete',
-    data: data,
-    description: '删除居民',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/batch`),
+      method: 'delete',
+      data: data,
+      description: '删除居民',
+    })
   })
+
 };
 export const getRemindPatient = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/remind`),
-    method: 'post',
-    data: data,
-    description: '提醒居民绑定微信',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/remind`),
+      method: 'post',
+      data: data,
+      description: '提醒居民绑定微信',
+    })
   })
+
 };
 export const savePatientInfo = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/update`),
-    method: 'post',
-    data: data,
-    description: '保存居民信息',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/update`),
+      method: 'post',
+      data: data,
+      description: '保存居民信息',
+    })
   })
+
 };
 export const getNationsList = (params) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`resident/constants/nations`),
-    method: 'get',
-    params: params,
-    description: '获取56个民族列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`resident/constants/nations`),
+      method: 'get',
+      params: params,
+      description: '获取56个民族列表',
+    })
   })
+
 };
 export const getHealthRecordList = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`followup/entering/health/records`),
-    method: 'post',
-    data: data,
-    description: '健康档案记录列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`followup/entering/health/records`),
+      method: 'post',
+      data: data,
+      description: '健康档案记录列表',
+    })
   })
+
 };
 /*新的获取居民接口，搜索条件有变化*/
 export const getPatientInfoList = (data) => {
-  return fetch({
-    headers,
-    url: getBaseUrl(`healths/patients/v2/infolist`),
-    method: 'post',
-    data: data,
-    description: '获取居民列表',
+  return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url: getBaseUrl(`healths/patients/v2/infolist`),
+      method: 'post',
+      data: data,
+      description: '获取居民列表',
+    })
   })
+
 };