Merge branch 'termMap0909' into test

src/components/cdssManage/dept/DeptManage.vue

@@ -262,7 +262,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 7,
         isMatch: this.filter.match
       };

src/components/cdssManage/disease/Disease.vue

@@ -260,7 +260,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         icdCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 4,
         isMatch: this.filter.match
       };
@@ -438,7 +438,7 @@ export default {
         this.$message({ message: '请根据模板进行导入', type: 'error' });
         return;
       }
-      e.preventDefault();
+      // e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);

src/components/cdssManage/drug/DrugManage.vue

@@ -260,7 +260,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 5,
         isMatch: this.filter.match
       };

src/components/cdssManage/fusion/Fusion.vue

@@ -258,7 +258,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 8,
         isMatch:this.filter.match
       };

src/components/cdssManage/lis/Lis.vue

@@ -264,7 +264,7 @@ export default {
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         hisDetailName: this.filter.hisDetailName.trim(),
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 1,
         isMatch: this.filter.match
       };

src/components/cdssManage/nursing/nursing.vue

@@ -258,7 +258,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 11,
         isMatch: this.filter.match
       };

src/components/cdssManage/operation/Operation.vue

@@ -265,7 +265,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 6,
         isMatch: this.filter.match
       };

src/components/cdssManage/pacs/Pacs.vue

@@ -258,7 +258,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 3,
         isMatch: this.filter.match
       };

src/components/cdssManage/scale/ScaleManage.vue

@@ -259,7 +259,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 10,
         isMatch: this.filter.match
       };

src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -265,7 +265,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 12,
         isMatch: this.filter.match
       };

src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -265,7 +265,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
+        hospitalId: (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 13,
         isMatch: this.filter.match
       };