护士端万能交接建单

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.4.105",
+		"target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/components/build-quick-confirm/build-quick-confirm.component.html

@@ -0,0 +1,208 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">{{buildQuickConfirmData.name}}<i class="icon_transport transport-guanbi" (click)="cancel()"></i>
+    </div>
+    <div class="contentBody">
+      <overlay-scrollbars #osComponentRef1 class="nav">
+        <div class="navItem ellipsis-oneline" [title]="item.taskName" [ngClass]="{ active: activeTabId === item.id }" (click)="clickTab(item)" *ngFor="let item of buildQuickConfirmData.taskTypeList">{{item.taskName}}</div>
+      </overlay-scrollbars>
+      <div class="body modalBody_box">
+        <div class="modalBody_left" *ngIf="!nLoading && activeTabId">
+          <overlay-scrollbars #osComponentRef2 class="modalBody_left_box">
+            <div class="modalBody_left_box">
+              <div style="flex:1 1 auto; display: flex; flex-direction: column; justify-content: center; align-items: center;">
+                <div class="content txtC" *ngIf="buildMsg.status == 100013 || buildMsg.status == 100014 || buildMsg.status == 100015">
+                  <div class="defeat" [innerHTML]="buildMsg.msg"></div>
+                </div>
+                <!-- 200 该任务类型运送过程暂未配置 -->
+                <div class="content txtC" *ngIf="buildMsg.status == 200 && buildType == 'specimen'">
+                  <div class="defeat" [innerHTML]="buildMsg.msg"></div>
+                </div>
+                <!-- 100009 该任务类型运送过程暂未配置 -->
+                <div class="content txtC" *ngIf="buildMsg.status == 100009">
+                  <div class="defeat" [innerHTML]="buildMsg.msg"></div>
+                </div>
+                <!-- 100010 系统未查询到该任务类型关联信息 -->
+                <div class="content txtC" *ngIf="buildMsg.status == 100010">
+                  <div class="defeat" [innerHTML]="buildMsg.msg"></div>
+                </div>
+                <!-- 100012 （护士端一键建单展示策略）直接取msg -->
+                <div class="content txtC" *ngIf="buildMsg.status == 100012">
+                  <div class="defeat" [innerHTML]="buildMsg.msg"></div>
+                </div>
+                <!-- 100013 （护士端一键建单展示策略）取起点科室，和mgs值展示 -->
+                <div class="content" *ngIf="buildMsg.status == 100013">
+                  <div>
+                    <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
+                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                            <ng-container *ngFor="let option of buildMsg.start.start.list">
+                              <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>
+                              搜索中...
+                            </nz-option>
+                          </nz-select>
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
+                          {{deptDisplay == 2 ? buildMsg.end.end.list[0].deptalias : buildMsg.end.end.list[0].dept}}
+                        </nz-form-control>
+                      </nz-form-item>
+                    </form>
+                  </div>
+                </div>
+                <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
+                <div class="content" *ngIf="buildMsg.status == 100014">
+                  <div>
+                    <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
+                          {{deptDisplay == 2 ? buildMsg.start.start.list[0].deptalias : buildMsg.start.start.list[0].dept}}
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
+                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
+                            <ng-container *ngFor="let option of buildMsg.end.end.list">
+                              <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>
+                              搜索中...
+                            </nz-option>
+                          </nz-select>
+                        </nz-form-control>
+                      </nz-form-item>
+                    </form>
+                  </div>
+                </div>
+                <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
+                <div class="content" *ngIf="buildMsg.status == 100015">
+                  <div>
+                    <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
+                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                            <ng-container *ngFor="let option of buildMsg.start.start.list">
+                              <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>
+                              搜索中...
+                            </nz-option>
+                          </nz-select>
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
+                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
+                            <ng-container *ngFor="let option of buildMsg.end.end.list">
+                              <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>
+                              搜索中...
+                            </nz-option>
+                          </nz-select>
+                        </nz-form-control>
+                      </nz-form-item>
+                    </form>
+                  </div>
+                </div>
+                <!-- 其他 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
+                <div class="content" *ngIf="buildMsg.status != 100013 && buildMsg.status != 100014 && buildMsg.status != 100015">
+                  <div>
+                    <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
+                          {{deptDisplay == 2 ? buildMsg.start.start.list[0].deptalias : buildMsg.start.start.list[0].dept}}
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item nz-row>
+                        <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                        <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
+                          {{deptDisplay == 2 ? buildMsg.end.end.list[0].deptalias : buildMsg.end.end.list[0].dept}}
+                        </nz-form-control>
+                      </nz-form-item>
+                    </form>
+                  </div>
+                </div>
+                <!-- 工号 -->
+                <div style="width: 100%; margin: 10px auto 0" *ngIf="buildMsg.reserveUserSwitch == 1">
+                  <p><span class="red">*</span>工号：</p>
+                  <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择工号" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
+                    <ng-container *ngFor="let option of accountList">
+                      <nz-option *ngIf="!isLoading" [nzLabel]="option.account + '-' + option.name" [nzValue]="option.id">
+                      </nz-option>
+                    </ng-container>
+                    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                      <i nz-icon nzType="loading" class="loading-icon"></i>
+                      搜索中...
+                    </nz-option>
+                  </nz-select>
+                </div>
+                <!-- 工单备注： -->
+                <div class="w100" *ngIf="buildMsg.remarksSwitch == 1">
+                  <div nz-row class="tabRow">
+                    <div nz-col [nzSpan]="6">
+                      <p>工单备注：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <textarea nz-input [placeholder]="workOrderRemarkTips" [nzAutosize]="{minRows: 3, maxRows: 5}" maxlength="100" [(ngModel)]="workOrderRemark" #remarksEle></textarea>
+                    </div>
+                  </div>
+
+                  <div nz-row class="tabRow" *ngIf="customRemarks.length">
+                    <div nz-col [nzSpan]="6">
+                      <p>快捷输入：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <span class="addRemarks" *ngFor="let item of customRemarks" (click)="addRemarks(item)">【{{ item }}】</span>
+                    </div>
+                  </div>
+
+                  <div nz-row class="tabRow" *ngIf="historyCustomRemarks.length">
+                    <div nz-col [nzSpan]="6">
+                      <p>历史输入：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <span class="addRemarks" *ngFor="let item of historyCustomRemarks" (click)="addRemarks(item)">【{{item }}】</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div *ngIf="selectOtherId" class="btns display_flex justify-content_flex-center">
+                <button *ngIf="buildMsg.status != 100009 && buildMsg.status != 100010" nz-button nzType="primary" [nzLoading]="loading5" (click)="confirmShortcut()">
+                  确认
+                </button>
+              </div>
+            </div>
+          </overlay-scrollbars>
+        </div>
+        <div class="modalBody_left nLoading" *ngIf="nLoading">
+          <img src="../../../assets/images/loading.gif" alt="" />
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center btns">
+      <button class="mr8" nzType="default" nz-button (click)="cancel()">取消</button>
+      <button nzType="primary" nz-button (click)="confirm()" *ngIf="buildMsg.status != 100009 && buildMsg.status != 100010" [nzLoading]="loading5">确认</button>
+    </div>
+  </div>
+</div>

