前端接口方法合并

src/app/services/main.service.ts

@@ -54,18 +54,6 @@ export class MainService {
       headers: this.headers,
     });
   }
-  // 列表搜索（get data）
-  getDataFetchData(type, id): any {
-    return this.http.get(host.host + "/data/fetchData/" + type + "/" + id, {
-      headers: this.headers,
-    });
-  }
-  // api 详情 -工单详情
-  getApiFetchData(type, id): any {
-    return this.http.get(host.host + "/api/fetchData/" + type + "/" + id, {
-      headers: this.headers,
-    });
-  }
   // 列表搜索（通用）
   getFetchDataList(type, target, data): any {
     return this.http.post(
@@ -115,42 +103,16 @@ export class MainService {
     });
   }
 
-  // 查询所有数据
-  findAllDataList(type): any {
-    return this.http.post(
-      host.host + "/data/findAll/" + type,
-      {},
-      { headers: this.headers }
-    );
-  }
-
   // 权限相关
   getPermission(type): any {
     return this.http.get(host.host + "/permission/roleMenu/" + type, {
       headers: this.headers,
     });
   }
-
-  //科室详情
-  getOfficeDetail(id): any {
-    return this.http.get(host.host + "/data/fetchData/department/" + id, {
-      headers: this.headers,
-    });
-  }
-
   // fetchData查看详情
-  getFetchData(type, info, id?): any {
-    let url = id
-      ? host.host + "/" + type + "/fetchData/" + info + "/" + id
-      : host.host + "/" + type + "/fetchData/" + info;
-    return this.http.get(url, { headers: this.headers });
-  }
-
-  // 获取楼栋信息/楼层信息
-  getBuildingOrFloor(type, data): any {
-    return this.http.post(
-      host.host + "/data/getBuildingOrFloor/" + type,
-      data,
+  getFetchData(type, info, id): any {
+    return this.http.get(
+      host.host + "/" + type + "/fetchData/" + info + "/" + id,
       { headers: this.headers }
     );
   }
@@ -274,18 +236,6 @@ export class MainService {
       headers: this.headers,
     });
   }
