在系统管理中增加护士端科室显示选择

package-lock.json

@@ -2608,9 +2608,9 @@
       }
     },
     "core-js": {
-      "version": "3.16.4",
-      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.16.4.tgz",
-      "integrity": "sha1-D7ECmlVPwmiMCWPXyQDhiBiKeOA="
+      "version": "3.17.2",
+      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.17.2.tgz",
+      "integrity": "sha1-+WDq5xDcYsKcypPVMy42YOKJ2xA="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -2779,9 +2779,9 @@
       }
     },
     "datatables.net": {
-      "version": "1.10.25",
-      "resolved": "https://registry.nlark.com/datatables.net/download/datatables.net-1.10.25.tgz",
-      "integrity": "sha1-/AOiOeCPkdHWS6EBqlTa9AhtFiw=",
+      "version": "1.11.2",
+      "resolved": "https://registry.nlark.com/datatables.net/download/datatables.net-1.11.2.tgz",
+      "integrity": "sha1-AZs3zaNdIgh6ZfmDr6ToduuSAuM=",
       "requires": {
         "jquery": ">=1.7"
       }
@@ -5244,7 +5244,7 @@
     },
     "jquery": {
       "version": "3.6.0",
-      "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.6.0.tgz?cache=0&sync_timestamp=1614705838607&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjquery%2Fdownload%2Fjquery-3.6.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.6.0.tgz",
       "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA="
     },
     "js-tokens": {

package.json

@@ -24,9 +24,9 @@
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.12.1",
-    "core-js": "^3.16.4",
+    "core-js": "^3.17.2",
     "crypto-js": "^3.3.0",
-    "datatables.net": "^1.10.25",
+    "datatables.net": "^1.11.2",
     "date-fns": "^2.23.0",
     "echarts": "^4.6.0",
     "ng-zorro-antd": "^8.5.2",

src/app/services/tool.service.ts

@@ -1,10 +1,11 @@
 import { Injectable } from "@angular/core";
+import { MainService } from "./main.service";
 
 @Injectable({
   providedIn: "root",
 })
 export class ToolService {
-  constructor() {}
+  constructor(private mainService: MainService) {}
   // 获取权限中的院区
   getHospitalList() {
     return (
@@ -95,4 +96,17 @@ export class ToolService {
     console.log(coopBtns);
     return coopBtns;
   }
+  // 获取护士端是否使用科室别名的系统配置
+  getDeptDisplay() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      systemConfiguration: { keyconfig: "deptDisplay" },
+    };
+    return this.mainService.getFetchDataList(
+      "simple/data",
+      "systemConfiguration",
+      postData
+    );
+  }
 }

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

@@ -11,8 +11,12 @@
         <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
         <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
         <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
-        <div nz-col nzSpan="8">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}</div>
-        <div nz-col nzSpan="8">目标科室：{{(orderInfo.endDepts&&orderInfo.endDepts[0])?orderInfo.endDepts[0].dept:''}}</div>
+        <div nz-col nzSpan="8">
+          申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+        </div>
+        <div nz-col nzSpan="8">
+          目标科室：{{(orderInfo.endDepts&&orderInfo.endDepts[0])?(!showCoop&&deptDisplay==2?orderInfo.endDepts[0].deptalias:orderInfo.endDepts[0].dept):''}}
+        </div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.drugs">药包编码：{{orderInfo.drugs.packid}}</div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.staticDistri">药包编码：{{orderInfo.staticDistri.packid}}</div>

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

@@ -1,67 +1,74 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MainService } from '../../services/main.service';
-import { forkJoin } from 'rxjs';
-import { NzMessageService } from 'ng-zorro-antd';
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MainService } from "../../services/main.service";
+import { forkJoin } from "rxjs";
+import { NzMessageService } from "ng-zorro-antd";
+import { ToolService } from "src/app/services/tool.service";
 
 @Component({
-  selector: 'app-detail-drug',
-  templateUrl: './detail-drug.component.html',
-  styleUrls: ['./detail-drug.component.less']
+  selector: "app-detail-drug",
+  templateUrl: "./detail-drug.component.html",
+  styleUrls: ["./detail-drug.component.less"],
 })
 export class DetailDrugComponent implements OnInit {
-
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
     private router: Router,
+    private tool: ToolService,
     private mainService: MainService
-  ) { }
+  ) {}
 
-  id: number;//工单id
-  orderInfo: any;//工单详情信息
-  showCoop: boolean = true;//是否展示详情页操作按钮
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  showCoop: boolean = true; //是否展示详情页操作按钮
 
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  promptModalShow: boolean;//是否展示提示框
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
 
-  urgentLoading: boolean = false;//确认加急按钮loading状态
-  recLoading: boolean = false;//撤回并删除按钮loading状态
-  btnLoading: boolean = false;//确认按钮loading状态
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
-
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   ngOnInit() {
-    if (this.route.snapshot.parent.parent.routeConfig.path == 'nurse') {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+    if (this.route.snapshot.parent.parent.routeConfig.path == "nurse") {
       this.showCoop = false;
     }
-    this.id = +this.route.snapshot.paramMap.get('id');
+    this.id = +this.route.snapshot.paramMap.get("id");
     let log$ = this.getLog();
     let detail$ = this.getDetail();
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    forkJoin(log$, detail$).subscribe(res => {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(log$, detail$).subscribe((res) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       // getLog
-      this.logList = res[0]['data'];
+      this.logList = res[0]["data"];
       // getDetail
-      this.orderInfo = res[1]['data'];
-    })
+      this.orderInfo = res[1]["data"];
+    });
   }
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.getApiFetchData('workOrder', this.id);
+    return this.mainService.getApiFetchData("workOrder", this.id);
   }
 
   // 关闭弹框
   close() {
     // this.router.navigateByUrl('dispatchingDesk');
-    history.go(-1)
+    history.go(-1);
   }
 