src/app/components/build-quick-confirm/build-quick-confirm.component.less

@@ -0,0 +1,148 @@
+@import "../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 855px;
+    height: 621px;
+    background: #fff;
+    border-radius: 4px;
+    padding: 14px 24px 10px 24px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 16px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 16px;
+        color: #666;
+        cursor: pointer;
+      }
+    }
+
+    .contentBody {
+      width: 100%;
+      height: 517px;
+      margin-top: 14px;
+      background: #F9FAFB;
+      border-radius: 4px;
+      border: 1px solid rgba(0,0,0,0.25);
+      display: flex;
+      overflow: hidden;
+      .nav{
+        width: 182px;
+        height: 100%;
+        flex-shrink: 1;
+        border-right: 1px solid #CCCCCC;
+        .navItem{
+          height: 48px;
+          line-height: 48px;
+          font-size: 14px;
+          padding: 0 16px;
+          cursor: pointer;
+          &.active{
+            background: #F0F6ED;
+            color: @primary-color;
+          }
+        }
+      }
+      .body{
+        flex: 1;
+        height: 100%;
+        .addRemarks {
+          color: @primary-color;
+          cursor: pointer;
+        }
+        .modalBody_left {
+          width: 100%;
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+
+          &.nLoading,
+          &.noData {
+            justify-content: center;
+            align-items: center;
+
+            img {
+              width: 24px;
+            }
+
+            div {
+              display: inline-block;
+            }
+          }
+        }
+
+        .modalBody_left_box {
+          height: 100%;
+          box-sizing: border-box;
+          padding: 8px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+      }
+    }
+  }
+  .btns{
+    margin-top: 10px;
+  }
+  .modalBody_box {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .content {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      & > div {
+        width: 100%;
+      }
+
+      .shortcutForm {
+        width: 100%;
+
+        .ant-form-item-label {
+          text-align: right;
+        }
+      }
+    }
+
+    .btns {
+      padding-bottom: 16px;
+      padding-top: 16px;
+    }
+  }
+  .defeat{
+    text-align: center;
+    margin-bottom: 16px;
+  }
+  .tabRow{
+    margin-bottom: 32px;
+    word-break: break-all;
+    p{
+      text-align: right;
+      margin-bottom: 0;
+    }
+  }
+}

src/app/components/build-quick-confirm/build-quick-confirm.component.ts

