Merge branch 'dev-optimization-1223' into 'release'

code reviewer:  杨广俊：解决区域是单个的，并且degree是3或者4的

code reviewer:  杨广俊：解决区域是单个的，并且degree是3或者4的

See merge request !3

pages/index.vue

@@ -107,7 +107,8 @@ import {
   getGeneralExam,
   getProjectInfo,
   getGeneralExamList,
-  getStudyEffect
+  getStudyEffect,
+  getHospitalsByRegionId
 } from "@/service";
 
 import CommonHeader from "@/components/common/common-header";
@@ -391,15 +392,19 @@ export default {
           this.projectInfo = res.data;
           getProvinceList(params).then(res => {
             if (res.code === "000000") {
-              this.queryGDParams.regionId = (res.data && res.data.list[0] && res.data.list[0].id) || '';
-              this.CNTParams.regionId = (res.data && res.data.list[0] && res.data.list[0].id) || '';
+              let regionId = (res.data && res.data.list[0] && res.data.list[0].id) || '';
+              this.queryGDParams.regionId = regionId;
+              this.CNTParams.regionId = regionId;
               let proviceList = (res.data && res.data.list) || [];
-              let degree = (proviceList.length && proviceList[0].degree) || 0
-              this.setProvinceList(proviceList);
+              let degree = (proviceList.length && proviceList[0].degree) || 0;
+              this.queryParams.projectId = this.projectId;
+              this.queryParams.regionId = regionId;
+              this.getHospitalsByRegionId(this.queryParams);
+              // this.setProvinceList(proviceList);
               this.setAreaDegree(degree);
-              if( degree == 3 || degree == 4) {
-                this.isShowOrg = true;
-              }
+              // if( degree == 3 || degree == 4) {
+              //   this.isShowOrg = true;
+              // }
               this.getHospitalsCNT(this.CNTParams);
             }
           });
@@ -407,6 +412,15 @@ export default {
       });
     },
 
+    // 根据区域获取机构列表（一般在是三、四级区域才调用此方法）
+    async getHospitalsByRegionId(params) {
+      await getHospitalsByRegionId(params).then(res => {
+        if (res.code === "000000") {
+          this.setOrgList(res.data.list || []);
+        }
+      });
+    },
+
     // 异步延迟调用其它Tabs接口（除了数据概述）
     otherInterface() {
       setTimeout(() => {
@@ -705,6 +719,7 @@ export default {
 
     // 映射Store中的Actions
     ...mapActions({
+      setOrgList: "setOrgList",
       setProjectId: "setProjectId",
       setRegionId: "setRegionId",
       setUserToken: "setUserToken",