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

# Conflicts:
#	src/style/patient-manager/new-patient/new-patient.less

src/utils/followup/followupUtils/index.js

@@ -46,7 +46,7 @@ export default {
   DC: dataConverter,
   checkAuth: (callback) => {
     return new Promise((resolve, reject) => {
-      fetch({
+      resolve(fetch({
         headers: {
           token: localStorage.getItem('storageToken')
         },
@@ -62,8 +62,8 @@ export default {
             alertMessage('您当前暂无机构，无法使用居民管理、随访管理和群发消息等功能，请在加入机构后重试。','去加入','暂不加入', ()=>{
               location.href = getSaasHost() + '/pica-base/pica_join.html'
             })
-            // return new Promise((resolve, reject) => {
-            // })
+            return new Promise((resolve, reject) => {
+            })
           } else if (res.data == 2) {
             alertMessage('您创建的机构正在审核中，暂无法使用居民管理、随访管理和群发消息等功能，请在审核通过后重试。','查看审核','取消', ()=>{
               location.href = getWsHost() + '/outside/status?tk=' + localStorage.getItem('storageToken')
@@ -71,10 +71,15 @@ export default {
             // return new Promise((resolve, reject) => {
             // })
           } else if (res.data == 3) {
-            return callback
+            return callback()
+            // return new Promise((resolve, reject) => {
+            //   resolve(callback())
+            // })
+
           }
         }
-      })
+      }))
+
     })
   }
 };