-  //药房端药房列表查询、搜索接口
-  getPharmacyList(idx, type, searchKey, launch) {
-    return this.http.post(
-      host.host + "/api/fetchDataList/drugsBag",
-      {
-        idx: idx,
-        sum: 10,
-        drugsBag: { searchType: type, searchKey: searchKey, launch: launch },
-      },
-      { headers: this.headers }
-    );
-  }
   //药房端打印二维码的接口
   printRequisition(idArr) {
     return this.http.post(host.host + "/drugsBag/printRequisition", idArr, {
@@ -366,12 +316,6 @@ export class MainService {
       { headers: this.headers }
     );
   }
-  //护士端关注接口
-  changeFollow(data) {
-    return this.http.post(host.host + "/nurse/updData/patient", data, {
-      headers: this.headers,
-    });
-  }
   //数据字典楼栋保存接口
   saveBuildingList(data) {
     return this.http.post(
@@ -398,14 +342,6 @@ export class MainService {
       headers: this.headers,
     });
   }
-  //获取患者最近一条检查信息
-  getRecentInfo(data) {
-    return this.http.post(
-      host.host + "/nurse/workOrder/findInspectRecently",
-      data,
-      { headers: this.headers }
-    );
-  }
   //simple增删改查,addData新增,addListData批量新增
   simplePost(coop, type, data): any {
     return this.http.post(
@@ -414,12 +350,6 @@ export class MainService {
       { headers: this.headers }
     );
   }
-  //任务类型列表排序
-  sortTaskType(data): any {
-    return this.http.post(host.host + "/configuration/setOrders", data, {
-      headers: this.headers,
-    });
-  }
   //获取工单详情里的历史记录
   getWorkOrderRecord(data): any {
     return this.http.post(host.host + "/workerOrder/getWorkOrderRecord", data, {
@@ -468,14 +398,6 @@ export class MainService {
       { headers: this.headers }
     );
   }
-  //获取配置文件的接口
-  systemConfiguration(data) {
-    return this.http.post(
-      host.host + "/simple/data/fetchDataList/systemConfiguration",
-      data,
-      { headers: this.headers }
-    );
-  }
   //检查信息,患者信息
   listMsgByMain(type, data) {
     return this.http.post(host.host + "/nurse/" + type, data, {
@@ -490,18 +412,6 @@ export class MainService {
       { headers: this.headers }
     );
   }
-  //护士端获取综合日志
-  listDeptOrderRecord(data) {
-    return this.http.post(host.host + "/nurse/listDeptOrderRecord", data, {
-      headers: this.headers,
-    });
-  }
-  //自动同步国家法定节假日
-  syncWorkDay(data) {
-    return this.http.post(host.host + "/configuration/syncWorkDay", data, {
-      headers: this.headers,
-    });
-  }
   //删除用户（包含企业微信用户）
   rmvDataAndWeChatNum(data, flag) {
     return this.http.post(

src/app/share/detail-drug/detail-drug.component.ts

@@ -60,7 +60,7 @@ export class DetailDrugComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.getApiFetchData("workOrder", this.id);
+    return this.mainService.getFetchData("api", "workOrder", this.id);
   }
 
   // 关闭弹框

src/app/share/detail-others/detail-others.component.ts

@@ -59,7 +59,7 @@ export class DetailOthersComponent implements OnInit {
       this.orderInfo = res[1]["data"];
       this.endDepts = res[1]["data"].endDepts
         .map((item) =>
-          (!this.showCoop && this.deptDisplay == 2) ? item.deptalias : item.dept
+          !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept
         )
         .join();
     });
@@ -67,7 +67,7 @@ export class DetailOthersComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.getApiFetchData("workOrder", this.id);
+    return this.mainService.getFetchData("api", "workOrder", this.id);
   }
 
   // 确认加急

src/app/share/detail-patients/detail-patients.component.ts

@@ -80,10 +80,9 @@ export class DetailPatientsComponent implements OnInit {
         this.orderInfo["yyTime"] = "";
       }
       if (res[1]["data"].middleDept) {
-        this.middleDept = res[1]["data"].middleDept
-          .map((item) =>
-            !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept
-          );
+        this.middleDept = res[1]["data"].middleDept.map((item) =>
+          !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept
+        );
       } else {
         this.middleDept = [];
       }
@@ -92,7 +91,7 @@ export class DetailPatientsComponent implements OnInit {
   // 获取工单详情
   middleDept = []; //中间科室数组
   getDetail() {
-    return this.mainService.getApiFetchData("workOrder", this.id);
+    return this.mainService.getFetchData("api", "workOrder", this.id);
   }
   // 获取工单历史记录
   logList = []; //工单历史记录

src/app/share/detail-sample/detail-sample.component.ts

@@ -66,7 +66,7 @@ export class DetailSampleComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.getApiFetchData("workOrder", this.id);
+    return this.mainService.getFetchData("api", "workOrder", this.id);
   }
 
   // 确认加急

src/app/share/order-detail/order-detail.component.ts

@@ -1,90 +1,121 @@
-import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { FormBuilder, Validators, FormGroup, FormControl } from '@angular/forms';
-import { MainService } from '../../services/main.service';
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
-import { NzMessageService } from 'ng-zorro-antd';
-import { forkJoin } from 'rxjs';
+import { Component, OnInit, OnDestroy, ViewChild } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { NzMessageService } from "ng-zorro-antd";
+import { forkJoin } from "rxjs";
 @Component({
-  selector: 'app-order-detail',
-  templateUrl: './order-detail.component.html',
-  styleUrls: ['./order-detail.component.less']
+  selector: "app-order-detail",
+  templateUrl: "./order-detail.component.html",
+  styleUrls: ["./order-detail.component.less"],
 })
 export class OrderDetailComponent implements OnInit {
-  @ViewChild('osComponentRef1', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef1: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef2', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef2: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef3', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef3: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef4', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef4: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef5', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef5: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef6', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef6", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef6: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef7', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef7", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef7: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef8', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef8", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef8: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private fb: FormBuilder,
     private route: ActivatedRoute,
-    private mainService: MainService,
-  ) { }
+    private mainService: MainService
+  ) {}
   maskFlag: any = false;
-  id: number;//工单id
-  orderInfo: any;//工单详情信息
-  endDepts = '';//工单详情目标科室
-  showCoop: boolean = true;//是否展示详情页操作按钮
-
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  previewImage: string;//操作结果图片预览
-  promptModalShow: boolean;//是否展示提示框
-  promptModalShowImg: boolean;//是否展示提示框-图片
-
-  urgentLoading: boolean = false;//确认加急按钮loading状态
-  recLoading: boolean = false;//撤回并删除按钮loading状态
-  btnLoading: boolean = false;//确认按钮loading状态
-
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  endDepts = ""; //工单详情目标科室
+  showCoop: boolean = true; //是否展示详情页操作按钮
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  previewImage: string; //操作结果图片预览
+  promptModalShow: boolean; //是否展示提示框
+  promptModalShowImg: boolean; //是否展示提示框-图片
+
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
 
   ngOnInit() {
     this.tabType = this.route.snapshot.params.type || 1;
-    this.getInfo()
-    this.initForm()
-  }
-  ngOnDestroy() {
+    this.getInfo();
+    this.initForm();
   }
+  ngOnDestroy() {}
 
   // 获取工单详情
-  middleDept = [];//中间科室数组
+  middleDept = []; //中间科室数组
   getInfo() {
-    this.id = +this.route.snapshot.paramMap.get('id');
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    this.mainService.getApiFetchData('workOrder', this.id).subscribe(data => {
-      this.orderInfo = data.data;
-      if (data.data.middleDept) {
-        this.middleDept = data.data.middleDept.map(item => item.dept);
-      } else {
-        this.middleDept = [];
-      }
-      this.endDepts = data.data.endDepts.map(item => item.dept).join();
-      let log$ = this.getLog();
-      let record$ = this.getWorkOrderRecord();
-      forkJoin(log$, record$).subscribe(res => {
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-        // getLog
-        this.logList = res[0]['data'];
-        // getWorkOrderRecord
-        if (res[1]['status'] == 200) {
-          this.workOrderRecord = res[1]['data'];
+    this.id = +this.route.snapshot.paramMap.get("id");
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("api", "workOrder", this.id)
+      .subscribe((data) => {
+        this.orderInfo = data.data;
+        if (data.data.middleDept) {
+          this.middleDept = data.data.middleDept.map((item) => item.dept);
+        } else {
+          this.middleDept = [];
         }
-      })
-    })
+        this.endDepts = data.data.endDepts.map((item) => item.dept).join();
+        let log$ = this.getLog();
+        let record$ = this.getWorkOrderRecord();
+        forkJoin(log$, record$).subscribe((res) => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          // getLog
+          this.logList = res[0]["data"];
+          // getWorkOrderRecord
+          if (res[1]["status"] == 200) {
+            this.workOrderRecord = res[1]["data"];
+          }
+        });
+      });
   }
   // 预览图片
   previewImageHandler(token) {
@@ -93,10 +124,10 @@ export class OrderDetailComponent implements OnInit {
   // 获取历史记录
   workOrderRecord: any = [];
   getWorkOrderRecord() {
-    return this.mainService.getWorkOrderRecord({ "gdid": this.id });
+    return this.mainService.getWorkOrderRecord({ gdid: this.id });
   }
   // 切换tab栏
-  tabType: number = 1;//tab栏
+  tabType: number = 1; //tab栏
   checkTab(type) {
     this.tabType = type;
   }
@@ -110,19 +141,19 @@ export class OrderDetailComponent implements OnInit {
   }
 
   // 获取工单历史记录
-  logList = [];//工单历史记录
+  logList = []; //工单历史记录
   getLog() {
     return this.mainService.getWorkOrderLog(this.id);
   }
 
   // 初始化新增form表单
-  validateForm: FormGroup;//新增/编辑表单
+  validateForm: FormGroup; //新增/编辑表单
   initForm() {
     this.validateForm = this.fb.group({
       reason: [null, [Validators.required]],
       process: [null, [Validators.required]],
       handleType: [null, [Validators.required]],
-      improve: [null, [Validators.required]]
+      improve: [null, [Validators.required]],
     });
   }
 
@@ -142,41 +173,38 @@ export class OrderDetailComponent implements OnInit {
         mediationProcess: that.validateForm.value.process,
         handleType: { id: that.validateForm.value.handleType },
         advice: that.validateForm.value.improve,
-        handleStatus: { key: "bad_evaluation_handle_status", value: "2" }
-      }
-    }
-
-    that.mainService.postCustom('adviceCollection', 'updData/badEvaluationHandle', postData).subscribe(data => {
-      that.btnLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal('调解', true, '');
-        that.getInfo()
-        // that.initForm();
-      } else {
-        that.showPromptModal('调解', false, data.msg);
-      }
-    })
-
-
+        handleStatus: { key: "bad_evaluation_handle_status", value: "2" },
+      },
+    };
+
+    that.mainService
+      .postCustom("adviceCollection", "updData/badEvaluationHandle", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("调解", true, "");
+          that.getInfo();
+          // that.initForm();
+        } else {
+          that.showPromptModal("调解", false, data.msg);
+        }
+      });
   }
 
-
-
-
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?, previewImage?) {
     this.promptModalShow = false;
     this.promptContent = con;
     this.ifSuccess = success;
     this.promptInfo = promptInfo;
-    this.previewImage = previewImage ? previewImage : '';
+    this.previewImage = previewImage ? previewImage : "";
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
   }
   showPromptModalImg(previewImage) {
     this.promptModalShowImg = false;
-    this.previewImage = previewImage ? previewImage : '';
+    this.previewImage = previewImage ? previewImage : "";
     setTimeout(() => {
       this.promptModalShowImg = true;
     }, 100);
@@ -185,19 +213,19 @@ export class OrderDetailComponent implements OnInit {
   // 格式化时分秒
   // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
   formatTime(time) {
-    let timeStr = '';
+    let timeStr = "";
     if (time >= 0 && time < 60) {
       // 秒
-      timeStr = time + '秒';
+      timeStr = time + "秒";
     } else if (time >= 60 && time < 3600) {
       // 分钟
-      timeStr = Math.floor(time / 60) + '分钟'
+      timeStr = Math.floor(time / 60) + "分钟";
     } else if (time >= 3600) {
       // 时 + 分
-      let h = '';
-      let m = '';
-      h = Math.floor(time / 3600) + '小时';
-      m = (time % 3600) >= 60 ? Math.floor((time % 3600) / 60) + '分钟' : '';
+      let h = "";
+      let m = "";
+      h = Math.floor(time / 3600) + "小时";
+      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
       timeStr = h + m;
     }
     return timeStr;
@@ -207,7 +235,7 @@ export class OrderDetailComponent implements OnInit {
   filterTime(step) {
     // step = [{ difTime: 2 }, { difTime: 6 }]
     let num = 0;
-    step.forEach(e => {
+    step.forEach((e) => {
       num += e.difTime;
     });
     return this.formatTime(num / 1000);

src/app/views/fuwutai/fuwutai.component.ts

@@ -174,7 +174,7 @@ export class FuwutaiComponent implements OnInit {
     }
     this.bLoading = true;
     this.mainService
-      .getBuildingOrFloor("building", postData)
+      .coopData("getBuildingOrFloor", "building", postData)
       .subscribe((result) => {
         this.bLoading = false;
         if (result.status == 200) {
@@ -1220,7 +1220,9 @@ export class FuwutaiComponent implements OnInit {
       },
     };
     this.patientLogTasktypeLoading = true;
-    return this.mainService.systemConfiguration(postData).toPromise();
+    return this.mainService
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
+      .toPromise();
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房

src/app/views/holidays-management/holidays-management.component.ts

@@ -53,7 +53,7 @@ export class HolidaysManagementComponent implements OnInit {
     this.syncWorkDayObj.valueconfig = Number(e);
     let postData = { syncWorkDay: JSON.stringify(this.syncWorkDayObj) };
     this.maskFlag = this.msg.loading("加载中", { nzDuration: 0 }).messageId;
-    this.mainService.syncWorkDay(postData).subscribe((result) => {
+    this.mainService.coopConfig("syncWorkDay", postData).subscribe((result) => {
       this.msg.remove(this.maskFlag);
       this.maskFlag = false;
       if (result["state"] == 200) {

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

@@ -48,7 +48,7 @@ export class HospitalConfigComponent implements OnInit {
   }
   // 根据科室id查科室
   getDeptById(id) {
-    return this.mainService.getOfficeDetail(id);
+    return this.mainService.getFetchData("data", "department", id);
   }
   //初始化请求数据
   getInit() {

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -117,7 +117,9 @@ export class HushijiandanComponent implements OnInit {
               orders: i,
             };
           });
-          this.mainService.sortTaskType(postData).subscribe((result) => {});
+          this.mainService
+            .coopConfig("setOrders", postData)
+            .subscribe((result) => {});
         }, 500);
       },
     };
@@ -287,7 +289,7 @@ export class HushijiandanComponent implements OnInit {
   listDeptOrderRecord() {
     this.rLoading = true;
     this.mainService
-      .listDeptOrderRecord({ deptId: this.loginUserDeptId })
+      .listMsgByMain("listDeptOrderRecord", { deptId: this.loginUserDeptId })
       .subscribe((result) => {
         this.rLoading = false;
         if (result["status"] == 200) {
@@ -320,14 +322,16 @@ export class HushijiandanComponent implements OnInit {
     clearTimeout(this.recentInfoTimer);
     this.recentInfoTimer = setTimeout(() => {
       this.recentInfoNum++;
-      this.mainService.getRecentInfo({ patientCode }).subscribe((result) => {
-        this.recentInfoNum--;
-        if (result["status"] == 200 && this.recentInfoNum === 0) {
-          this.recentInfo = result["data"]["info"];
-        } else {
-          this.recentInfo = "";
-        }
-      });
+      this.mainService
+        .listMsgByMain("workOrder/findInspectRecently", { patientCode })
+        .subscribe((result) => {
+          this.recentInfoNum--;
+          if (result["status"] == 200 && this.recentInfoNum === 0) {
+            this.recentInfo = result["data"]["info"];
+          } else {
+            this.recentInfo = "";
+          }
+        });
     }, 500);
   }
   // 获取患者陪检任务类型（只有一个）的信息
@@ -602,7 +606,7 @@ export class HushijiandanComponent implements OnInit {
       },
     };
     this.loading4 = true;
-    this.mainService.changeFollow(postData).subscribe(
+    this.mainService.listMsgByMain("updData/patient", postData).subscribe(
       (result) => {
         this.loading4 = false;
         if (result["status"] == 200) {

src/app/views/job-assignment/job-assignment.component.ts

@@ -1214,7 +1214,9 @@ export class JobAssignmentComponent implements OnInit {
   getAllBuilding() {
     var that = this;
     that.mainService
-      .getBuildingOrFloor("building", { hosId: that.checkedType["hosId"].id })
+      .coopData("getBuildingOrFloor", "building", {
+        hosId: that.checkedType["hosId"].id,
+      })
       .subscribe((data) => {
         that.allBuilding = data.data;
       });

src/app/views/office-detail/office-detail.component.ts

@@ -1,38 +1,45 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
 import { Router, ActivatedRoute } from "@angular/router";
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from "ng-zorro-antd";
 
 import { MainService } from "../../services/main.service";
 
 @Component({
-  selector: 'app-office-detail',
-  templateUrl: './office-detail.component.html',
-  styleUrls: ['./office-detail.component.less']
+  selector: "app-office-detail",
+  templateUrl: "./office-detail.component.html",
+  styleUrls: ["./office-detail.component.less"],
 })
 export class OfficeDetailComponent implements OnInit {
-
-  constructor(private message: NzMessageService,private router: Router, private mainService: MainService, private routerInfo: ActivatedRoute) { }
+  constructor(
+    private message: NzMessageService,
+    private router: Router,
+    private mainService: MainService,
+    private routerInfo: ActivatedRoute
+  ) {}
 
   id: number;
-  officeInfo: any={};
+  officeInfo: any = {};
 
   ngOnInit() {
-    this.getDetail()
+    this.getDetail();
   }
   hideModal() {
-    this.router.navigateByUrl('/main/officeManagement')
+    this.router.navigateByUrl("/main/officeManagement");
   }
 
   // 获取详情
   maskFlag: any = false;
   getDetail() {
-    this.id = this.routerInfo.snapshot.params['id'];
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    this.mainService.getOfficeDetail(this.id).subscribe(data => {
-      this.message.remove(this.maskFlag);
-      this.maskFlag = false;
-      this.officeInfo = data.data;
-    })
+    this.id = this.routerInfo.snapshot.params["id"];
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("data", "department", this.id)
+      .subscribe((data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.officeInfo = data.data;
+      });
   }
-
 }

src/app/views/office-management/office-management.component.ts

@@ -161,34 +161,36 @@ export class OfficeManagementComponent implements OnInit {
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.getBuildingOrFloor("building", data).subscribe((data) => {
-      this.buildings = data.data;
-      this.floors = [];
-      // ---------
-      if (obj) {
-        //编辑
-        let arr = this.buildings.map((item) => item.id);
-        if (obj.building.id && arr.includes(obj.building.id)) {
-          //有楼栋
-          this.changeBuilding(obj.building.id, obj);
-          this.validateForm.controls.building.setValue(obj.building.id + "");
+    this.mainService
+      .coopData("getBuildingOrFloor", "building", data)
+      .subscribe((data) => {
+        this.buildings = data.data;
+        this.floors = [];
+        // ---------
+        if (obj) {
+          //编辑
+          let arr = this.buildings.map((item) => item.id);
+          if (obj.building.id && arr.includes(obj.building.id)) {
+            //有楼栋
+            this.changeBuilding(obj.building.id, obj);
+            this.validateForm.controls.building.setValue(obj.building.id + "");
+          } else {
+            //无楼栋
+            this.floors = [];
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.modal = true;
+            this.validateForm.controls.building.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
         } else {
-          //无楼栋
-          this.floors = [];
+          //新增
           this.message.remove(this.maskFlag);
           this.maskFlag = false;
           this.modal = true;
-          this.validateForm.controls.building.setValue(null);
-          this.validateForm.controls.officeAddress.setValue(null);
         }
-      } else {
-        //新增
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-        this.modal = true;
-      }
-      // ---------
-    });
+        // ---------
+      });
   }
 
   // 切换楼栋信息
@@ -209,23 +211,25 @@ export class OfficeManagementComponent implements OnInit {
       buildingId: bid,
     };
     this.floorLoading = true;
-    that.mainService.getBuildingOrFloor("floor", data).subscribe((data) => {
-      this.floorLoading = false;
-      this.message.remove(this.maskFlag);
-      this.maskFlag = false;
-      this.modal = true;
-      that.floors = data.data;
-      if (obj) {
-        let floorId = obj.floor.id;
-        let arr = that.floors.map((item) => item["id"]);
-        if (floorId && arr.includes(floorId)) {
-          this.validateForm.controls.floor.setValue(floorId + "");
-        } else {
-          this.validateForm.controls.floor.setValue(null);
-          this.validateForm.controls.officeAddress.setValue(null);
+    that.mainService
+      .coopData("getBuildingOrFloor", "floor", data)
+      .subscribe((data) => {
+        this.floorLoading = false;
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.modal = true;
+        that.floors = data.data;
+        if (obj) {
+          let floorId = obj.floor.id;
+          let arr = that.floors.map((item) => item["id"]);
+          if (floorId && arr.includes(floorId)) {
+            this.validateForm.controls.floor.setValue(floorId + "");
+          } else {
+            this.validateForm.controls.floor.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
         }
-      }
-    });
+      });
   }
 
   // 获取科室类型

src/app/views/pharmacy/pharmacy.component.ts

@@ -83,8 +83,13 @@ export class PharmacyComponent implements OnInit {
         this.loading3 = true;
         break;
     }
+    let postData = {
+      idx,
+      sum: 10,
+      drugsBag: { searchType: type, searchKey, launch },
+    };
     this.mainService
-      .getPharmacyList(idx, type, searchKey, launch)
+      .getFetchDataList("api", "drugsBag", postData)
       .subscribe((result) => {
         switch (type) {
           case 1:

src/app/views/round-robin-detail/round-robin-detail.component.ts

@@ -1,42 +1,47 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
 import { Router, ActivatedRoute } from "@angular/router";
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from "ng-zorro-antd";
 
 import { MainService } from "../../services/main.service";
 
-
 @Component({
-  selector: 'app-round-robin-detail',
-  templateUrl: './round-robin-detail.component.html',
-  styleUrls: ['./round-robin-detail.component.less']
+  selector: "app-round-robin-detail",
+  templateUrl: "./round-robin-detail.component.html",
+  styleUrls: ["./round-robin-detail.component.less"],
 })
 export class RoundRobinDetailComponent implements OnInit {
-
-  constructor(private message: NzMessageService, private router: Router, private mainService: MainService, private routerInfo: ActivatedRoute) { }
+  constructor(
+    private message: NzMessageService,
+    private router: Router,
+    private mainService: MainService,
+    private routerInfo: ActivatedRoute
+  ) {}
 
   id: number;
   userInfo: any = null;
-  dayType = ['全部', '节假日', '工作日'];//执行策略里的复选框数据字典
+  dayType = ["全部", "节假日", "工作日"]; //执行策略里的复选框数据字典
   ngOnInit() {
-    this.getDetail()
+    this.getDetail();
   }
   hideModal() {
-    this.router.navigateByUrl('/main/roundRobin')
+    this.router.navigateByUrl("/main/roundRobin");
   }
 
   // 获取详情
   maskFlag: any = false;
   getDetail() {
-    this.id = this.routerInfo.snapshot.params['id'];
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    this.mainService.getApiFetchData('orderPlan', this.id).subscribe(data => {
-      this.message.remove(this.maskFlag);
-      this.maskFlag = false;
-      if (data.status == 200) {
-        this.userInfo = data.data;
-      }
-    })
+    this.id = this.routerInfo.snapshot.params["id"];
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("api", "orderPlan", this.id)
+      .subscribe((data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.status == 200) {
+          this.userInfo = data.data;
+        }
+      });
   }
-
 }
-

src/app/views/shortcut-build-orders-detail/shortcut-build-orders-detail.component.ts

@@ -1,44 +1,47 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
 import { Router, ActivatedRoute } from "@angular/router";
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from "ng-zorro-antd";
 
 import { MainService } from "../../services/main.service";
 
-
 @Component({
-  selector: 'app-shortcut-build-orders-detail',
-  templateUrl: './shortcut-build-orders-detail.component.html',
-  styleUrls: ['./shortcut-build-orders-detail.component.less']
+  selector: "app-shortcut-build-orders-detail",
+  templateUrl: "./shortcut-build-orders-detail.component.html",
+  styleUrls: ["./shortcut-build-orders-detail.component.less"],
 })
 export class ShortcutBuildOrdersDetailComponent implements OnInit {
-
-  constructor(private message: NzMessageService, private router: Router, private mainService: MainService, private routerInfo: ActivatedRoute) { }
+  constructor(
+    private message: NzMessageService,
+    private router: Router,
+    private mainService: MainService,
+    private routerInfo: ActivatedRoute
+  ) {}
 
   id: number;
   userInfo: any = null;
-  roundRobinTypes = [
-    { id: '163', hosName: '标本轮巡' }
-  ];//快捷建单类型
+  roundRobinTypes = [{ id: "163", hosName: "标本轮巡" }]; //快捷建单类型
   ngOnInit() {
-    this.getDetail()
+    this.getDetail();
   }
   hideModal() {
-    this.router.navigateByUrl('/main/shortcutBuildOrders')
+    this.router.navigateByUrl("/main/shortcutBuildOrders");
   }
 
   // 获取详情
   maskFlag: any = false;
   getDetail() {
-    this.id = this.routerInfo.snapshot.params['id'];
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    this.mainService.getApiFetchData('quickOrder', this.id).subscribe(data => {
-      this.message.remove(this.maskFlag);
-      this.maskFlag = false;
-      if (data.status == 200) {
-        this.userInfo = data.data;
-      }
-    })
+    this.id = this.routerInfo.snapshot.params["id"];
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("api", "quickOrder", this.id)
+      .subscribe((data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.status == 200) {
+          this.userInfo = data.data;
+        }
+      });
   }
 }
-
-

src/app/views/task-type-management/task-type-management.component.ts

@@ -42,7 +42,9 @@ export class TaskTypeManagementComponent implements OnInit {
               orders: i,
             };
           });
-          this.mainService.sortTaskType(postData).subscribe((result) => {});
+          this.mainService
+            .coopConfig("setOrders", postData)
+            .subscribe((result) => {});
         }, 500);
       },
     };

src/app/views/user-detail/user-detail.component.ts

@@ -1,38 +1,42 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
 import { Router, ActivatedRoute } from "@angular/router";
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService } from "ng-zorro-antd";
 
 import { MainService } from "../../services/main.service";
 
-
 @Component({
-  selector: 'app-user-detail',
-  templateUrl: './user-detail.component.html',
-  styleUrls: ['./user-detail.component.less']
+  selector: "app-user-detail",
+  templateUrl: "./user-detail.component.html",
+  styleUrls: ["./user-detail.component.less"],
 })
 export class UserDetailComponent implements OnInit {
-
-  constructor(private message: NzMessageService, private router: Router, private mainService: MainService, private routerInfo: ActivatedRoute) { }
+  constructor(
+    private message: NzMessageService,
+    private router: Router,
+    private mainService: MainService,
+    private routerInfo: ActivatedRoute
+  ) {}
 
   id: number;
   userInfo: any = {};
   ngOnInit() {
-    this.getDetail()
+    this.getDetail();
   }
   hideModal() {
-    this.router.navigateByUrl('/main/usersManagement')
+    this.router.navigateByUrl("/main/usersManagement");
   }
 
   // 获取详情
   maskFlag: any = false;
   getDetail() {
-    this.id = this.routerInfo.snapshot.params['id'];
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    this.mainService.getDataFetchData('user', this.id).subscribe(data => {
+    this.id = this.routerInfo.snapshot.params["id"];
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.getFetchData("data", "user", this.id).subscribe((data) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       this.userInfo = data.data;
-    })
+    });
   }
-
 }