-
   // 加急
   urgent() {
     let that = this;
@@ -70,28 +77,35 @@ export class DetailDrugComponent implements OnInit {
       urgentDetails: {
         workerOrder: that.id,
         checkStatus: { id: 330 },
-        urgentReason: that.orderInfo['urgentDetails']['urgentReason'],
-        id: that.orderInfo['urgentDetails']['id']
-      }
-    }
-    that.mainService.postCustom('workerOrder', 'urge', postData).subscribe(data => {
-      console.log(data);
-      that.urgentLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal('加急', true, '');
-      } else {
-        that.showPromptModal('加急', false, data.msg);
-      }
-    })
+        urgentReason: that.orderInfo["urgentDetails"]["urgentReason"],
+        id: that.orderInfo["urgentDetails"]["id"],
+      },
+    };
+    that.mainService
+      .postCustom("workerOrder", "urge", postData)
+      .subscribe((data) => {
+        console.log(data);
+        that.urgentLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("加急", true, "");
+        } else {
+          that.showPromptModal("加急", false, data.msg);
+        }
+      });
   }
 
   // 派单
   allotWorker() {
-    this.router.navigateByUrl('dispatchingDesk/allotWorker/' + this.id + '/' + this.orderInfo['gdState']['id']);
+    this.router.navigateByUrl(
+      "dispatchingDesk/allotWorker/" +
+        this.id +
+        "/" +
+        this.orderInfo["gdState"]["id"]
+    );
   }
 
   // 获取工单历史记录
-  logList = [];//工单历史记录
+  logList = []; //工单历史记录
   getLog() {
     return this.mainService.getWorkOrderLog(this.id);
   }
@@ -107,33 +121,35 @@ export class DetailDrugComponent implements OnInit {
     that.btnLoading = true;
     let postData = {
       workOrder: {
-        id: that.id
-      }
-    }
-    that.mainService.coopWorkerOrder('excuteWorkOrder/recall', postData).subscribe(data => {
-      that.btnLoading = false;
-      that.closeRecallOrderModal()
-      if (data.status == 200) {
-        that.showPromptModal('撤回', true, '');
-      } else {
-        that.showPromptModal('撤回', false, data.msg);
-      }
-    })
+        id: that.id,
+      },
+    };
+    that.mainService
+      .coopWorkerOrder("excuteWorkOrder/recall", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.closeRecallOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("撤回", true, "");
+        } else {
+          that.showPromptModal("撤回", false, data.msg);
+        }
+      });
   }
   // 撤回并删除
   recAndDel() {
     let that = this;
     that.recLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       console.log(data);
       that.recLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
   // 关闭撤回弹框
   closeRecallOrderModal() {
@@ -150,15 +166,15 @@ export class DetailDrugComponent implements OnInit {
   confirmDel() {
     let that = this;
     that.btnLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       that.btnLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
 
   // 关闭模态框
@@ -166,9 +182,6 @@ export class DetailDrugComponent implements OnInit {
     this.delOrderShow = false;
   }
 
-
-
-
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;
@@ -180,27 +193,22 @@ export class DetailDrugComponent implements OnInit {
     }, 100);
   }
 
-
-
-
-
-
   // 格式化时分秒
   // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）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;
@@ -210,7 +218,7 @@ export class DetailDrugComponent 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/share/detail-others/detail-others.component.html

@@ -11,7 +11,9 @@
         <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
         <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
         <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}</div>
-        <div nz-col nzSpan="8">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:'-'}}</div>
+        <div nz-col nzSpan="8">
+          申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+        </div>
         <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
         <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}

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

@@ -1,59 +1,73 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MainService } from '../../services/main.service';
-import { forkJoin } from 'rxjs';
-import { NzMessageService } from 'ng-zorro-antd';
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MainService } from "../../services/main.service";
+import { forkJoin } from "rxjs";
+import { NzMessageService } from "ng-zorro-antd";
+import { ToolService } from "src/app/services/tool.service";
 
 @Component({
-  selector: 'app-detail-others',
-  templateUrl: './detail-others.component.html',
-  styleUrls: ['./detail-others.component.less']
+  selector: "app-detail-others",
+  templateUrl: "./detail-others.component.html",
+  styleUrls: ["./detail-others.component.less"],
 })
 export class DetailOthersComponent implements OnInit {
-
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
     private router: Router,
-    private mainService: MainService) { }
-
-  id: number;//工单id
-  orderInfo: any;//工单详情信息
-  endDepts = '';//工单详情目标科室
-  showCoop: boolean = true;//是否展示详情页操作按钮
-
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  promptModalShow: boolean;//是否展示提示框
-
-  urgentLoading: boolean = false;//确认加急按钮loading状态
-  recLoading: boolean = false;//撤回并删除按钮loading状态
-  btnLoading: boolean = false;//确认按钮loading状态
+    private tool: ToolService,
+    private mainService: MainService
+  ) {}
+
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  endDepts = ""; //工单详情目标科室
+  showCoop: boolean = true; //是否展示详情页操作按钮
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
 
   ngOnInit() {
-    if (this.route.snapshot.parent.parent.routeConfig.path == 'nurse') {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+    if (this.route.snapshot.parent.parent.routeConfig.path == "nurse") {
       this.showCoop = false;
     }
-    this.id = +this.route.snapshot.paramMap.get('id');
+    this.id = +this.route.snapshot.paramMap.get("id");
     let log$ = this.getLog();
     let detail$ = this.getDetail();
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    forkJoin(log$, detail$).subscribe(res => {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(log$, detail$).subscribe((res) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       // getLog
-      this.logList = res[0]['data'];
+      this.logList = res[0]["data"];
       // getDetail
-      this.orderInfo = res[1]['data'];
-      this.endDepts = res[1]['data'].endDepts.map(item => item.dept).join();
-    })
+      this.orderInfo = res[1]["data"];
+      this.endDepts = res[1]["data"].endDepts
+        .map((item) =>
+          (!this.showCoop && this.deptDisplay == 2) ? item.deptalias : item.dept
+        )
+        .join();
+    });
   }
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.getApiFetchData('workOrder', this.id);
+    return this.mainService.getApiFetchData("workOrder", this.id);
   }
 
   // 确认加急
