Merge branch 'lmm' into develop

src/app/views/quick-combination/quick-combination.component.ts

@@ -646,10 +646,7 @@ export class QuickCombinationComponent implements OnInit {
     if (!flag) {
       return;
     }
-    let hosIds = "";
-    if (this.userInfo.infoPermission.hospitals.length > 0) {
-      hosIds = this.userInfo.infoPermission.hospitals[0].id; //没考虑多院区，取第一个院区
-    }
+    let hosIds = this.currentHospital.id;
     let postData = {
       idx: 0,
       sum: 20,
@@ -721,14 +718,12 @@ export class QuickCombinationComponent implements OnInit {
       sum: this.pageSize,
     };
     if (this.searchCriteria.name) {
-      data["workAllocationQuickConfig"][
-        "configName"
-      ] = this.searchCriteria.name;
+      data["workAllocationQuickConfig"]["configName"] =
+        this.searchCriteria.name;
     }
     if (this.searchCriteria.workModel) {
-      data["workAllocationQuickConfig"][
-        "ruleType"
-      ] = this.searchCriteria.workModel;
+      data["workAllocationQuickConfig"]["ruleType"] =
+        this.searchCriteria.workModel;
     }
     this.loading1 = true;
     this.mainService