支助人员统计修改，微信配置优化

src/app/share/excel-export/excel-export.component.html

@@ -15,8 +15,8 @@
       </div>
       <div class="isNumOrIntegral">
         <nz-radio-group [(ngModel)]="isNumOrIntegral">
-          <label nz-radio nzValue="A">按工单数量排序</label>
-          <label nz-radio nzValue="B">按积分排序</label>
+          <label nz-radio nzValue="byOrderNum">按工单数量排序</label>
+          <label nz-radio nzValue="byIntegral">按积分排序</label>
         </nz-radio-group>
       </div>
     </div>

src/app/share/excel-export/excel-export.component.ts

@@ -13,7 +13,7 @@ export class ExcelExportComponent implements OnInit {
   @Input() loading: boolean = false; //确定按钮的loading
   deptList = []; //护理单元科室列表
   isGroup = false; //是否按组导出
-  isNumOrIntegral = "A";
+  isNumOrIntegral = "byOrderNum";
   constructor() {}
 
   ngOnInit() {}
@@ -24,6 +24,5 @@ export class ExcelExportComponent implements OnInit {
   // 表单提交
   submitForm(): void {
     this.submitFormHand.emit({isGroup:this.isGroup,isNumOrIntegral:this.isNumOrIntegral});
-    this.hideModal();
   }
 }

src/app/views/wechat-config/wechat-config.component.ts

@@ -132,12 +132,10 @@ export class WechatConfigComponent implements OnInit {
                   this.validateForm.controls.defaultHospital.setValue(
                     config.hospital
                   );
-                  this.getDeptList(this.hosId, '',999).subscribe((result) => {
+                  this.mainService.getFetchData("data", "department", config.defaultDept).subscribe((result) => {
                     if (result.status == 200) {
-                      let item1 = this.deptList.find(v=>v.id == config.defaultDept);
-                      if(!item1){
-                        let item2 = result.list.find(v=>v.id == config.defaultDept);
-                        this.deptList.unshift(item2);
+                      if(result.data){
+                        this.deptList.unshift(result.data);
                       }
                       this.validateForm.controls.defaultDept.setValue(
                         config.defaultDept

src/app/views/worker-statistics/worker-statistics.component.ts

@@ -120,13 +120,24 @@ export class WorkerStatisticsComponent implements OnInit {
       groupId: this.group || "",
     };
     if (obj.isGroup) {
-      postData.byGroup = true;
+      postData.byGroup = "true";
+    }
+    switch (obj.isNumOrIntegral) {
+      case "byOrderNum":
+        //按工单数量排序
+        postData.byOrderNum = "true";
+        break;
+      case "byIntegral":
+        //按积分排序
+        postData.byIntegral = "true";
+        break;
     }
     this.loading2 = true;
     this.mainService.exportReport("user", postData).subscribe(
       (data) => {
         this.loading2 = false;
         this.showPromptModal("导出", true, "");
+        this.isShow = false;
         var file = new Blob([data], {
           type: "application/vnd.ms-excel",
         });