@@ -61,29 +75,29 @@ export class DetailOthersComponent implements OnInit {
     let that = this;
     that.urgentLoading = true;
     let postData = {
-      "urgentDetails": {
-        "workerOrder": this.orderInfo['id'],
-        "checkStatus": {
-          "id": 330
+      urgentDetails: {
+        workerOrder: this.orderInfo["id"],
+        checkStatus: {
+          id: 330,
         },
-        "urgentReason": this.orderInfo['urgentDetails'].urgentReason,
-        "id": this.orderInfo['urgentDetails'].id
-      }
-    }
-    that.mainService.coopWorkerOrder('urge', postData).subscribe(data => {
+        urgentReason: this.orderInfo["urgentDetails"].urgentReason,
+        id: this.orderInfo["urgentDetails"].id,
+      },
+    };
+    that.mainService.coopWorkerOrder("urge", postData).subscribe((data) => {
       that.urgentLoading = false;
       if (data.status == 200) {
-        that.showPromptModal('加急', true, '');
+        that.showPromptModal("加急", true, "");
       } else {
-        that.showPromptModal('加急', false, data.msg);
+        that.showPromptModal("加急", false, data.msg);
       }
-    })
+    });
   }
 
   // 关闭弹框
   close() {
     // this.router.navigateByUrl('dispatchingDesk');
-    history.go(-1)
+    history.go(-1);
   }
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
@@ -96,14 +110,19 @@ export class DetailOthersComponent implements OnInit {
     }, 100);
   }
   // 获取工单历史记录
-  logList = [];//工单历史记录
+  logList = []; //工单历史记录
   getLog() {
     return this.mainService.getWorkOrderLog(this.id);
   }
 
   // 派单
   allotWorker() {
-    this.router.navigateByUrl('dispatchingDesk/allotWorker/' + this.id + '/' + this.orderInfo['gdState']['id']);
+    this.router.navigateByUrl(
+      "dispatchingDesk/allotWorker/" +
+        this.id +
+        "/" +
+        this.orderInfo["gdState"]["id"]
+    );
   }
 
   // 撤回
@@ -115,16 +134,16 @@ export class DetailOthersComponent implements OnInit {
   recAndDel() {
     let that = this;
     that.recLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       console.log(data);
       that.recLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
   // 确认撤回
   confirmRec() {
@@ -132,25 +151,26 @@ export class DetailOthersComponent implements OnInit {
     that.btnLoading = true;
     let postData = {
       workOrder: {
-        id: that.id
-      }
-    }
-    that.mainService.coopWorkerOrder('excuteWorkOrder/recall', postData).subscribe(data => {
-      that.btnLoading = false;
-      that.closeRecallOrderModal()
-      if (data.status == 200) {
-        that.showPromptModal('撤回', true, '');
-      } else {
-        that.showPromptModal('撤回', false, data.msg);
-      }
-    })
+        id: that.id,
+      },
+    };
+    that.mainService
+      .coopWorkerOrder("excuteWorkOrder/recall", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.closeRecallOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("撤回", true, "");
+        } else {
+          that.showPromptModal("撤回", false, data.msg);
+        }
+      });
   }
   // 关闭撤回弹框
   closeRecallOrderModal() {
     this.recallOrderShow = false;
   }
 
-
   // 删除
   // 打开模态框
   delOrderShow: boolean = false;