@@ -0,0 +1,194 @@
+import { Component, OnInit, Output, Input, ViewChild, ElementRef } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-build-quick-confirm',
+  templateUrl: './build-quick-confirm.component.html',
+  styleUrls: ['./build-quick-confirm.component.less']
+})
+export class BuildQuickConfirmComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
+  @Output() cancelModal = new EventEmitter();
+  @Output() confirmModal = new EventEmitter();
+  @Input() buildQuickConfirmData: any = {};//数据
+  @Input() loading5: boolean = false;//loading
+  allHospital: any;//所有院区
+  hosLoading: boolean = false;//确定按钮的loading
+  configurationCenterMenus: any[] = [];//配置中心菜单
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    public tool: ToolService,
+  ) { }
+
+  ngOnInit() {
+    this.buildQuickConfirmData.taskTypeList = this.buildQuickConfirmData.taskTypeList || [];
+    if(this.buildQuickConfirmData.taskTypeList.length > 0){
+      this.clickTab(this.buildQuickConfirmData.taskTypeList[0]);
+    }
+    console.log(this.buildQuickConfirmData)
+  }
+
+  activeTabId:any;
+  clickTab(data){
+    this.activeTabId = data.id;
+    this.newShortcutOrder(data, data.associationType.value);
+  }
+
+  // 建单条件
+  workOrderRemark = ""; //备注
+  customRemarks = []; //备注快速输入
+  shortcutMsg; //一键发起信息
+  buildMsg: any = {}; //一键发起返回信息
+  buildType: string = ""; //快捷建单类型
+  historyCustomRemarks = []; //历史快捷输入
+  workOrderRemarkTips = ""; //备注提示
+  nLoading = false;
+  newShortcutOrder(data, type) {
+    this.workOrderRemark = "";
+    this.customRemarks = [];
+    this.historyCustomRemarks = [];
+    console.log(data, type);
+    this.buildType = type;
+    this.shortcutMsg = data;
+    this.initForm();
+    this.buildMsg = {};
+    let postData:any = {
+      taskTypeId: data.id,
+    };
+    if(data.associationType.value === 'specimen'){
+      postData.deptId = this.tool.getCurrentUserDept().id;
+    }
+    this.nLoading = true;
+    this.mainService
+      .postCustom("nurse", "workOrder/buildTrip", postData)
+      .subscribe((result) => {
+        this.buildMsg = result;
+        if (result.remarksSwitch == 1) {
+          if (result.customRemarks === null || result.customRemarks === "") {
+            this.customRemarks = [];
+          } else {
+            this.customRemarks = result.customRemarks.split("$");
+          }
+          this.workOrderRemarkTips =
+            result.remarksPrompts || "请填写工单备注,不超过100个字符";
+          let user = JSON.parse(localStorage.getItem("user"));
+          this.mainService
+            .postCustom("nurse", "workOrder/recentRemarks", {
+              deptId: user.user.dept.id,
+              taskTypeId: data.id,
+            })
+            .subscribe((result1) => {
+              this.nLoading = false;
+              if (result1.state == 200) {
+                this.historyCustomRemarks = result1.data;
+              }
+            });
+        } else {
+          this.nLoading = false;
+        }
+      });
+  }
+
+  // 初始化form表单
+  shortcutForm: FormGroup; //一键发起建单表单
+  initForm() {
+    // 初始化一键发起建单表单
+    this.shortcutForm = this.fb.group({
+      targetOffice: [null, [this.targetOfficeShortCutValidator]],
+      originOffice: [null, [this.originOfficeShortCutValidator]],
+    });
+  }
+
+  // 起点科室校验
+  originOfficeShortCutValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (this.shortcutForm && this.shortcutForm.value && !control.value && (this.buildMsg.status == 100013 || this.buildMsg.status == 100015)) {
+      return { required: true };
+    }
+  };
+  // 目标科室校验
+  targetOfficeShortCutValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (this.shortcutForm && this.shortcutForm.value && !control.value && (this.buildMsg.status == 100014 || this.buildMsg.status == 100015)) {
+      return { required: true };
+    }
+  };
+
+  // 添加备注
+  addRemarks(item) {
+    this.remarksEle.nativeElement.focus();
+    this.workOrderRemark += item;
+  }
+
+  // 目标科室输入搜索
+  searchDept(type, msg, e) {
+    this.getDeptList(type, msg, e);
+  }
+
+  // 获取科室
+  isLoading:boolean = false;
+  getDeptList(type, msg, key?): void {
+    // 返回值的status是201 则是默认发起科室
+    // 返回值的status是202 则是固定科室范围
+    // 返回值的status是203 则是固定科室
+    // 返回值的status是204 则是自主填写
+    // 返回值的status是205 则是固定科室类型
+    if (
+      (type == "start" && msg.start.start.departmentStrategy == 202) ||
+      (type == "target" && msg.end.end.departmentStrategy == 202)
+    ) {
+      return; //固定科室范围禁用搜索
+    }
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,
+        cascadeHosId: this.tool.getCurrentHospital().id
+      },
+    };
+    if (key) {
+      postData.department["keyWord"] = key;
+    }
+    if (type == "start" && msg.start.start.departmentStrategy == 205) {
+      postData.department["type"] = { id: msg.start.start.startTypeId };
+    } else if (type == "target" && msg.end.end.departmentStrategy == 205) {
+      postData.department["type"] = { id: msg.end.end.endTypeId };
+    }
+    if (type == "start") {
+      postData.department["ids"] = msg.start.deptIds || "";
+    } else if (type == "target") {
+      postData.department["ids"] = msg.end.deptIds || "";
+    }
+    postData.department.nurseSign = 1;
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        if (type == "target") {
+          msg.end.end.list = data.list;
+        } else if (type == "start") {
+          msg.start.start.list = data.list;
+        }
+      });
+  }
+
+  // 取消
+  cancel() {
+    this.cancelModal.emit(false)
+  }
+  // 确认
+  confirm() {
+    let taskType = this.buildQuickConfirmData.taskTypeList.find(item => item.id == this.activeTabId);
+    this.confirmModal.emit({taskType, shortcutForm: this.shortcutForm, buildMsg: this.buildMsg, workOrderRemark: this.workOrderRemark})
+  }
+}

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

@@ -349,13 +349,13 @@
                 </div>
                 <div class="nums borderB nurseNav" nz-row *ngSwitchDefault>
                   <div class="nav">
-                    <div class="navItem" *ngFor="let item of pagePermissionConfigList">
+                    <div class="navItem" *ngFor="let item of pagePermissionConfigList" (click)="buildQuick(item)">
                       <div class="navIcon" [ngClass]="backColorComputed(item.icon.extra1)"><i class="icon_transport" [ngClass]="[item.icon.extra1]"></i></div>
                       <div class="navContent">
                         <h2>{{item.name}}</h2>
                         <div class="navSpecimen" *ngIf="item.urgentFlag || item.ordinaryFlag">