@@ -161,15 +181,15 @@ export class DetailOthersComponent implements OnInit {
   confirmDel() {
     let that = this;
     that.btnLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       that.btnLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
 
   // 关闭模态框
@@ -180,19 +200,19 @@ export class DetailOthersComponent 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;
@@ -202,12 +222,9 @@ export class DetailOthersComponent 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/share/detail-patients/detail-patients.component.html

@@ -12,12 +12,14 @@
           <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
           <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
           <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}</div>
-          <div nz-col nzSpan="8">申请科室：{{orderInfo.createDeptDTO.dept}}</div>
+          <div nz-col nzSpan="8">
+            申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+          </div>
           <div nz-col nzSpan="8" *ngIf="middleDept.length>0">中间科室：{{middleDept.join('，')}}</div>
           <div nz-col nzSpan="8">目标科室：
             <span *ngFor="let dep of orderInfo.endDepts;let i=index;">
-              <span *ngIf="i!=orderInfo.endDepts.length-1">{{dep.dept}},</span>
-              <span *ngIf="i==orderInfo.endDepts.length-1">{{dep.dept}}</span>
+              <span *ngIf="i!=orderInfo.endDepts.length-1">{{!showCoop&&deptDisplay==2?dep.deptalias:dep.dept}},</span>
+              <span *ngIf="i==orderInfo.endDepts.length-1">{{!showCoop&&deptDisplay==2?dep.deptalias:dep.dept}}</span>
             </span>
           </div>
           <div nz-col nzSpan="8">陪同情况：{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
@@ -121,7 +123,7 @@
               <div nz-col nzSpan="8">
                 <p>
                   <span class="label">检查科室：</span>
-                  <span>{{item.execDept?item.execDept.dept:'-'}}</span>
+                  <span>{{item.execDept?(!showCoop&&deptDisplay==2?item.execDept.deptalias:item.execDept.dept):'-'}}</span>
                 </p>
               </div>
               <div nz-col nzSpan="8">

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

@@ -1,79 +1,101 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MainService } from '../../services/main.service';
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
-import { NzMessageService } from 'ng-zorro-antd';
-import { forkJoin } from 'rxjs';
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { NzMessageService } from "ng-zorro-antd";
+import { forkJoin } from "rxjs";
+import { ToolService } from "src/app/services/tool.service";
 
 @Component({
-  selector: 'app-detail-patients',
-  templateUrl: './detail-patients.component.html',
-  styleUrls: ['./detail-patients.component.less']
+  selector: "app-detail-patients",
+  templateUrl: "./detail-patients.component.html",
+  styleUrls: ["./detail-patients.component.less"],
 })
 export class DetailPatientsComponent implements OnInit {
-  @ViewChild('osComponentRef1', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef1: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
     private router: Router,
-    private mainService: MainService) { }
+    private tool: ToolService,
+    private mainService: MainService
+  ) {}
 
-  id: number;//工单id
-  orderInfo: any;//工单详情信息
-  showCoop: boolean = true;//是否展示详情页操作按钮
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  showCoop: boolean = true; //是否展示详情页操作按钮
 
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  promptModalShow: boolean;//是否展示提示框
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
 
-  urgentLoading: boolean = false;//确认加急按钮loading状态
-  recLoading: boolean = false;//撤回并删除按钮loading状态
-  btnLoading: boolean = false;//确认按钮loading状态
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   ngOnInit() {
-    if (this.route.snapshot.parent.parent.routeConfig.path == 'nurse') {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+    if (this.route.snapshot.parent.parent.routeConfig.path == "nurse") {
       this.showCoop = false;
     }
-    this.id = +this.route.snapshot.paramMap.get('id');
+    this.id = +this.route.snapshot.paramMap.get("id");
     let log$ = this.getLog();
     let detail$ = this.getDetail();
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    forkJoin(log$, detail$).subscribe(res => {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(log$, detail$).subscribe((res) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       // getLog
-      this.logList = res[0]['data'];
+      this.logList = res[0]["data"];
       // getDetail
-      this.orderInfo = res[1]['data'];
-      if (this.orderInfo['checkList'] && this.orderInfo['checkList'].length) {
+      this.orderInfo = res[1]["data"];
+      if (this.orderInfo["checkList"] && this.orderInfo["checkList"].length) {
         let arr = [];
-        let orderInfo = this.orderInfo['checkList'].filter(item => item.yyTime);
+        let orderInfo = this.orderInfo["checkList"].filter(
+          (item) => item.yyTime
+        );
         if (orderInfo.length) {
-          arr = orderInfo.map(item => [(new Date(item.yyTime)).getTime() - (new Date()).getTime(), item.yyTime]);
-          arr.sort((a, b) => (a - b));
-          this.orderInfo['yyTime'] = arr[0][1];
+          arr = orderInfo.map((item) => [
+            new Date(item.yyTime).getTime() - new Date().getTime(),
+            item.yyTime,
+          ]);
+          arr.sort((a, b) => a - b);
+          this.orderInfo["yyTime"] = arr[0][1];
         } else {
-          this.orderInfo['yyTime'] = '';
+          this.orderInfo["yyTime"] = "";
         }
       } else {
-        this.orderInfo['yyTime'] = '';
+        this.orderInfo["yyTime"] = "";
       }
-      if (res[1]['data'].middleDept) {
-        this.middleDept = res[1]['data'].middleDept.map(item => item.dept);
+      if (res[1]["data"].middleDept) {
+        this.middleDept = res[1]["data"].middleDept
+          .map((item) =>
+            !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept
+          );
       } else {
         this.middleDept = [];
       }
-    })
+    });
   }
   // 获取工单详情
-  middleDept = [];//中间科室数组
+  middleDept = []; //中间科室数组
   getDetail() {
-    return this.mainService.getApiFetchData('workOrder', this.id);
+    return this.mainService.getApiFetchData("workOrder", this.id);
   }
   // 获取工单历史记录
-  logList = [];//工单历史记录
+  logList = []; //工单历史记录
   getLog() {
     return this.mainService.getWorkOrderLog(this.id);
   }
@@ -86,24 +108,31 @@ export class DetailPatientsComponent implements OnInit {
       urgentDetails: {
         workerOrder: that.id,
         checkStatus: { id: 330 },
-        urgentReason: that.orderInfo['urgentDetails']['urgentReason'],
-        id: that.orderInfo['urgentDetails']['id']
-      }
-    }
-    that.mainService.postCustom('workerOrder', 'urge', postData).subscribe(data => {
-      console.log(data);
-      that.urgentLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal('加急', true, '');
-      } else {
-        that.showPromptModal('加急', false, data.msg);
-      }
-    })
+        urgentReason: that.orderInfo["urgentDetails"]["urgentReason"],
+        id: that.orderInfo["urgentDetails"]["id"],
+      },
+    };
+    that.mainService
+      .postCustom("workerOrder", "urge", postData)
+      .subscribe((data) => {
+        console.log(data);
+        that.urgentLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("加急", true, "");
+        } else {
+          that.showPromptModal("加急", false, data.msg);
+        }
+      });
   }
 
   // 派单
   allotWorker() {
-    this.router.navigateByUrl('dispatchingDesk/allotWorker/' + this.id + '/' + this.orderInfo['gdState']['id']);
+    this.router.navigateByUrl(
+      "dispatchingDesk/allotWorker/" +
+        this.id +
+        "/" +
+        this.orderInfo["gdState"]["id"]
+    );
   }
 
   // 撤回
@@ -117,33 +146,35 @@ export class DetailPatientsComponent implements OnInit {
     that.btnLoading = true;
     let postData = {
       workOrder: {
-        id: that.id
-      }
-    }
-    that.mainService.coopWorkerOrder('excuteWorkOrder/recall', postData).subscribe(data => {
-      that.btnLoading = false;
-      that.closeRecallOrderModal()
-      if (data.status == 200) {
-        that.showPromptModal('撤回', true, '');
-      } else {
-        that.showPromptModal('撤回', false, data.msg);
-      }
-    })
+        id: that.id,
+      },
+    };
+    that.mainService
+      .coopWorkerOrder("excuteWorkOrder/recall", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.closeRecallOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("撤回", true, "");
+        } else {
+          that.showPromptModal("撤回", false, data.msg);
+        }
+      });
   }
   // 撤回并删除
   recAndDel() {
     let that = this;
     that.recLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       console.log(data);
       that.recLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
   // 关闭撤回弹框
   closeRecallOrderModal() {
@@ -153,7 +184,7 @@ export class DetailPatientsComponent implements OnInit {
   // 关闭弹框
   close() {
     // this.router.navigateByUrl('dispatchingDesk');
-    history.go(-1)
+    history.go(-1);
   }
 
   // 删除
@@ -166,15 +197,15 @@ export class DetailPatientsComponent implements OnInit {
   confirmDel() {
     let that = this;
     that.btnLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
-      that.closeDelOrderModal()
+    that.mainService.delOrder(that.id).subscribe((data) => {
+      that.closeDelOrderModal();
       that.btnLoading = false;
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
 
   // 关闭模态框
@@ -182,9 +213,6 @@ export class DetailPatientsComponent implements OnInit {
     this.delOrderShow = false;
   }
 
-
-
-
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;
@@ -199,19 +227,19 @@ export class DetailPatientsComponent 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;
@@ -221,10 +249,9 @@ export class DetailPatientsComponent 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/share/detail-sample/detail-sample.component.html

@@ -13,7 +13,9 @@
         <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}</div>
         <div nz-col nzSpan="8">预计接收：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
 
-        <div nz-col nzSpan="8">申请科室：{{orderInfo.createDeptDTO.dept}}</div>
+        <div nz-col nzSpan="8">
+          申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+        </div>
         <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
         <div nz-col nzSpan="8">实际接收：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
@@ -73,7 +75,7 @@
               <td>{{data.scode}}</td>
               <td>{{data.patientName}}</td>
               <td>{{data.bedNum}}</td>
-              <td>{{data.checkDept.dept}}</td>
+              <td>{{!showCoop&&deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}</td>
               <td>{{data.received?"是":"否"}}</td>
               <td>{{data.arrived?"是":"否"}}</td>
               <td>{{data.arriveTime?data.arriveTime:'-'}}</td>

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

@@ -1,59 +1,72 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MainService } from '../../services/main.service';
-import { forkJoin } from 'rxjs';
-import { NzMessageService } from 'ng-zorro-antd';
-
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MainService } from "../../services/main.service";
+import { forkJoin } from "rxjs";
+import { NzMessageService } from "ng-zorro-antd";
+import { ToolService } from "src/app/services/tool.service";
 
 @Component({
-  selector: 'app-detail-sample',
-  templateUrl: './detail-sample.component.html',
-  styleUrls: ['./detail-sample.component.less']
+  selector: "app-detail-sample",
+  templateUrl: "./detail-sample.component.html",
+  styleUrls: ["./detail-sample.component.less"],
 })
 export class DetailSampleComponent implements OnInit {
-
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
     private router: Router,
-    private mainService: MainService) { }
-
-  id: number;//工单id
-  orderInfo: any;//工单详情信息
-  endDepts = '';//工单详情目标科室
-  showCoop: boolean = true;//是否展示详情页操作按钮
-
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  promptModalShow: boolean;//是否展示提示框
-
-  urgentLoading: boolean = false;//确认加急按钮loading状态
-  recLoading: boolean = false;//撤回并删除按钮loading状态
-  btnLoading: boolean = false;//确认按钮loading状态
+    private tool: ToolService,
+    private mainService: MainService
+  ) {}
+
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  endDepts = ""; //工单详情目标科室
+  showCoop: boolean = true; //是否展示详情页操作按钮
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   ngOnInit() {
-    if (this.route.snapshot.parent.parent.routeConfig.path == 'nurse') {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+    if (this.route.snapshot.parent.parent.routeConfig.path == "nurse") {
       this.showCoop = false;
     }
-    this.id = +this.route.snapshot.paramMap.get('id');
+    this.id = +this.route.snapshot.paramMap.get("id");
     let log$ = this.getLog();
     let detail$ = this.getDetail();
-    this.maskFlag = this.message.loading('正在加载中..', { nzDuration: 0 }).messageId;
-    forkJoin(log$, detail$).subscribe(res => {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(log$, detail$).subscribe((res) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       // getLog
-      this.logList = res[0]['data'];
+      this.logList = res[0]["data"];
       // getDetail
-      this.orderInfo = res[1]['data'];
-      this.endDepts = res[1]['data'].endDepts.map(item => item.dept).join();
-    })
+      this.orderInfo = res[1]["data"];
+      this.endDepts = res[1]["data"].endDepts
+        .map((item) =>
+          !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept
+        )
+        .join();
+    });
   }
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.getApiFetchData('workOrder', this.id);
+    return this.mainService.getApiFetchData("workOrder", this.id);
   }
 
   // 确认加急
@@ -61,33 +74,38 @@ export class DetailSampleComponent implements OnInit {
     let that = this;
     that.urgentLoading = true;
     let postData = {
-      "urgentDetails": {
-        "workerOrder": this.orderInfo['id'],
-        "checkStatus": {
-          "id": 330
+      urgentDetails: {
+        workerOrder: this.orderInfo["id"],
+        checkStatus: {
+          id: 330,
         },
-        "urgentReason": this.orderInfo['urgentDetails'].urgentReason,
-        "id": this.orderInfo['urgentDetails'].id
-      }
-    }
-    that.mainService.coopWorkerOrder('urge', postData).subscribe(data => {
+        urgentReason: this.orderInfo["urgentDetails"].urgentReason,
+        id: this.orderInfo["urgentDetails"].id,
+      },
+    };
+    that.mainService.coopWorkerOrder("urge", postData).subscribe((data) => {
       that.urgentLoading = false;
       if (data.status == 200) {
-        that.showPromptModal('加急', true, '');
+        that.showPromptModal("加急", true, "");
       } else {
-        that.showPromptModal('加急', false, data.msg);
+        that.showPromptModal("加急", false, data.msg);
       }
-    })
+    });
   }
   // 获取工单历史记录
-  logList = [];//工单历史记录
+  logList = []; //工单历史记录
   getLog() {
     return this.mainService.getWorkOrderLog(this.id);
   }
 
   // 派单
   allotWorker() {
-    this.router.navigateByUrl('dispatchingDesk/allotWorker/' + this.id + '/' + this.orderInfo['gdState']['id']);
+    this.router.navigateByUrl(
+      "dispatchingDesk/allotWorker/" +
+        this.id +
+        "/" +
+        this.orderInfo["gdState"]["id"]
+    );
   }
 
   // 撤回
@@ -101,33 +119,35 @@ export class DetailSampleComponent implements OnInit {
     that.btnLoading = true;
     let postData = {
       workOrder: {
-        id: that.id
-      }
-    }
-    that.mainService.coopWorkerOrder('excuteWorkOrder/recall', postData).subscribe(data => {
-      that.btnLoading = false;
-      that.closeRecallOrderModal()
-      if (data.status == 200) {
-        that.showPromptModal('撤回', true, '');
-      } else {
-        that.showPromptModal('撤回', false, data.msg);
-      }
-    })
+        id: that.id,
+      },
+    };
+    that.mainService
+      .coopWorkerOrder("excuteWorkOrder/recall", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.closeRecallOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("撤回", true, "");
+        } else {
+          that.showPromptModal("撤回", false, data.msg);
+        }
+      });
   }
   // 撤回并删除
   recAndDel() {
     let that = this;
     that.recLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       console.log(data);
       that.recLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
   // 关闭撤回弹框
   closeRecallOrderModal() {
@@ -137,7 +157,7 @@ export class DetailSampleComponent implements OnInit {
   // 关闭弹框
   close() {
     // this.router.navigateByUrl('dispatchingDesk');
-    history.go(-1)
+    history.go(-1);
   }
 
   // 删除
@@ -150,15 +170,15 @@ export class DetailSampleComponent implements OnInit {
   confirmDel() {
     let that = this;
     that.btnLoading = true;
-    that.mainService.delOrder(that.id).subscribe(data => {
+    that.mainService.delOrder(that.id).subscribe((data) => {
       that.btnLoading = false;
-      that.closeDelOrderModal()
+      that.closeDelOrderModal();
       if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
+        that.showPromptModal("删除", true, "");
       } else {
-        that.showPromptModal('删除', false, data.msg);
+        that.showPromptModal("删除", false, data.msg);
       }
-    })
+    });
   }
 
   // 关闭模态框
@@ -177,34 +197,32 @@ export class DetailSampleComponent implements OnInit {
     }, 100);
   }
 
-
   // 格式化时分秒
   // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）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;
   }
 