-                          <span *ngIf="item.urgentFlag">急:<span class="red">{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</span></span>
-                          <span *ngIf="item.ordinaryFlag">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
+                          <span *ngIf="item.urgentFlag" (click)="changeSpeDetail($event, 1)">急:<span class="red">{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</span></span>
+                          <span *ngIf="item.ordinaryFlag" (click)="changeSpeDetail($event, 0)">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
                         </div>
                       </div>
                     </div>
@@ -531,52 +531,21 @@
                     <div class="otherBoxInner">
                       <div class="otherBox-nav">
                         <div class="otherBox-nav__head">
-                          <input
-                            nz-input
-                            placeholder="请输入关键字"
-                            [(ngModel)]="otherSearch"
-                            (ngModelChange)="otherSearchChange()"
-                          />
+                          <input nz-input placeholder="请输入关键字" [(ngModel)]="otherSearch" (ngModelChange)="otherSearchChange()" />
                         </div>
-                        <overlay-scrollbars
-                          #osComponentRef2
-                          class="otherBox-nav__main"
-                          [ngStyle]="{ height: '100%' }"
-                        >
-                          <div
-                            class="otherBox-nav__mainInner"
-                            *ngIf="!oLoading && othersList[checkedTableType]?.length > 0"
-                          >
-                            <div
-                              [sortablejs]="othersList[checkedTableType]"
-                              [sortablejsOptions]="othersListOptions"
-                              class="w100"
-                            >
-                              <div
-                                class="otherBox-nav__mainItem"
-                                *ngFor="let item of othersList[checkedTableType]"
-                                (click)="otherClick(item)"
-                                [ngClass]="{ active: selectOtherId == item.id }"
-                                [title]="item.taskName"
-                              >
+                        <overlay-scrollbars #osComponentRef2 class="otherBox-nav__main" [ngStyle]="{ height: '100%' }">
+                          <div class="otherBox-nav__mainInner" *ngIf="!oLoading && othersList[checkedTableType]?.length > 0">
+                            <div [sortablejs]="othersList[checkedTableType]" [sortablejsOptions]="othersListOptions" class="w100">
+                              <div class="otherBox-nav__mainItem" *ngFor="let item of othersList[checkedTableType]" (click)="otherClick(item)" [ngClass]="{ active: selectOtherId == item.id }" [title]="item.taskName">
                                 {{ item.taskName }}
                               </div>
                             </div>
                           </div>
-                          <div
-                            class="otherBox-nav__mainInner noData"
-                            *ngIf="!oLoading && othersList[checkedTableType].length == 0"
-                          >
+                          <div class="otherBox-nav__mainInner noData" *ngIf="!oLoading && othersList[checkedTableType].length == 0">
                             暂无数据
                           </div>
-                          <div
-                            class="otherBox-nav__mainInner oLoading"
-                            *ngIf="oLoading"
-                          >
-                            <img
-                              src="../../../assets/images/loading.gif"
-                              alt=""
-                            />
+                          <div class="otherBox-nav__mainInner oLoading" *ngIf="oLoading">
+                            <img src="../../../assets/images/loading.gif" alt="" />
                             <div>加载中...</div>
                           </div>
                         </overlay-scrollbars>
@@ -586,147 +555,43 @@
                           <!-- -----------------start------------------ -->
                           <div class="modalBody_box">
                             <div class="modalBody">
-                              <div
-                                class="modalBody_left"
-                                *ngIf="!nLoading && selectOtherId"
-                              >
-                                <overlay-scrollbars
-                                  class="modalBody_left_box"
-                                  #osComponentRef3
-                                  style="height: calc(100vh - 263px)"
-                                >
+                              <div class="modalBody_left" *ngIf="!nLoading && selectOtherId">
+                                <overlay-scrollbars class="modalBody_left_box" #osComponentRef3 style="height: calc(100vh - 263px)">
                                   <div class="modalBody_left_box">
-                                    <div
-                                      style="
-                                        flex:1 1 auto;
-                                        display: flex;
-                                        flex-direction: column;
-                                        justify-content: center;
-                                        align-items: center;
-                                      "
-                                    >
-                                      <div
-                                        class="content txtC"
-                                        *ngIf="
-                                          buildMsg.status == 100013 ||
-                                          buildMsg.status == 100014 ||
-                                          buildMsg.status == 100015
-                                        "
-                                      >
-                                        <div
-                                          class="defeat"
-                                          [innerHTML]="buildMsg.msg"
-                                        ></div>
+                                    <div style="flex:1 1 auto; display: flex; flex-direction: column; justify-content: center; align-items: center;">
+                                      <div class="content txtC" *ngIf="buildMsg.status == 100013 || buildMsg.status == 100014 || buildMsg.status == 100015">
+                                        <div class="defeat" [innerHTML]="buildMsg.msg"></div>
                                       </div>
                                       <!-- 200 该任务类型运送过程暂未配置 -->
-                                      <div
-                                        class="content txtC"
-                                        *ngIf="
-                                          buildMsg.status == 200 &&
-                                          buildType == 'bb'
-                                        "
-                                      >
-                                        <div
-                                          class="defeat"
-                                          [innerHTML]="buildMsg.msg"
-                                        ></div>
+                                      <div class="content txtC" *ngIf="buildMsg.status == 200 && buildType == 'bb'">
+                                        <div class="defeat" [innerHTML]="buildMsg.msg"></div>
                                       </div>
                                       <!-- 100009 该任务类型运送过程暂未配置 -->
-                                      <div
-                                        class="content txtC"
-                                        *ngIf="buildMsg.status == 100009"
-                                      >
-                                        <div
-                                          class="defeat"
-                                          [innerHTML]="buildMsg.msg"
-                                        ></div>
+                                      <div class="content txtC" *ngIf="buildMsg.status == 100009">
+                                        <div class="defeat" [innerHTML]="buildMsg.msg"></div>
                                       </div>
                                       <!-- 100010 系统未查询到该任务类型关联信息 -->
-                                      <div
-                                        class="content txtC"
-                                        *ngIf="buildMsg.status == 100010"
-                                      >
-                                        <div
-                                          class="defeat"
-                                          [innerHTML]="buildMsg.msg"
-                                        ></div>
+                                      <div class="content txtC" *ngIf="buildMsg.status == 100010">
+                                        <div class="defeat" [innerHTML]="buildMsg.msg"></div>
                                       </div>
                                       <!-- 100012 （护士端一键建单展示策略）直接取msg -->
-                                      <div
-                                        class="content txtC"
-                                        *ngIf="buildMsg.status == 100012"
-                                      >
-                                        <div
-                                          class="defeat"
-                                          [innerHTML]="buildMsg.msg"
-                                        ></div>
+                                      <div class="content txtC" *ngIf="buildMsg.status == 100012">
+                                        <div class="defeat" [innerHTML]="buildMsg.msg"></div>
                                       </div>
                                       <!-- 100013 （护士端一键建单展示策略）取起点科室，和mgs值展示 -->
-                                      <div
-                                        class="content"
-                                        *ngIf="buildMsg.status == 100013"
-                                      >
+                                      <div class="content" *ngIf="buildMsg.status == 100013">
                                         <div>
-                                          <form
-                                            nz-form
-                                            [formGroup]="shortcutForm"
-                                            class="shortcutForm"
-                                          >
+                                          <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
                                             <nz-form-item>
-                                              <nz-form-label
-                                                [nzSm]="6"
-                                                [nzXs]="24"
-                                                nzRequired
-                                                nzFor="originOffice"
-                                                >起点科室
-                                              </nz-form-label>
-                                              <nz-form-control
-                                                nzErrorTip="请选择起点科室!"
-                                              >
-                                                <nz-select
-                                                  class="w100"
-                                                  formControlName="originOffice"
-                                                  [nzDropdownMatchSelectWidth]="
-                                                    false
-                                                  "
-                                                  nzServerSearch
-                                                  nzShowSearch
-                                                  (nzOnSearch)="
-                                                    searchDept(
-                                                      'start',
-                                                      buildMsg,
-                                                      $event
-                                                    )
-                                                  "
-                                                  nzPlaceHolder="请选择起点科室"
-                                                >
-                                                  <ng-container
-                                                    *ngFor="
-                                                      let option of buildMsg.start
-                                                        .start.list
-                                                    "
-                                                  >
-                                                    <nz-option
-                                                      *ngIf="true"
-                                                      [nzLabel]="
-                                                        deptDisplay == 2
-                                                          ? option.deptalias
-                                                          : option.dept
-                                                      "
-                                                      [nzValue]="option.id"
-                                                    >
+                                              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                                              <nz-form-control nzErrorTip="请选择起点科室!">
+                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                                                  <ng-container *ngFor="let option of buildMsg.start.start.list">
+                                                    <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>
+                                                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                                                    <i nz-icon nzType="loading" class="loading-icon"></i>
                                                     搜索中...
                                                   </nz-option>
                                                 </nz-select>
@@ -736,72 +601,19 @@
                                         </div>
                                       </div>
                                       <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-                                      <div
-                                        class="content"
-                                        *ngIf="buildMsg.status == 100014"
-                                      >
+                                      <div class="content" *ngIf="buildMsg.status == 100014">
                                         <div>
-                                          <form
-                                            nz-form
-                                            [formGroup]="shortcutForm"
-                                            class="shortcutForm"
-                                          >
+                                          <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
                                             <nz-form-item>
-                                              <nz-form-label
-                                                [nzSm]="6"
-                                                [nzXs]="24"
-                                                nzRequired
-                                                nzFor="targetOffice"
-                                                >目标科室
-                                              </nz-form-label>
-                                              <nz-form-control
-                                                nzErrorTip="请选择目标科室!"
-                                              >
-                                                <nz-select
-                                                  class="w100"
-                                                  formControlName="targetOffice"
-                                                  [nzDropdownMatchSelectWidth]="
-                                                    false
-                                                  "
-                                                  nzServerSearch
-                                                  nzShowSearch
-                                                  (nzOnSearch)="
-                                                    searchDept(
-                                                      'target',
-                                                      buildMsg,
-                                                      $event
-                                                    )
-                                                  "
-                                                  nzAllowClear
-                                                  nzPlaceHolder="请选择目标科室"
-                                                >
-                                                  <ng-container
-                                                    *ngFor="
-                                                      let option of buildMsg.end
-                                                        .end.list
-                                                    "
-                                                  >
-                                                    <nz-option
-                                                      *ngIf="true"
-                                                      [nzLabel]="
-                                                        deptDisplay == 2
-                                                          ? option.deptalias
-                                                          : option.dept
-                                                      "
-                                                      [nzValue]="option.id"
-                                                    >
+                                              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                                              <nz-form-control nzErrorTip="请选择目标科室!">
+                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
+                                                  <ng-container *ngFor="let option of buildMsg.end.end.list">
+                                                    <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>
+                                                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                                                    <i nz-icon nzType="loading" class="loading-icon"></i>
                                                     搜索中...
                                                   </nz-option>
                                                 </nz-select>
@@ -811,131 +623,34 @@
                                         </div>
                                       </div>
                                       <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-                                      <div
-                                        class="content"
-                                        *ngIf="buildMsg.status == 100015"
-                                      >
+                                      <div class="content" *ngIf="buildMsg.status == 100015">
                                         <div>
-                                          <form
-                                            nz-form
-                                            [formGroup]="shortcutForm"
-                                            class="shortcutForm"
-                                          >
+                                          <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
                                             <nz-form-item>
-                                              <nz-form-label
-                                                [nzSm]="6"
-                                                [nzXs]="24"
-                                                nzRequired
-                                                nzFor="originOffice"
-                                                >起点科室
-                                              </nz-form-label>
-                                              <nz-form-control
-                                                nzErrorTip="请选择起点科室!"
-                                              >
-                                                <nz-select
-                                                  class="w100"
-                                                  formControlName="originOffice"
-                                                  [nzDropdownMatchSelectWidth]="
-                                                    false
-                                                  "
-                                                  nzServerSearch
-                                                  nzShowSearch
-                                                  (nzOnSearch)="
-                                                    searchDept(
-                                                      'start',
-                                                      buildMsg,
-                                                      $event
-                                                    )
-                                                  "
-                                                  nzPlaceHolder="请选择起点科室"
-                                                >
-                                                  <ng-container
-                                                    *ngFor="
-                                                      let option of buildMsg.start
-                                                        .start.list
-                                                    "
-                                                  >
-                                                    <nz-option
-                                                      *ngIf="true"
-                                                      [nzLabel]="
-                                                        deptDisplay == 2
-                                                          ? option.deptalias
-                                                          : option.dept
-                                                      "
-                                                      [nzValue]="option.id"
-                                                    >
+                                              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+                                              <nz-form-control nzErrorTip="请选择起点科室!">
+                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                                                  <ng-container *ngFor="let option of buildMsg.start.start.list">
+                                                    <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>
+                                                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                                                    <i nz-icon nzType="loading" class="loading-icon"></i>
                                                     搜索中...
                                                   </nz-option>
                                                 </nz-select>
                                               </nz-form-control>
                                             </nz-form-item>
                                             <nz-form-item>
-                                              <nz-form-label
-                                                [nzSm]="6"
-                                                [nzXs]="24"
-                                                nzRequired
-                                                nzFor="targetOffice"
-                                                >目标科室
-                                              </nz-form-label>
-                                              <nz-form-control
-                                                nzErrorTip="请选择目标科室!"
-                                              >
-                                                <nz-select
-                                                  class="w100"
-                                                  formControlName="targetOffice"
-                                                  [nzDropdownMatchSelectWidth]="
-                                                    false
-                                                  "
-                                                  nzServerSearch
-                                                  nzShowSearch
-                                                  (nzOnSearch)="
-                                                    searchDept(
-                                                      'target',
-                                                      buildMsg,
-                                                      $event
-                                                    )
-                                                  "
-                                                  nzPlaceHolder="请选择目标科室"
-                                                >
-                                                  <ng-container
-                                                    *ngFor="
-                                                      let option of buildMsg.end
-                                                        .end.list
-                                                    "
-                                                  >
-                                                    <nz-option
-                                                      *ngIf="true"
-                                                      [nzLabel]="
-                                                        deptDisplay == 2
-                                                          ? option.deptalias
-                                                          : option.dept
-                                                      "
-                                                      [nzValue]="option.id"
-                                                    >
+                                              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+                                              <nz-form-control nzErrorTip="请选择目标科室!">
+                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
+                                                  <ng-container *ngFor="let option of buildMsg.end.end.list">
+                                                    <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>
+                                                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                                                    <i nz-icon nzType="loading" class="loading-icon"></i>
                                                     搜索中...
                                                   </nz-option>
                                                 </nz-select>
@@ -945,10 +660,7 @@
                                         </div>
                                       </div>
                                       <!-- 工号 -->
-                                      <div
-                                        style="width: 100%; margin: 10px auto 0"
-                                        *ngIf="buildMsg.reserveUserSwitch == 1"
-                                      >
+                                      <div style="width: 100%; margin: 10px auto 0" *ngIf="buildMsg.reserveUserSwitch == 1">
                                         <p><span class="red">*</span>工号：</p>
                                         <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择工号" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
                                           <ng-container *ngFor="let option of accountList">
@@ -962,88 +674,36 @@
                                         </nz-select>
                                       </div>
                                       <!-- 工单备注： -->
-                                      <div
-                                        style="width: 100%; margin: 10px auto 0"
-                                        *ngIf="buildMsg.remarksSwitch == 1"
-                                      >
+                                      <div style="width: 100%; margin: 10px auto 0" *ngIf="buildMsg.remarksSwitch == 1">
                                         <p>工单备注：</p>
-                                        <textarea
-                                          nz-input
-                                          [placeholder]="workOrderRemarkTips"
-                                          [nzAutosize]="{
-                                            minRows: 3,
-                                            maxRows: 5
-                                          }"
-                                          maxlength="100"
-                                          [(ngModel)]="workOrderRemark"
-                                          #remarksEle
-                                        ></textarea>
-                                        <p
-                                          class="mt8 mb8"
-                                          *ngIf="customRemarks.length"
-                                        >
+                                        <textarea nz-input [placeholder]="workOrderRemarkTips" [nzAutosize]="{minRows: 3, maxRows: 5}" maxlength="100" [(ngModel)]="workOrderRemark" #remarksEle></textarea>
+                                        <p class="mt8 mb8" *ngIf="customRemarks.length">
                                           快捷输入：
                                         </p>
                                         <div *ngIf="customRemarks.length">
-                                          <span
-                                            class="addRemarks"
-                                            *ngFor="let item of customRemarks"
-                                            (click)="addRemarks(item)"
-                                            >【{{ item }}】</span
-                                          >
+                                          <span class="addRemarks" *ngFor="let item of customRemarks" (click)="addRemarks(item)">【{{ item }}】</span>
                                         </div>
-                                        <p
-                                          class="mt8 mb8"
-                                          *ngIf="historyCustomRemarks.length"
-                                        >
+                                        <p class="mt8 mb8" *ngIf="historyCustomRemarks.length">
                                           历史输入：
                                         </p>
                                         <div *ngIf="historyCustomRemarks.length">
-                                          <span
-                                            class="addRemarks"
-                                            *ngFor="
-                                              let item of historyCustomRemarks
-                                            "
-                                            (click)="addRemarks(item)"
-                                            >【{{ item }}】</span
-                                          >
+                                          <span class="addRemarks" *ngFor="let item of historyCustomRemarks" (click)="addRemarks(item)">【{{item }}】</span>
                                         </div>
                                       </div>
                                     </div>
-                                    <div
-                                      *ngIf="selectOtherId"
-                                      class="btns display_flex justify-content_flex-center"
-                                    >
-                                      <button
-                                        *ngIf="
-                                          buildMsg.status != 100009 &&
-                                          buildMsg.status != 100010
-                                        "
-                                        nz-button
-                                        nzType="primary"
-                                        [nzLoading]="loading5"
-                                        (click)="confirmShortcut()"
-                                      >
+                                    <div *ngIf="selectOtherId" class="btns display_flex justify-content_flex-center">
+                                      <button *ngIf="buildMsg.status != 100009 && buildMsg.status != 100010" nz-button nzType="primary" [nzLoading]="loading5" (click)="confirmShortcut()">
                                         确认
                                       </button>
                                     </div>
                                   </div>
                                 </overlay-scrollbars>
                               </div>
-                              <div
-                                class="modalBody_left nLoading"
-                                *ngIf="nLoading"
-                              >
-                                <img
-                                  src="../../../assets/images/loading.gif"
-                                  alt=""
-                                />
+                              <div class="modalBody_left nLoading" *ngIf="nLoading">
+                                <img src="../../../assets/images/loading.gif" alt="" />
                                 <div>加载中...</div>
                               </div>
-                              <div
-                                class="modalBody_left noData"
-                                *ngIf="!nLoading && !selectOtherId"
-                              >
+                              <div class="modalBody_left noData" *ngIf="!nLoading && !selectOtherId">
                                 暂无数据
                               </div>
                               <div class="modalBody_right">
@@ -3406,3 +3066,6 @@
     </label>
   </div>
 </nz-modal>
+
+<!-- 快捷方式建单弹窗 -->
+<app-build-quick-confirm *ngIf="isShowBuildQuickConfirm" [buildQuickConfirmData]="buildQuickConfirmData" (cancelModal)="cancelBuildQuickConfirm($event)" (confirmModal)="confirmBuildQuickConfirm($event)" [loading5]="loadingQuick"></app-build-quick-confirm>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1359,6 +1359,11 @@
                     display: flex;
                     align-items: center;
                     cursor: pointer;
+                    .navContent{
+                      display: flex;
+                      flex-direction: column;
+                      height: 40px;
+                    }
                     .navIcon{
                       color: #fff;
                       border-radius: 4px;

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

@@ -599,6 +599,7 @@ export class HushijiandanComponent implements OnInit {
             v.ordinaryFlag = urgentIds.some(v => v == 2);
           }
         })
+        this.pagePermissionConfigList = pagePermissionConfigList;
 			});
   }
   // 获取系统配置
@@ -939,7 +940,7 @@ export class HushijiandanComponent implements OnInit {
   // 关闭其他建单保存结果
   closeModel(e) {
     console.log(e);
-    if (e === "other") {
+    if (e === "other" || e === "ordinary") {
       this.osComponentRef2.osInstance().scroll({ x: 0, y: this.positionY });
       this.getOrderList();
     } else if (e === "bb") {
@@ -3243,7 +3244,8 @@ export class HushijiandanComponent implements OnInit {
 
   // 一键发起建单保存
   loading5 = false;
-  async confirmShortcut() {
+  async confirmShortcut(shortcutForm?, buildType?) {
+    shortcutForm && (this.shortcutForm = shortcutForm);
     var that = this;
     for (const i in that.shortcutForm.controls) {
       that.shortcutForm.controls[i].markAsDirty();
@@ -3252,7 +3254,7 @@ export class HushijiandanComponent implements OnInit {
     console.log(that.shortcutForm);
     if (that.shortcutForm.invalid) return;
     that.loading5 = true;
-    that.buildType = "other";
+    that.buildType = buildType || "other";
     if(this.buildMsg.reserveUserSwitch == 1 && !this.userAccount){
       this.message.info('请选择工号！');
       this.loading5 = false;
@@ -3270,6 +3272,7 @@ export class HushijiandanComponent implements OnInit {
       that.loading5 = false;
       return;
     }
+    shortcutForm && (this.isShowBuildQuickConfirm = false);
     this.otherBuildOrder();
   }
   otherBuildOrder(otherList?){
@@ -3316,8 +3319,8 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((data) => {
         this.message.remove(this.jdFlagId);
         that.loading5 = false;
-        if (data.status == 200 && that.buildType == "other") {
-          that.showPromptModal("创建", true, "", "other");
+        if (data.status == 200 && (that.buildType == "other" || that.buildType == "ordinary")) {
+          that.showPromptModal("创建", true, "", that.buildType);
           this.getTodayNum();
         } else if (data.status == 200 && that.buildType == "bb") {
           that.showPromptModal("创建", true, "", "bb");
@@ -3328,7 +3331,7 @@ export class HushijiandanComponent implements OnInit {
         } else if (data.status == 1000033) {
           //重复建单那策略
           this.repeatMsg = data.msg;
-          this.showDelModal(postData, "other");
+          this.showDelModal(postData, that.buildType);
         } else {
           that.showPromptModal("创建", false, data.msg);
         }
@@ -3472,7 +3475,8 @@ export class HushijiandanComponent implements OnInit {
     this.limitTimeItem.fun2.call(this);
   }
   // 一键发起建单保存
-  confirmShortcut1() {
+  confirmShortcut1(shortcutForm?) {
+    shortcutForm && (this.shortcutForm1 = shortcutForm);
     var that = this;
     for (const i in that.shortcutForm1.controls) {
       that.shortcutForm1.controls[i].markAsDirty();
@@ -3480,6 +3484,7 @@ export class HushijiandanComponent implements OnInit {
     }
     console.log(that.shortcutForm1);
     if (that.shortcutForm1.invalid) return;
+    shortcutForm && (this.isShowBuildQuickConfirm = false);
     that.btnLoading = true;
     let postData;
     if (that.buildType == "bb") {
@@ -3572,8 +3577,8 @@ export class HushijiandanComponent implements OnInit {
   confirmRepeatFun(data){
     if (this.sourceType === "specimen") {
       // 标本建单
-      if (data.status == 200 && this.buildType == "other") {
-        this.showPromptModal("创建", true, "", "other");
+      if (data.status == 200 && (this.buildType == "other" || this.buildType == "ordinary")) {
+        this.showPromptModal("创建", true, "", this.buildType);
         this.getTodayNum();
       } else if (data.status == 200 && this.buildType == "bb") {
         this.showPromptModal("创建", true, "", "bb");
@@ -3586,10 +3591,10 @@ export class HushijiandanComponent implements OnInit {
       } else {
         this.showPromptModal("创建", false, data.msg);
       }
-    } else if (this.sourceType === "other") {
+    } else if (this.sourceType === "other" || this.sourceType === "ordinary") {
       // 其他建单
-      if (data.status == 200 && this.buildType == "other") {
-        this.showPromptModal("创建", true, "", "other");
+      if (data.status == 200 && (this.buildType == "other" || this.buildType == "ordinary")) {
+        this.showPromptModal("创建", true, "", this.buildType);
         this.getTodayNum();
       } else if (data.status == 200 && this.buildType == "bb") {
         this.showPromptModal("创建", true, "", "bb");
@@ -4117,8 +4122,9 @@ export class HushijiandanComponent implements OnInit {
   detailModel: boolean = false;
   loading33: boolean = false;
   detailList: any = [];
-  // 选择急查或普查(1是急标，2是普标)
-  changeSpeDetail(speDetailType: number) {
+  // 选择急查或普查(1是急标，0是普标)
+  changeSpeDetail(e, speDetailType: number) {
+    e.stopPropagation();
     this.detailModel = true;
     let user = JSON.parse(localStorage.getItem("user"));
     let postData = {
@@ -4818,4 +4824,34 @@ export class HushijiandanComponent implements OnInit {
     this.mediumRegFlag = !this.enoughRegFlag && !this.strongRegFlag;
     console.log(this.enoughRegFlag,this.mediumRegFlag,this.strongRegFlag);
   }
+
+  // 快捷方式建单
+  isShowBuildQuickConfirm:boolean = false;
+  buildQuickConfirmData:any = {};
+  buildQuick(data){
+    this.buildQuickConfirmData = data || {};
+    this.isShowBuildQuickConfirm = true;
+  }
+  cancelBuildQuickConfirm(e){
+    this.isShowBuildQuickConfirm = false;
+  }
+  loadingQuick:boolean = false;
+  confirmBuildQuickConfirm(options){
+    let { taskType, shortcutForm, buildMsg, workOrderRemark } = options;
+    if(taskType.associationType.value === 'other' || taskType.associationType.value === 'ordinary'){
+      // 其他临床服务|万能交接
+      this.loadingQuick = this.loading5;
+      this.buildType = taskType.associationType.value;
+      this.shortcutMsg = taskType;
+      this.buildMsg = buildMsg;
+      this.workOrderRemark = workOrderRemark;
+      this.confirmShortcut(shortcutForm, taskType.associationType.value);
+    }else if(taskType.associationType.value === 'specimen'){
+      // 标本配送
+      this.loadingQuick = this.btnLoading;
+      this.buildType = "bb";
+      this.shortcutMsg1 = taskType;
+      this.confirmShortcut1(shortcutForm);
+    }
+  }
 }

src/app/views/hushijiandan/hushijiandan.module.ts

@@ -7,11 +7,13 @@ import { ShareModule } from 'src/app/share/share.module';
 import { DragModule } from 'src/app/directives/drag/drag.module';
 import { SortablejsModule } from 'ngx-sortablejs';
 import { NgxPrintModule } from 'ngx-print';
+import { BuildQuickConfirmComponent } from 'src/app/components/build-quick-confirm/build-quick-confirm.component';
 
 
 @NgModule({
   declarations: [
     HushijiandanComponent,
+    BuildQuickConfirmComponent,
   ],
   imports: [
     CommonModule,