-
   // 计算历史记录耗时
   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/share/hs-prompt-modal/hs-prompt-modal.component.html

@@ -3,7 +3,8 @@
     <div class="title">当前科室<i *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0"
         class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
-      <div class="defeat">{{currentDept.dept}}</div>
+      <div class="defeat"><span *ngIf="deptDisplay">{{deptDisplay==2?currentDept.deptalias:currentDept.dept}}</span>
+      </div>
       <div class="countDown" *ngIf="closeTimeFlag<0||closeTimeFlag>0&&closeTime>0"><span
           *ngIf="closeTimeFlag<0">关闭</span>倒计时<em>{{closeTime}}s</em></div>
     </div>
@@ -19,7 +20,7 @@
     <div class="content content-search">
       <div class="defeat-search display_flex justify-content_flex-center flex-direction_column">
         <span>当前院区：<em>{{currentHospital.hosName}}</em></span>
-        <span>当前科室：<em>{{currentDept.dept}}</em></span>
+        <span>当前科室：<em *ngIf="deptDisplay">{{deptDisplay==2?currentDept.deptalias:currentDept.dept}}</em></span>
       </div>
       <div class="form">
         <form nz-form [formGroup]="validateForm">
@@ -46,7 +47,8 @@
               <nz-select formControlName="dutyDeptFc" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
                 (nzOnSearch)="searchDept(validateForm.controls.hospital.value,$event)" nzPlaceHolder="请选择当值科室">
                 <ng-container *ngFor="let option of dutyDepts">
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                    [nzValue]="option.id"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -35,7 +35,13 @@ export class HsPromptModalComponent implements OnInit {
     private tool: ToolService
   ) {}
   searchDeptSubject = new Subject();
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   ngOnInit() {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
     this.searchDeptSubject.pipe(debounceTime(500)).subscribe((v: any) => {
       this.search(v.hosId, v.e);
     });
@@ -159,6 +165,7 @@ export class HsPromptModalComponent implements OnInit {
       department: {
         hospital: { id: hosId },
         keyWord: keywords,
+        nurseSign: 1,
       },
     };
     this.mainService

src/app/views/hushijiandan/hushijiandan.component.html

@@ -105,7 +105,7 @@
             <div class="wel">欢迎您：</div>
             <div class="user">
               <img src="../../assets/images/icon_keshi.png" alt="">
-              <span>{{loginUser.dept.dept}}</span>
+              <span *ngIf="deptDisplay">{{deptDisplay==2?loginUser.dept.deptalias:loginUser.dept.dept}}</span>
             </div>
             <div class="userInfo-wrap">
               <div class="logOut" (click)="changeKsNow()">切换科室</div>
@@ -355,7 +355,9 @@
                                                 (nzOnSearch)="searchDept('start',buildMsg,$event)"
                                                 nzPlaceHolder="请选择起点科室">
                                                 <ng-container *ngFor="let option of buildMsg.start.start.list">
-                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
+                                                  <nz-option *ngIf="true"
+                                                    [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                                                    [nzValue]="option.id">
                                                   </nz-option>
                                                 </ng-container>
                                                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -380,7 +382,9 @@
                                                 (nzOnSearch)="searchDept('target',buildMsg,$event)" nzAllowClear
                                                 nzPlaceHolder="请选择目标科室">
                                                 <ng-container *ngFor="let option of buildMsg.end.end.list">
-                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
+                                                  <nz-option *ngIf="true"
+                                                    [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                                                    [nzValue]="option.id">
                                                   </nz-option>
                                                 </ng-container>
                                                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -405,7 +409,9 @@
                                                 (nzOnSearch)="searchDept('start',buildMsg,$event)"
                                                 nzPlaceHolder="请选择起点科室">
                                                 <ng-container *ngFor="let option of buildMsg.start.start.list">
-                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
+                                                  <nz-option *ngIf="true"
+                                                    [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                                                    [nzValue]="option.id">
                                                   </nz-option>
                                                 </ng-container>
                                                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -423,7 +429,9 @@
                                                 (nzOnSearch)="searchDept('target',buildMsg,$event)"
                                                 nzPlaceHolder="请选择目标科室">
                                                 <ng-container *ngFor="let option of buildMsg.end.end.list">
-                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
+                                                  <nz-option *ngIf="true"
+                                                    [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                                                    [nzValue]="option.id">
                                                   </nz-option>
                                                 </ng-container>
                                                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -589,7 +597,7 @@
                           <td>{{ data.bedNum||'-' }}</td>
                           <td>{{data.arriveTime||'-'}}</td>
                           <td>{{ data.worker||'-' }}</td>
-                          <td>{{data.checkDept?data.checkDept.dept:'-'}}</td>
+                          <td>{{data.checkDept?(deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept):'-'}}</td>
                           <td>{{data.sendTime||'-'}}</td>
                           <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
                         </tr>
@@ -871,7 +879,8 @@
                   nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start',checkedShowMsg,$event)"
                   nzPlaceHolder="请选择起点科室">
                   <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
-                    <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                    <nz-option *ngIf="true" [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                      [nzValue]="option.id"></nz-option>
                   </ng-container>
                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
                     <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -888,7 +897,8 @@
                   nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target',checkedShowMsg,$event)"
                   nzPlaceHolder="请选择目标科室">
                   <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
-                    <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                    <nz-option *ngIf="true" [nzLabel]="deptDisplay==2?option.deptalias:option.dept"
+                      [nzValue]="option.id"></nz-option>
                   </ng-container>
                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
                     <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -980,7 +990,8 @@
               <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch
                 nzShowSearch (nzOnSearch)="searchDept('start',buildMsg1,$event)" nzPlaceHolder="请选择起点科室">
                 <ng-container *ngFor="let option of buildMsg1.start.start.list">
-                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="true" [nzLabel]="deptDisplay==2?option.deptalias:option.dept" [nzValue]="option.id">
+                  </nz-option>
                 </ng-container>
                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -1004,7 +1015,8 @@
               <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch
                 nzShowSearch (nzOnSearch)="searchDept('target',buildMsg1,$event)" nzAllowClear nzPlaceHolder="请选择目标科室">
                 <ng-container *ngFor="let option of buildMsg1.end.end.list">
-                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="true" [nzLabel]="deptDisplay==2?option.deptalias:option.dept" [nzValue]="option.id">
+                  </nz-option>
                 </ng-container>
                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -1028,7 +1040,8 @@
               <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch
                 nzShowSearch (nzOnSearch)="searchDept('start',buildMsg1,$event)" nzPlaceHolder="请选择起点科室">
                 <ng-container *ngFor="let option of buildMsg1.start.start.list">
-                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="true" [nzLabel]="deptDisplay==2?option.deptalias:option.dept" [nzValue]="option.id">
+                  </nz-option>
                 </ng-container>
                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -1042,7 +1055,8 @@
               <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch
                 nzShowSearch (nzOnSearch)="searchDept('target',buildMsg1,$event)" nzPlaceHolder="请选择目标科室">
                 <ng-container *ngFor="let option of buildMsg1.end.end.list">
-                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="true" [nzLabel]="deptDisplay==2?option.deptalias:option.dept" [nzValue]="option.id">
+                  </nz-option>
                 </ng-container>
                 <nz-option *ngIf="false" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -1226,7 +1240,7 @@
                   {{ detail.printDate || "-" }}
                 </td>
                 <td>
-                  {{ detail.checkDept ? detail.checkDept.dept : "-" }}
+                  {{ detail.checkDept ? (deptDisplay==2?detail.checkDept.deptalias:detail.checkDept.dept) : "-" }}
                   <div *ngIf="detail.urgent != 0" [class.ji]="detail.urgent == 1"></div>
                 </td>
               </tr>

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

@@ -132,7 +132,13 @@ export class HushijiandanComponent implements OnInit {
   logTimer = null; //综合日志定时器
   logTime = 0; //综合日志自动刷新秒数
   logTimeConst = 30; //综合日志自动刷新秒数
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   ngOnInit() {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
     this.getUpdateTipsForNurses();
     this.getSpecimenButton();
     this.getCloseTimeFlag();
@@ -746,7 +752,7 @@ export class HushijiandanComponent implements OnInit {
     ) {
       return; //固定科室范围禁用搜索
     }
-    let postData = {
+    let postData: any = {
       idx: 0,
       sum: 20,
       department: {
@@ -767,6 +773,7 @@ export class HushijiandanComponent implements OnInit {
     } else if (type == "target") {
       postData.department["ids"] = msg.end.deptIds || "";
     }
+    postData.department.nurseSign = 1;
     this.mainService
       .getFetchDataList("data", "department", postData)
       .subscribe((data) => {
@@ -1533,7 +1540,9 @@ export class HushijiandanComponent implements OnInit {
               label:
                 (e.yyTime || "") +
                 " " +
-                e.execDept.dept +
+                (this.deptDisplay == 2
+                  ? e.execDept.deptalias
+                  : e.execDept.dept) +
                 " 进行 " +
                 (e.inspectName || "检查"),
               value: e["id"],

src/app/views/sys-config/sys-config.component.html

@@ -23,6 +23,15 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
+          <nz-form-label [nzSpan]="24" nzFor="deptDisplay" nzRequired class="label">护士端科室显示选择</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请输入护士端科室显示选择!">
+            <nz-radio-group formControlName="deptDisplay">
+              <label nz-radio nzValue="1">科室名称</label>
+              <label nz-radio nzValue="2">科室别名</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item class="formItem">
           <nz-form-label [nzSpan]="12" nzFor="orderClearUserSwitch" nzRequired class="label">下班后是否自动调度重新分派
           </nz-form-label>
           <nz-form-control [nzSpan]="12" nzErrorTip="下班后是否自动调度重新分派是必填项!">

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

@@ -35,6 +35,7 @@ export class SysConfigComponent implements OnInit {
       defaultPwd: [null, [Validators.required]],
       effectiveDuration: [null, [Validators.required]],
       specimenButton: [null, [Validators.required]],
+      deptDisplay: [null, [Validators.required]],
       orderClearUserSwitch: [null, [Validators.required]],
       deptQRCode: [null, [Validators.required]],
       workOrderSettings: [5, [Validators.required]],
@@ -95,6 +96,7 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "pwd" ||
         item.keyconfig === "conversationSeconds" ||
         item.keyconfig === "specimenButton" ||
+        item.keyconfig === "deptDisplay" ||
         item.keyconfig === "orderClearUserSwitch" ||
         item.keyconfig === "deptQRCode" ||
         item.keyconfig === "workOrderSettings" ||
@@ -110,6 +112,8 @@ export class SysConfigComponent implements OnInit {
         item.valueconfig = this.validateForm.controls.effectiveDuration.value;
       } else if (item.keyconfig === "specimenButton") {
         item.valueconfig = this.validateForm.controls.specimenButton.value;
+      } else if (item.keyconfig === "deptDisplay") {
+        item.valueconfig = this.validateForm.controls.deptDisplay.value;
       } else if (item.keyconfig === "orderClearUserSwitch") {
         item.valueconfig =
           this.validateForm.controls.orderClearUserSwitch.value;
@@ -180,6 +184,9 @@ export class SysConfigComponent implements OnInit {
                 case "specimenButton":
                   this.validateForm.controls.specimenButton.setValue(c[1]);
                   break;
+                case "deptDisplay":
+                  this.validateForm.controls.deptDisplay.setValue(c[1]);
+                  break;
                 case "orderClearUserSwitch":
                   this.validateForm.controls.orderClearUserSwitch.setValue(
                     c[1]