Merge branch 'master' into develop

src/app/components/configurationCenter/configuration-custom-business/configuration-custom-business.component.html

@@ -0,0 +1,143 @@
+<div class="content" id="dictionary">
+  <div class="contentInner">
+    <div class="address">
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of customBusinessList">{{ item.name }}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="addressAssign" *ngIf="activeDictionaryKey.key=='one_connect'">
+			<div class="list-template" id="priorityTable">
+			  <div class="list-template__content">
+			    <div class="list-template__bottom">
+			     <div class="list-template__top" nz-row>
+			        <div nz-col nzLg="24" class="list-template__btns">
+			          <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+			        </div>
+			      </div>
+			      <nz-table class="list-template__nzTable" [nzData]="commonFaultsList" nzSize="middle" [nzShowPagination]="false"
+			        [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+			        <thead>
+			          <tr class="thead">
+			            <th nzWidth="20%">排序号</th>
+			            <th nzWidth="20%">交接名称</th>
+			            <th nzWidth="20%">关联科室</th>
+									<th nzWidth="20%">关联类型</th>
+									<th nzWidth="15%">任务类型</th>
+									<th nzWidth="120px">操作</th>
+			          </tr>
+			        </thead>
+			        <tbody>
+			          <tr *ngFor="let data of commonFaultsList;let i = index">
+			            <td>{{data.orders}}</td>
+									<td>{{data.handoverName}}</td>
+									<td>{{data.associationDeptDTO?.dept}}</td>
+			            <td>
+										{{data.handoverType?.name}}
+									</td>
+									<td>{{data.taskTypeDTO?.taskName}}</td>
+			            <td>
+			              <div class="coop">
+			                <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+			                <span (click)="editPriority(data)">编辑</span>
+			              </div>
+			            </td>
+			          </tr>
+			        </tbody>
+			      </nz-table>
+			    </div>
+			  </div>
+			</div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
+       <nz-form-item>
+         <nz-form-label nzFor="hosId" nzRequired [nzSpan]="6">院区</nz-form-label>
+         <nz-form-control [nzSpan]="18" nzErrorTip="请选择院区!">
+       		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择院区" formControlName="hosId" (ngModelChange)="changeHos()">
+       		  <ng-container *ngFor="let option of hospitalList">
+       		    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+       		  </ng-container>
+       		</nz-select>
+         </nz-form-control>
+       </nz-form-item>
+       
+       <nz-form-item>
+         <nz-form-label [nzSpan]="6" nzFor="orders" nzRequired>排序号</nz-form-label>
+         <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
+           <nz-input-group>
+             <input formControlName="orders" nz-input placeholder="请输入排序号">
+           </nz-input-group>
+         </nz-form-control>
+       </nz-form-item>
+       
+       <nz-form-item>
+         <nz-form-label [nzSpan]="6" nzFor="handoverName" nzRequired>交接名称</nz-form-label>
+         <nz-form-control [nzSpan]="18" nzErrorTip="请输入交接名称!">
+           <nz-input-group>
+             <input formControlName="handoverName" nz-input placeholder="请输入交接名称">
+           </nz-input-group>
+         </nz-form-control>
+       </nz-form-item>
+       
+			 <nz-form-item>
+			   <nz-form-label nzFor="associationDept" nzRequired [nzSpan]="6">关联科室</nz-form-label>
+			   <nz-form-control [nzSpan]="18" nzErrorTip="请选择关联科室!">
+			 		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择关联科室" formControlName="associationDept" (nzOnSearch)="changeCommonInp($event)">
+			 		  <ng-container *ngFor="let option of deptData">
+			 		    <nz-option *ngIf="!isLoading" [nzLabel]="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-form-label nzFor="handoverType" nzRequired [nzSpan]="6">交接类型</nz-form-label>
+			   <nz-form-control [nzSpan]="18" nzErrorTip="请选择交接类型!">
+			 		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择交接类型" formControlName="handoverType">
+			 		  <ng-container *ngFor="let option of connectList">
+			 		    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+			 		  </ng-container>
+			 		</nz-select>
+			   </nz-form-control>
+			 </nz-form-item>
+			 
+       <nz-form-item>
+         <nz-form-label nzFor="taskType" nzRequired [nzSpan]="6">关联任务类型</nz-form-label>
+         <nz-form-control [nzSpan]="18" nzErrorTip="请选择关联任务类型!">
+       		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择关联任务类型" formControlName="taskType">
+       		  <ng-container *ngFor="let option of taskTypeList">
+       		    <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [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 class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-custom-business/configuration-custom-business.component.less

@@ -0,0 +1,386 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+	.w220px{
+		width: 220px;
+	}
+	.w100px{
+			width: 100px !important;
+		}
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+	
+	#dictionary{
+	  margin: 24px 16px;
+	  .addressAssign{
+	    flex: 7;
+			.hos-title{
+				margin-top: 10px;
+				text-align: center;
+			}
+	  }
+	  .contentItem{
+	    margin: 0 16px;
+	    padding: 8px;
+	    text-align: center;
+	    &.active{
+	      background-color: @primary-color;
+	      color: #fff;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentBody{
+	    padding: 16px;
+	    min-height: 0;
+	    display: flex;
+	    flex-direction: column;
+	  }
+	  .contentBody2{
+	    flex: 1;
+	  }
+	  ::ng-deep .ant-form-item{
+	    margin-bottom: 0;
+	  }
+	  .dictionaryRow{
+	    display: flex;
+	    align-items: center;
+	    justify-content: center;
+	    gap: 16px;
+	    .orders{
+	      flex: 1;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .name{
+	      width: 100px;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .value{
+	      flex: 3;
+	      display: flex;
+	      align-items: center;
+	      .valueInput{
+	        width: 600px;
+	      }
+	      .icon_transport{
+	        font-size: 20px;
+	        color: #8a8a8a;
+	        cursor: pointer;
+	      }
+	    }
+	
+	  }
+	}
+	
+	.content{
+	  flex: 1;
+	  min-height: 0;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-between;
+	  border: 1px solid #EEF3F9;
+	  &.priority{
+	    margin: 24px 118px 0;
+	    background-color: #fff;
+	    .contentInner{
+	      padding: 48px 206px;
+	      border: 1px solid #E8EBEF;
+	    }
+	  }
+	  .contentItem{
+	    padding: 4px 16px;
+	    cursor: pointer;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    &.active{
+	      color: @primary-color;
+	      background-color: #F0F6ED;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentInner{
+	    flex: 1;
+	    display: flex;
+	    justify-content: space-between;
+	    align-items: center;
+	    padding: 0 16px;
+	    gap: 16px;
+			.hos-title{
+				font-weight: 600;
+				font-size: 16px;
+			}
+
+			.hospital{
+			  width: 100%;
+			  text-align: left;
+			}
+			.classList{
+				// padding: 5px 0;
+				.mar-10{
+					margin: 8px 0;
+				}
+			  .select{
+			    width: 313px;
+			  }
+			  span{
+			    display: inline-block;
+			    width: 11em;
+			  }
+			}
+			
+	    .contentHead{
+	      height: 45px;
+	      display: flex;
+	      justify-content: space-between;
+	      align-items: center;
+	      gap: 16px;
+	      padding: 0 16px;
+	      font-size: 16px;
+	      font-weight: bold;
+	      border-bottom: 1px solid #D9D9D9;
+	      .title{
+	        overflow: hidden;
+	        text-overflow: ellipsis;
+	        white-space: nowrap;
+	      }
+	      .btns{
+	        flex-shrink: 0;
+	      }
+	    }
+	    .contentBody{
+	      padding: 0 8px;
+	      margin: 4px 0;
+	      flex: 1;
+	    }
+	    .address{
+	      flex: 1;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .addressAssign{
+	      flex: 3;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .list-template__searchItem {
+	      margin-bottom: 16px;
+	      .label {
+	        color: #333;
+	        display: inline-block;
+	        width: 70px;
+	        text-align-last: justify;
+	        text-align: justify;
+	        &.label--big {
+	          width: 100px;
+	        }
+	      }
+	      .formItem {
+	        width: 135px;
+	      }
+	    }
+	  }
+	  .contentBtns{
+	    padding-bottom: 16px;
+	    display: flex;
+	    justify-content: center;
+	    align-items: center;
+	  }
+	}
+	
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 99;
+	
+	  .tips{
+	    margin-bottom: 16px!important;
+	  }
+	
+	  .modalBody {
+	    width: 350px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    .title {
+	      width: 100%;
+	      text-align: center;
+	      font-size: 18px;
+	      position: relative;
+	
+	      i {
+	        position: absolute;
+	        right: 0;
+	        top: 0;
+	        font-size: 20px;
+	        color: #666;
+	        cursor: pointer;
+	        padding: 0 5px;
+	      }
+	    }
+	
+	    .content {
+	      width: 310px;
+	      background: #f9fafb;
+	      border: 1px solid #e5e9ed;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	      padding: 16px 0;
+	
+	      .busyList{
+	        display: flex;
+	        margin-bottom: 8px;
+	        .busyContent{
+	          margin-right: 8px;
+	          flex: 1;
+	        }
+	      }
+	
+	      & > div {
+	        text-align: center;
+	        margin: 0;
+	
+	        &.icon {
+	          // margin-top: 17px;
+	
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 14px;
+	        }
+	
+	        &:nth-child(3) {
+	          font-size: 14px;
+	          color: #666;
+	        }
+	      }
+	      .workAssignmentTips {
+	        font-size: 12px;
+	      }
+	    }
+	
+	    button {
+	      margin-top: 10px;
+	
+	      &.btn {
+	        margin-left: 8px;
+	      }
+	    }
+	  }
+	
+	  // 新增
+	  &.add {
+	    .modalBody {
+	      width: 480px;
+	      height: auto;
+	
+	      .content {
+	        width: 100%;
+	        height: auto;
+	        padding: 16px;
+	        max-height: 497px;
+	        overflow-y: auto;
+	
+	        .addForm {
+	          .ant-form-item {
+	            margin-bottom: 0;
+							.ant-select{
+								width: 100% !important;
+							}
+	            .ant-form-item-label {
+	              text-align: left;
+	            }
+	
+	            .desc {
+	              margin-top: 5px;
+	            }
+	          }
+	
+	          .datesControl {
+	            margin-top: -16px;
+	
+	            .ant-form-item-label {
+	              line-height: 40px;
+	            }
+	          }
+	
+	          .timer {
+	            .ant-form-item-label {
+	              width: 100%;
+	              text-align: left;
+	            }
+	
+	            .numInp {
+	              margin-right: 5px;
+	            }
+	
+	            .line {
+	              margin-right: 5px;
+	            }
+	          }
+	
+	          .timer2 {
+	            .ant-form-item-label {
+	              line-height: 20px;
+	            }
+	          }
+	        }
+	
+	        .editForm {
+	          .ant-form-item {
+	            margin-bottom: 15px;
+	
+	            .ant-form-item-label {
+	              line-height: 14px;
+	              text-align: left;
+	            }
+	          }
+	        }
+	      }
+	    }
+	  }
+	}
+}

src/app/components/configurationCenter/configuration-custom-business/configuration-custom-business.component.ts

@@ -0,0 +1,331 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-custom-business",
+  templateUrl: "./configuration-custom-business.component.html",
+  styleUrls: ["./configuration-custom-business.component.less"],
+})
+export class ConfigurationCustomBusinessComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+	@Input() customBusinessList: any[] = [];
+  coopData: any = {}; //当前操作列
+	hosId:any;
+	hospitals:any = [];
+	isDeptLoading: boolean = false;
+
+	currentHospital:any;
+	malfunctionData:any = [];
+	allUserGroup:any = [];
+	userData:any = [];
+
+  changeCommonInpSubject = new Subject();
+	
+  ngOnInit() {
+		this.activeDictionaryKey = this.customBusinessList[0];
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getDept('add', {}, v);
+    });
+
+    // 优先级
+    setTimeout(() => {
+      this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
+    }, 100)
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.currentHospital = this.tool.getCurrentHospital();
+    this.getCommonFaultsList();
+		this.getHosList();
+  }
+	
+	activeDictionaryKey:any;
+	clickDictionaryKey(item){
+		this.activeDictionaryKey = item;
+		if(item.key=='one_connect'){
+			this.getCommonFaultsList();
+		}
+	}
+	
+	// 获取院区
+	hospitalList:any = [];
+	connectList:any = [];
+	getHosList() {
+	  let data = {
+			idx: 0,
+			sum: 99999,
+		};
+		this.mainService
+			.getFetchDataList("data", "hospital", data)
+			.subscribe((data) => {
+				this.hospitalList = data.list || [];
+			});
+			
+		this.mainService.getDictionary("list", "business_handover_type").subscribe((data) => {
+		  this.connectList = data || [];
+		});
+	}
+	
+	// 选择院区
+	taskTypeList:any = [];
+	changeHos(type, data?){
+		this.validatePriorityForm.controls.associationDept.setValue(null);
+		this.validatePriorityForm.controls.taskType.setValue(null);
+		this.getDept(type, data, '');
+		this.getTsakTypeList(type, data);
+	}
+	
+	// 获取任务类型
+	userList:any = [];
+	getTsakTypeList(type, obj?) {
+	  let query = {
+	  	idx: 0,
+	  	sum: 99999,
+			taskType:{
+				simpleQuery:true,
+				hosIds: this.validatePriorityForm.value.hosId
+			}
+	  };
+	  this.mainService
+	  	.getFetchDataList("configuration", "taskType", query)
+	  	.subscribe((data) => {
+	  		this.taskTypeList = data.list.filter(i=>i.associationType.value == 'other');
+				if(type=='edit'){
+					this.validatePriorityForm.controls.taskType.setValue(obj.taskType);
+				}
+	  	});
+	}
+	
+	// 获取科室
+	deptData:any = [];
+	getDept(type, obj:any = {}, dept?) {
+		if(!this.validatePriorityForm.value.hosId){
+			return
+		}
+	  let query = {
+	  	idx: 0,
+	  	sum: 20,
+	  	department:{
+	  		hospital: {
+					id: this.validatePriorityForm.value.hosId
+				},
+				dept: dept
+	  	}
+	  };
+	  this.mainService
+	  	.getFetchDataList("data", "department", query)
+	  	.subscribe((data) => {
+				this.isLoading = false;
+	  		this.deptData = data.list || [];
+				if(type == 'edit'){
+					let item = this.deptData.find(i=>i.id == obj.associationDeptDTO.id)
+					if(!item){
+						this.deptData.push({
+							dept: obj.associationDeptDTO.dept,
+							id: obj.associationDeptDTO.id
+						})
+					}
+					this.validatePriorityForm.controls.associationDept.setValue(obj.associationDeptDTO.id);
+				}
+	  	});
+	}
+	
+  // 新增优先级弹框
+  modelName = ""; //模态框名称
+  modalPriority: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addPriorityModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalPriority = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hidePriorityModal() {
+    this.modalPriority = false;
+  }
+
+	isLoading:boolean = false;
+	// 搜索科室
+  changeCommonInp( e) {
+		this.isLoading = true
+    this.changeCommonInpSubject.next(e);
+  }
+
+  // 编辑
+  editPriority(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalPriority = true;
+    this.initForm();
+    this.coopData = data;
+    this.validatePriorityForm.controls.hosId.setValue(data.hosId);
+    this.validatePriorityForm.controls.orders.setValue(data.orders);
+    this.validatePriorityForm.controls.handoverName.setValue(data.handoverName);
+		this.validatePriorityForm.controls.handoverType.setValue(data.handoverType.id);
+		this.changeHos('edit', data)
+	}
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitPriorityForm(): void {
+    for (const i in this.validatePriorityForm.controls) {
+      this.validatePriorityForm.controls[i].markAsDirty();
+      this.validatePriorityForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validatePriorityForm.invalid) {
+      return;
+    }
+    console.log(this.validatePriorityForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+    if (this.add) {
+      //增加
+      postData = {
+				businessHandoverConfig:{
+					hosId: this.validatePriorityForm.value.hosId,
+					orders: this.validatePriorityForm.value.orders || undefined,
+					handoverName: this.validatePriorityForm.value.handoverName,
+					associationDept: this.validatePriorityForm.value.associationDept || undefined,
+					handoverType: {
+						id: this.validatePriorityForm.value.handoverType
+					},
+					taskType: this.validatePriorityForm.value.taskType,
+				}
+      };
+    } else {
+      //编辑
+      postData = {
+				businessHandoverConfig:{
+					...this.coopData,
+					hosId: this.validatePriorityForm.value.hosId,
+					orders: this.validatePriorityForm.value.orders || undefined,
+					handoverName: this.validatePriorityForm.value.handoverName,
+					associationDept: this.validatePriorityForm.value.associationDept || undefined,
+					handoverType: {
+						id: this.validatePriorityForm.value.handoverType
+					},
+					taskType: this.validatePriorityForm.value.taskType,
+				}
+      };
+    }
+    this.mainService
+      .dataPost(this.add ? "addData": "updData", "businessHandoverConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hidePriorityModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validatePriorityForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validatePriorityForm = this.fb.group({
+      hosId: [null, [Validators.required]],
+      orders: [null, [Validators.required]],
+      handoverName: [null, [Validators.required]],
+			associationDept: [null, [Validators.required]],
+			handoverType: [null, [Validators.required]],
+			taskType: [null, [Validators.required]],
+    });
+		this.deptData = [];
+		this.taskTypeList = [];
+    console.log(this.validatePriorityForm.controls)
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  commonFaultsList: any[] = []; //表格数据
+  tablePriorityHeight:number = 0;
+  getCommonFaultsList() {
+    let data = {
+			idx: 0,
+			sum: 99999,
+			// businessHandoverConfig: {
+			// 	hosId: this.hosId
+			// },
+		};
+		this.loading1 = true;
+		this.mainService
+			.getFetchDataList("simple/data", "businessHandoverConfig", data)
+			.subscribe((data) => {
+				this.loading1 = false;
+				this.commonFaultsList = data.list || [];
+			});
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    console.log(this.coopData);
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+		this.mainService
+			.simplePost("rmvData", "businessHandoverConfig", [this.coopData.id])
+			.subscribe((data) => {
+				this.btnLoading = false;
+				this.delModal = false;
+				if (data.status == 200) {
+					this.showPromptModal(this.tipsMsg2, true, "");
+				} else {
+					this.showPromptModal(this.tipsMsg2, false, data.msg);
+				}
+			});
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getCommonFaultsList();
+  }
+}

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.html

@@ -5,15 +5,15 @@
         <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
       </overlay-scrollbars>
     </div>
-    <div class="addressAssign">
+    <div class="addressAssign" *ngIf="activeDictionaryKey.key != 'business_type'">
       <div class="contentBody">
         <div class="dictionaryRow">
           <div class="orders">排序号</div>
           <div class="name">键</div>
           <div [ngClass]="{value_2: activeDictionaryKey.key == 'alarm_urgency', value: activeDictionaryKey.key != 'alarm_urgency'}">值</div>
-					<!-- <div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">关键字</div> -->
+					<div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">关键字</div>
         </div>
-        <overlay-scrollbars #osComponentRef2 class="contentBody2">
+        <overlay-scrollbars #osComponentRef2 class="contentBody2" *ngIf="initTyepe">
           <form nz-form [formGroup]="validateDictionaryForm" class="w100">
             <div class="dictionaryRow" *ngFor="let data of dictionaryList;let i = index;">
               <div class="orders">
@@ -61,9 +61,51 @@
         </overlay-scrollbars>
       </div>
       <div class="contentBtns">
-        <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()">保存</button>
+        <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()" [nzLoading]="btnLoading">保存</button>
       </div>
     </div>
+		<div class="addressAssign" *ngIf="activeDictionaryKey.key == 'business_type'">
+			<div class="list-template" id="priorityTable">
+			  <div class="list-template__content">
+			    <div class="list-template__bottom">
+			     <div class="list-template__top" nz-row>
+			        <div nz-col nzLg="24" class="list-template__btns">
+			          <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+			        </div>
+			      </div>
+			      <nz-table class="list-template__nzTable" [nzData]="commonFaultsList" nzSize="middle" [nzShowPagination]="false"
+			        [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+			        <thead>
+			          <tr class="thead">
+			            <th nzWidth="25%">院区</th>
+			            <th nzWidth="25%">业务名称</th>
+			            <th nzWidth="25%">业务code</th>
+									<th nzWidth="25%">关联任务类型</th>
+									<th nzWidth="120px">操作</th>
+			          </tr>
+			        </thead>
+			        <tbody>
+			          <tr *ngFor="let data of commonFaultsList;let i = index">
+			            <td>{{data.hospitalDTO?.hosName}}</td>
+									<td>{{data.businessName || ''}}</td>
+									<td>{{data.businessCode}}</td>
+									<td>{{data.taskTypeName}}</td>
+			            <td>
+			              <div class="coop">
+			                <span (click)="showBusinessModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+			                <span (click)="edit(data)">编辑</span>
+			              </div>
+			            </td>
+			          </tr>
+			        </tbody>
+			      </nz-table>
+			    </div>
+			  </div>
+			</div>
+		</div>
+		<div class="mask-style" *ngIf="!initTyepe">
+			<nz-spin nzSimple class="spin-style"></nz-spin>
+		</div>
   </div>
 </div>
 
@@ -78,3 +120,64 @@
 
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 删除业务类型模态框 -->
+<app-dialog-delete [delModal]="delBusinessModal" (hideDelModalEvent)="hideBusinessModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmBusiness()" content="您确认要删除吗？"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
+				<nz-form-item>
+				  <nz-form-label nzFor="hosId" nzRequired [nzSpan]="6">院区</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择院区!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择院区" formControlName="hosId" (ngModelChange)="changeHos($event)">
+						  <ng-container *ngFor="let option of hospitalList">
+						    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						</nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="6" nzFor="businessName" nzRequired>业务名称</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入业务名称!">
+				    <nz-input-group>
+				      <input formControlName="businessName" nz-input placeholder="请输入业务名称">
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="6" nzFor="businessCode" nzRequired>业务code</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入业务code!">
+				    <nz-input-group>
+				      <input formControlName="businessCode" nz-input placeholder="请输入业务code">
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+
+        <nz-form-item>
+          <nz-form-label nzFor="taskTypeIds" nzRequired [nzSpan]="6">关联任务类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择关联任务类型!">
+						<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择关联任务类型" formControlName="taskTypeIds">
+						  <ng-container *ngFor="let option of taskTypeList">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [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 class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.less

@@ -15,6 +15,21 @@
     width: 100%!important;
     height: 100%!important;
   }
+	.mask-style{
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		display: flex;
+		background: rgba(0,0,0,0.2);
+		align-items: center;
+		justify-content: center;
+	}
+	.spin-style{
+		z-index:9999;
+	}
   #dictionary{
     margin: 24px 16px;
     .addressAssign{
@@ -188,4 +203,177 @@
       align-items: center;
     }
   }
+	
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 99;
+	
+	  .tips{
+	    margin-bottom: 16px!important;
+	  }
+	
+	  .modalBody {
+	    width: 350px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    .title {
+	      width: 100%;
+	      text-align: center;
+	      font-size: 18px;
+	      position: relative;
+	
+	      i {
+	        position: absolute;
+	        right: 0;
+	        top: 0;
+	        font-size: 20px;
+	        color: #666;
+	        cursor: pointer;
+	        padding: 0 5px;
+	      }
+	    }
+	
+	    .content {
+	      width: 310px;
+	      background: #f9fafb;
+	      border: 1px solid #e5e9ed;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	      padding: 16px 0;
+	
+	      .busyList{
+	        display: flex;
+	        margin-bottom: 8px;
+	        .busyContent{
+	          margin-right: 8px;
+	          flex: 1;
+	        }
+	      }
+	
+	      & > div {
+	        text-align: center;
+	        margin: 0;
+	
+	        &.icon {
+	          // margin-top: 17px;
+	
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 14px;
+	        }
+	
+	        &:nth-child(3) {
+	          font-size: 14px;
+	          color: #666;
+	        }
+	      }
+	      .workAssignmentTips {
+	        font-size: 12px;
+	      }
+	    }
+	
+	    button {
+	      margin-top: 10px;
+	
+	      &.btn {
+	        margin-left: 8px;
+	      }
+	    }
+	  }
+	
+	  // 新增
+	  &.add {
+	    .modalBody {
+	      width: 480px;
+	      height: auto;
+	
+	      .content {
+	        width: 100%;
+	        height: auto;
+	        padding: 16px;
+	        max-height: 497px;
+	        overflow-y: auto;
+	
+	        .addForm {
+	          .ant-form-item {
+	            margin-bottom: 0;
+							.ant-select{
+								width: 100% !important;
+							}
+	            .ant-form-item-label {
+	              text-align: left;
+	            }
+	
+	            .desc {
+	              margin-top: 5px;
+	            }
+	          }
+	
+	          .datesControl {
+	            margin-top: -16px;
+	
+	            .ant-form-item-label {
+	              line-height: 40px;
+	            }
+	          }
+	
+	          .timer {
+	            .ant-form-item-label {
+	              width: 100%;
+	              text-align: left;
+	            }
+	
+	            .numInp {
+	              margin-right: 5px;
+	            }
+	
+	            .line {
+	              margin-right: 5px;
+	            }
+	          }
+	
+	          .timer2 {
+	            .ant-form-item-label {
+	              line-height: 20px;
+	            }
+	          }
+	        }
+	
+	        .editForm {
+	          .ant-form-item {
+	            margin-bottom: 15px;
+	
+	            .ant-form-item-label {
+	              line-height: 14px;
+	              text-align: left;
+	            }
+	          }
+	        }
+	      }
+	    }
+	  }
+	}
 }

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -6,6 +6,8 @@ import { ToolService } from 'src/app/services/tool.service';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { NzMessageService } from 'ng-zorro-antd';
 import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-configuration-dictionary",
@@ -31,11 +33,15 @@ export class ConfigurationDictionaryComponent implements OnInit {
     static: false,
   })
   osComponentRef2: OverlayScrollbarsComponent;
-
+	changeCommonInpSubject = new Subject();
+	hosId:any;
+	
   ngOnInit() {
     this.activeDictionaryKey = this.dictionaryKeyList[0];
+		this.hosId = this.tool.getCurrentHospital().id;
     this.getDictionaryList();
     this.initDictionaryForm();
+		this.getHosList();
   }
 
   // 数据字典key列表
@@ -45,7 +51,14 @@ export class ConfigurationDictionaryComponent implements OnInit {
   activeDictionaryKey:any;
   clickDictionaryKey(item){
     this.activeDictionaryKey = item;
-    this.getDictionaryList();
+		if(item.key=='business_type'){
+			setTimeout(() => {
+			  this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
+			}, 100)
+			this.getCommonFaultsList();
+		}else{
+			this.getDictionaryList();
+		}
   }
 
   btnLoading: boolean = false; //提交按钮loading状态
@@ -64,7 +77,11 @@ export class ConfigurationDictionaryComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    this.getDictionaryList();
+		if(this.activeDictionaryKey.key=='business_type'){
+			this.getCommonFaultsList();
+		}else{
+			this.getDictionaryList();
+		}
   }
 
   coopData: any = {}; //当前操作列
@@ -123,7 +140,9 @@ export class ConfigurationDictionaryComponent implements OnInit {
 
   // 获取数据字典数据
   maskFlag: any = false;
+	initTyepe:boolean = false;
   getDictionaryList() {
+		this.initTyepe = false
     let postData = {
       idx: 0,
       sum: 9999,
@@ -139,59 +158,105 @@ export class ConfigurationDictionaryComponent implements OnInit {
       this.maskFlag = false;
       let list = data.list || [];
       if(list.length){
-        this.dictionaryList = list.map(v => {
-          return {
-            id: v.id,
-            name: v.name || null,
-            value: v.value || null,
-            orders: v.orders || null,
-            system: v.system || false,
-          }
-        });
+				if(this.activeDictionaryKey.key == 'alarm_urgency'){
+					this.dictionaryList = list.map(v => {
+					  return {
+					    id: v.id,
+					    name: v.name || null,
+					    value: v.value || null,
+					    orders: v.orders || null,
+					    system: v.system || false,
+							extra1: v.extra1 || null,
+					  }
+					});
+				}else{
+					this.dictionaryList = list.map(v => {
+					  return {
+					    id: v.id,
+					    name: v.name || null,
+					    value: v.value || null,
+					    orders: v.orders || null,
+					    system: v.system || false,
+					  }
+					});
+				}
       }else{
-        this.dictionaryList = [
-          {
-            id: uuidv4(),
-            name: null,
-            value: null,
-            orders: null,
-            system: false,
-          }
-        ];
+				if(this.activeDictionaryKey.key == 'alarm_urgency'){
+					this.dictionaryList = [
+					  {
+					    id: uuidv4(),
+					    name: null,
+					    value: null,
+					    orders: null,
+					    system: false,
+							extra1: null,
+					  }
+					];
+				}else{
+					this.dictionaryList = [
+					  {
+					    id: uuidv4(),
+					    name: null,
+					    value: null,
+					    orders: null,
+					    system: false,
+					  }
+					];
+				}
       }
 
-      console.log(this.dictionaryList);
       // 动态添加表单
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
           if(key !== 'id' && key !== 'system'){
             if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree'){
               this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: true}, [Validators.required]))
+            }else if(this.activeDictionaryKey.key === 'alarm_urgency'){
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, []))
             }else{
-              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
-            }
+							this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
+						}
           }
         }
       })
-      console.log(this.validateDictionaryForm.controls)
+			setTimeout(_=>{
+				this.initTyepe = true
+			},1000)
     })
   }
 
   // 添加数据字典
   addField(i:number): void{
-    let obj = {
-      id: uuidv4(),
-      name: null,
-      value: null,
-      orders: null,
-      system: false,
-    };
+		let obj:any = {}
+		if(this.activeDictionaryKey.key == 'alarm_urgency'){
+			obj = {
+			  id: uuidv4(),
+			  name: null,
+			  value: null,
+			  orders: null,
+			  system: false,
+				extra1:null,
+			};
+		}else{
+			obj = {
+			  id: uuidv4(),
+			  name: null,
+			  value: null,
+			  orders: null,
+			  system: false,
+			};
+		}
+
 
     // 动态添加表单
     for (const key in obj) {
       console.log(key + '_' + obj.id)
       if(key !== 'id' && key !== 'system'){
-        this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(null, [Validators.required]))
+				if(key !== 'extra1'){
+					this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(null, [Validators.required]))
+				}else{
+					this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(null, []))
+				}
       }
     }
 
@@ -214,7 +279,6 @@ export class ConfigurationDictionaryComponent implements OnInit {
 
   // 保存数据字典
   saveDictionary(): void {
-    console.log(this.coopData)
     for (const i in this.validateDictionaryForm.controls) {
       this.validateDictionaryForm.controls[i].markAsDirty();
       this.validateDictionaryForm.controls[i].updateValueAndValidity();
@@ -234,12 +298,12 @@ export class ConfigurationDictionaryComponent implements OnInit {
         name: rawValueObj['name_' + this.dictionaryList[i].id],
         value: rawValueObj['value_' + this.dictionaryList[i].id],
         orders: rawValueObj['orders_' + this.dictionaryList[i].id],
-				// extra1: this.activeDictionaryKey.key == 'alarm_urgency' ? rawValueObj['extra1_' + this.dictionaryList[i].id]: undefined,
+				extra1: this.activeDictionaryKey.key == 'alarm_urgency' ? rawValueObj['extra1_' + this.dictionaryList[i].id]: undefined,
         system: uuidValidate(this.dictionaryList[i].id) ? false : this.dictionaryList[i].system,
         key: this.activeDictionaryKey.key,
       })
     }
-    console.log(postData);
+
     this.btnLoading = true;
     this.mainService
       .simplePost("addListData", "dictionary", postData)
@@ -253,4 +317,196 @@ export class ConfigurationDictionaryComponent implements OnInit {
         }
       });
   }
+	
+	// 获取院区
+	hospitalList:any = [];
+	getHosList() {
+	  let data = {
+			idx: 0,
+			sum: 99999,
+		};
+		this.mainService
+			.getFetchDataList("data", "hospital", data)
+			.subscribe((data) => {
+				this.hospitalList = data.list || [];
+			});
+	}
+	
+	// 选择院区
+	taskTypeList:any = [];
+	changeHos(e){
+		this.validatePriorityForm.controls.taskTypeIds.setValue(null);
+		this.getTsakTypeList('add');
+	}
+	
+	// 获取任务类型
+	userList:any = [];
+	getTsakTypeList(type, obj?) {
+	  let data = {
+	  	idx: 0,
+	  	sum: 99999,
+			taskType:{
+				simpleQuery:true,
+				hosIds: this.validatePriorityForm.value.hosId
+			}
+	  };
+	  this.mainService
+	  	.getFetchDataList("configuration", "taskType", data)
+	  	.subscribe((data) => {
+	  		this.taskTypeList = data.list || [];
+				if(type=='edit'){
+					this.validatePriorityForm.controls.taskTypeIds.setValue(obj);
+				}
+	  	});
+	}
+	
+	// 新增优先级弹框
+	modelName = ""; //模态框名称
+	modalPriority: boolean = false; //新增/编辑模态框
+	add: boolean; //true:新增；false:编辑
+	addPriorityModal() {
+	  this.modelName = "新增";
+	  this.add = true; //新增
+	  this.modalPriority = true;
+	  this.initForm();
+	}
+	//关闭新增/编辑弹框
+	hidePriorityModal() {
+	  this.modalPriority = false;
+	}
+	
+	isLoading:boolean = false;
+	// 编辑
+	edit(data) {
+	  this.modelName = "编辑";
+	  this.add = false;
+	  this.modalPriority = true;
+	  this.initForm();
+	  this.coopData = data;
+	  this.validatePriorityForm.controls.hosId.setValue(data.hospitalDTO.id);
+	  this.validatePriorityForm.controls.businessName.setValue(data.businessName?data.businessName:null);
+	  this.validatePriorityForm.controls.businessCode.setValue(data.businessCode);
+		let taskType = data.taskTypeIds.split(',')
+		taskType = taskType.map(i=>{
+			return parseInt(i)
+		})
+		this.getTsakTypeList('edit', taskType);
+	}
+	
+	// 新增/编辑表单提交
+	submitPriorityForm(): void {
+	  for (const i in this.validatePriorityForm.controls) {
+	    this.validatePriorityForm.controls[i].markAsDirty();
+	    this.validatePriorityForm.controls[i].updateValueAndValidity();
+	  }
+	  if (this.validatePriorityForm.invalid) {
+	    return;
+	  }
+	  console.log(this.validatePriorityForm.value);
+	  this.btnLoading = true;
+	  let postData:any = {};
+	  if (this.add) {
+	    //增加
+	    postData = {
+				businessTaskType:{
+					hosId: this.validatePriorityForm.value.hosId,
+					businessName: this.validatePriorityForm.value.businessName || undefined,
+					businessCode: this.validatePriorityForm.value.businessCode,
+					taskTypeIds: this.validatePriorityForm.value.taskTypeIds.toString(),
+				}
+	    };
+	  } else {
+	    //编辑
+	    postData = {
+				businessTaskType:{
+					...this.coopData,
+					hosId: this.validatePriorityForm.value.hosId,
+					businessName: this.validatePriorityForm.value.businessName || undefined,
+					businessCode: this.validatePriorityForm.value.businessCode,
+					taskTypeIds: this.validatePriorityForm.value.taskTypeIds.toString(),
+				}
+	    };
+	  }
+	  this.mainService
+	    .dataPost(this.add ? "addData": "updData", "businessTaskType", postData)
+	    .subscribe((result) => {
+	      this.btnLoading = false;
+	      this.hidePriorityModal();
+	      let msg = "";
+	      if (this.add) {
+	        msg = "新增";
+	      } else {
+	        msg = "修改";
+	      }
+	      if (result.status == 200) {
+	        this.showPromptModal(msg, true, '');
+	      } else {
+	        this.showPromptModal(msg, false, result.msg);
+	      }
+	    });
+	}
+	
+	// 初始化新增form表单
+	validatePriorityForm: FormGroup; //新增/编辑表单
+	initForm() {
+	  this.validatePriorityForm = this.fb.group({
+	    hosId: [null, [Validators.required]],
+	    businessName: [null, [Validators.required]],
+	    businessCode: [null, [Validators.required]],
+			taskTypeIds: [null, [Validators.required]],
+	  });
+	}
+	
+	// 获取列表
+	loading1:boolean = false;
+	commonFaultsList: any[] = []; //表格数据
+	tablePriorityHeight:number = 0;
+	getCommonFaultsList() {
+	  let data = {
+			idx: 0,
+			sum: 99999,
+			// businessTaskType: {
+			// 	hosId: this.hosId
+			// },
+		};
+		this.loading1 = true;
+		this.mainService
+			.getFetchDataList("simple/data", "businessTaskType", data)
+			.subscribe((data) => {
+				this.loading1 = false;
+				data.list.forEach(i=>{
+					i.taskTypeName = i.taskTypeDTOS.map(i=>{
+						return i.taskName
+					}).toString()
+				})
+				this.commonFaultsList = data.list || [];
+			});
+	}
+	
+	// 删除业务类型
+	showBusinessModal(data){
+		this.coopData = data
+		this.delBusinessModal = true;
+	}
+	
+	// 隐藏删除框
+	delBusinessModal:boolean = false;
+	hideBusinessModal() {
+	  this.delBusinessModal = false;
+	}
+	// 确认删除
+	confirmBusiness() {
+	  this.btnLoading = true;
+		this.mainService
+			.simplePost("rmvData", "businessTaskType", [this.coopData.id])
+			.subscribe((data) => {
+				this.btnLoading = false;
+				this.delBusinessModal = false;
+				if (data.status == 200) {
+					this.showPromptModal(this.tipsMsg2, true, "");
+				} else {
+					this.showPromptModal(this.tipsMsg2, false, data.msg);
+				}
+			});
+	}
 }

src/app/components/configurationCenter/configuration-voluntarilyBuild/configuration-voluntarilyBuild.component.html

@@ -0,0 +1,139 @@
+<div class="content" id="dictionary">
+  <div class="contentInner">
+    <div class="address">
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of voluntarilyTabList">{{ item.name }}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="addressAssign" *ngIf="activeDictionaryKey.key=='alarmConfig'">
+			<div class="list-template" id="priorityTable">
+			  <div class="list-template__content">
+			    <div class="list-template__bottom">
+			     <div class="list-template__top" nz-row>
+			        <div nz-col nzLg="24" class="list-template__btns">
+			          <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+			        </div>
+			      </div>
+			      <nz-table class="list-template__nzTable" [nzData]="commonFaultsList" nzSize="middle" [nzShowPagination]="false"
+			        [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+			        <thead>
+			          <tr class="thead">
+			            <th nzWidth="20%">告警优先级</th>
+			            <th nzWidth="20%">关键字</th>
+			            <th nzWidth="20%">关联故障现象</th>
+									<th nzWidth="20%">处理人|组</th>
+									<th nzWidth="15%">是否启用</th>
+									<th nzWidth="120px">操作</th>
+			          </tr>
+			        </thead>
+			        <tbody>
+			          <tr *ngFor="let data of commonFaultsList;let i = index">
+			            <td>{{data.alarmUrgency && data.alarmUrgency.name}}</td>
+									<td>{{data.keywords || ''}}</td>
+									<td>{{data.categoryDTO?.mutiCategory}}</td>
+			            <td>
+										<div>{{data.userDTO?.name}}</div>
+										<div>{{data.groupDTO?.groupName}}</div>
+									</td>
+									<td>{{data.flag?'是':'否'}}</td>
+			            <td>
+			              <div class="coop">
+			                <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+			                <span (click)="editPriority(data)">编辑</span>
+			              </div>
+			            </td>
+			          </tr>
+			        </tbody>
+			      </nz-table>
+			    </div>
+			  </div>
+			</div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label nzFor="alarmUrgency" nzRequired [nzSpan]="6">告警优先级</nz-form-label>
+          <nz-form-control [nzSpan]="18">
+        		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择告警优先级" formControlName="alarmUrgency">
+        		  <ng-container *ngFor="let option of emergencyData">
+        		    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        		  </ng-container>
+        		</nz-select>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="6" nzFor="keywords">关键字</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入关键字!">
+				    <nz-input-group>
+				      <input formControlName="keywords" nz-input placeholder="请输入关键字">
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+        <nz-form-item>
+          <nz-form-label nzFor="categoryId" nzRequired [nzSpan]="6">故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="18">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="categoryId" (nzOnSearch)="changeCommonInp('category', $event)">
+						  <ng-container *ngFor="let option of malfunctionData">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [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-form-label nzFor="groupId" nzRequired [nzSpan]="6">处理组</nz-form-label>
+				  <nz-form-control [nzSpan]="18">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择处理组" formControlName="groupId" (ngModelChange)="changeGroup($event)">
+						  <ng-container *ngFor="let option of groupList">
+						    <nz-option [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						</nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label nzFor="userId" [nzSpan]="6">处理人</nz-form-label>
+				  <nz-form-control [nzSpan]="18">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择处理人" formControlName="userId">
+						  <ng-container *ngFor="let option of userList">
+						    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						</nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label nzFor="flag" nzRequired [nzSpan]="6">是否启用</nz-form-label>
+				  <nz-form-control [nzSpan]="18">
+						<nz-radio-group class="formItem" formControlName="flag">
+						  <label nz-radio [nzValue]="0">否</label>
+						  <label nz-radio [nzValue]="1">是</label>
+						</nz-radio-group>
+				  </nz-form-control>
+				</nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-voluntarilyBuild/configuration-voluntarilyBuild.component.less

@@ -0,0 +1,386 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+	.w220px{
+		width: 220px;
+	}
+	.w100px{
+			width: 100px !important;
+		}
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+	
+	#dictionary{
+	  margin: 24px 16px;
+	  .addressAssign{
+	    flex: 7;
+			.hos-title{
+				margin-top: 10px;
+				text-align: center;
+			}
+	  }
+	  .contentItem{
+	    margin: 0 16px;
+	    padding: 8px;
+	    text-align: center;
+	    &.active{
+	      background-color: @primary-color;
+	      color: #fff;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentBody{
+	    padding: 16px;
+	    min-height: 0;
+	    display: flex;
+	    flex-direction: column;
+	  }
+	  .contentBody2{
+	    flex: 1;
+	  }
+	  ::ng-deep .ant-form-item{
+	    margin-bottom: 0;
+	  }
+	  .dictionaryRow{
+	    display: flex;
+	    align-items: center;
+	    justify-content: center;
+	    gap: 16px;
+	    .orders{
+	      flex: 1;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .name{
+	      width: 100px;
+	      display: flex;
+	      justify-content: flex-end;
+	      align-items: center;
+	    }
+	    .value{
+	      flex: 3;
+	      display: flex;
+	      align-items: center;
+	      .valueInput{
+	        width: 600px;
+	      }
+	      .icon_transport{
+	        font-size: 20px;
+	        color: #8a8a8a;
+	        cursor: pointer;
+	      }
+	    }
+	
+	  }
+	}
+	
+	.content{
+	  flex: 1;
+	  min-height: 0;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-between;
+	  border: 1px solid #EEF3F9;
+	  &.priority{
+	    margin: 24px 118px 0;
+	    background-color: #fff;
+	    .contentInner{
+	      padding: 48px 206px;
+	      border: 1px solid #E8EBEF;
+	    }
+	  }
+	  .contentItem{
+	    padding: 4px 16px;
+	    cursor: pointer;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    &.active{
+	      color: @primary-color;
+	      background-color: #F0F6ED;
+	      border-radius: 4px;
+	    }
+	  }
+	  .contentInner{
+	    flex: 1;
+	    display: flex;
+	    justify-content: space-between;
+	    align-items: center;
+	    padding: 0 16px;
+	    gap: 16px;
+			.hos-title{
+				font-weight: 600;
+				font-size: 16px;
+			}
+
+			.hospital{
+			  width: 100%;
+			  text-align: left;
+			}
+			.classList{
+				// padding: 5px 0;
+				.mar-10{
+					margin: 8px 0;
+				}
+			  .select{
+			    width: 313px;
+			  }
+			  span{
+			    display: inline-block;
+			    width: 11em;
+			  }
+			}
+			
+	    .contentHead{
+	      height: 45px;
+	      display: flex;
+	      justify-content: space-between;
+	      align-items: center;
+	      gap: 16px;
+	      padding: 0 16px;
+	      font-size: 16px;
+	      font-weight: bold;
+	      border-bottom: 1px solid #D9D9D9;
+	      .title{
+	        overflow: hidden;
+	        text-overflow: ellipsis;
+	        white-space: nowrap;
+	      }
+	      .btns{
+	        flex-shrink: 0;
+	      }
+	    }
+	    .contentBody{
+	      padding: 0 8px;
+	      margin: 4px 0;
+	      flex: 1;
+	    }
+	    .address{
+	      flex: 1;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .addressAssign{
+	      flex: 3;
+	      height: 100%;
+	      background: #FFFFFF;
+	      border: 1px solid #E8EBEF;
+	      display: flex;
+	      flex-direction: column;
+	      width: 0;
+	    }
+	    .list-template__searchItem {
+	      margin-bottom: 16px;
+	      .label {
+	        color: #333;
+	        display: inline-block;
+	        width: 70px;
+	        text-align-last: justify;
+	        text-align: justify;
+	        &.label--big {
+	          width: 100px;
+	        }
+	      }
+	      .formItem {
+	        width: 135px;
+	      }
+	    }
+	  }
+	  .contentBtns{
+	    padding-bottom: 16px;
+	    display: flex;
+	    justify-content: center;
+	    align-items: center;
+	  }
+	}
+	
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 99;
+	
+	  .tips{
+	    margin-bottom: 16px!important;
+	  }
+	
+	  .modalBody {
+	    width: 350px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    .title {
+	      width: 100%;
+	      text-align: center;
+	      font-size: 18px;
+	      position: relative;
+	
+	      i {
+	        position: absolute;
+	        right: 0;
+	        top: 0;
+	        font-size: 20px;
+	        color: #666;
+	        cursor: pointer;
+	        padding: 0 5px;
+	      }
+	    }
+	
+	    .content {
+	      width: 310px;
+	      background: #f9fafb;
+	      border: 1px solid #e5e9ed;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	      padding: 16px 0;
+	
+	      .busyList{
+	        display: flex;
+	        margin-bottom: 8px;
+	        .busyContent{
+	          margin-right: 8px;
+	          flex: 1;
+	        }
+	      }
+	
+	      & > div {
+	        text-align: center;
+	        margin: 0;
+	
+	        &.icon {
+	          // margin-top: 17px;
+	
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 14px;
+	        }
+	
+	        &:nth-child(3) {
+	          font-size: 14px;
+	          color: #666;
+	        }
+	      }
+	      .workAssignmentTips {
+	        font-size: 12px;
+	      }
+	    }
+	
+	    button {
+	      margin-top: 10px;
+	
+	      &.btn {
+	        margin-left: 8px;
+	      }
+	    }
+	  }
+	
+	  // 新增
+	  &.add {
+	    .modalBody {
+	      width: 480px;
+	      height: auto;
+	
+	      .content {
+	        width: 100%;
+	        height: auto;
+	        padding: 16px;
+	        max-height: 497px;
+	        overflow-y: auto;
+	
+	        .addForm {
+	          .ant-form-item {
+	            margin-bottom: 0;
+							.ant-select{
+								width: 100% !important;
+							}
+	            .ant-form-item-label {
+	              text-align: left;
+	            }
+	
+	            .desc {
+	              margin-top: 5px;
+	            }
+	          }
+	
+	          .datesControl {
+	            margin-top: -16px;
+	
+	            .ant-form-item-label {
+	              line-height: 40px;
+	            }
+	          }
+	
+	          .timer {
+	            .ant-form-item-label {
+	              width: 100%;
+	              text-align: left;
+	            }
+	
+	            .numInp {
+	              margin-right: 5px;
+	            }
+	
+	            .line {
+	              margin-right: 5px;
+	            }
+	          }
+	
+	          .timer2 {
+	            .ant-form-item-label {
+	              line-height: 20px;
+	            }
+	          }
+	        }
+	
+	        .editForm {
+	          .ant-form-item {
+	            margin-bottom: 15px;
+	
+	            .ant-form-item-label {
+	              line-height: 14px;
+	              text-align: left;
+	            }
+	          }
+	        }
+	      }
+	    }
+	  }
+	}
+}

src/app/components/configurationCenter/configuration-voluntarilyBuild/configuration-voluntarilyBuild.component.ts

@@ -0,0 +1,321 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-voluntarilyBuild",
+  templateUrl: "./configuration-voluntarilyBuild.component.html",
+  styleUrls: ["./configuration-voluntarilyBuild.component.less"],
+})
+export class ConfigurationVoluntarilyBuildComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+	@Input() voluntarilyTabList: any[] = [];
+  coopData: any = {}; //当前操作列
+	hosId:any;
+	hospitals:any = [];
+	isDeptLoading: boolean = false;
+
+	currentHospital:any;
+	malfunctionData:any = [];
+	allUserGroup:any = [];
+	userData:any = [];
+
+  changeCommonInpSubject = new Subject();
+	
+  ngOnInit() {
+		this.activeDictionaryKey = this.voluntarilyTabList[0];
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'category'){
+        this.searchApplicationCategory(v[1]);
+      }
+    });
+
+    // 优先级
+    setTimeout(() => {
+      this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
+    }, 100)
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.currentHospital = this.tool.getCurrentHospital();
+    this.getCommonFaultsList();
+		this.searchApplicationCategory()
+		this.getEmergencyDic();
+		this.getGroupList();
+  }
+	
+	activeDictionaryKey:any;
+	clickDictionaryKey(item){
+		this.activeDictionaryKey = item;
+		if(item.key=='alarmConfig'){
+			this.getCommonFaultsList();
+		}
+	}
+	
+	// 获取处理组
+	groupList:any = [];
+	getGroupList() {
+	  let data = {
+			idx: 0,
+			sum: 99999,
+			group2: {
+				statisticalHosId: this.hosId,
+				type:'3'
+			}
+		};
+		this.mainService
+			.getFetchDataList("simple/data", "group2", data)
+			.subscribe((data) => {
+				this.groupList = data.list || [];
+			});
+	}
+	
+	// 选择处理组
+	changeGroup(e){
+		this.validatePriorityForm.controls.userId.setValue(null);
+		this.getUserList();
+	}
+	
+	// 获取处理人
+	userList:any = [];
+	getUserList() {
+	  let data = {
+			idx: 0,
+			sum: 99999,
+			user: {
+				groupdata: {
+					id: this.validatePriorityForm.value.groupId
+				}
+			}
+		};
+		this.mainService
+			.getFetchDataList("data", "user", data)
+			.subscribe((data) => {
+				this.userList = data.list || [];
+			});
+	}
+	
+	// 获取告警优先级
+	emergencyData:any = [];
+	getEmergencyDic() {
+	  this.mainService.getDictionary("list", "alarm_urgency").subscribe((data) => {
+	    this.emergencyData = data || [];
+	  });
+	}
+	
+  // 新增优先级弹框
+  modelName = ""; //模态框名称
+  modalPriority: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addPriorityModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalPriority = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hidePriorityModal() {
+    this.modalPriority = false;
+  }
+
+  changeCommonInp(type, e) {
+    this.changeCommonInpSubject.next([type, e]);
+  }
+
+	// 获取故障现象数据
+  isLoading:boolean = false;
+	searchApplicationCategory(keyWord?){
+		let postData = {
+		  category: {
+        category: keyWord,
+        selectType: "mutlQuery",
+		    hierarchy: 3,
+		  },
+		};
+    this.isLoading = true;
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(data => {
+		  this.isLoading = false;
+      if (data.status == 200) {
+        this.malfunctionData = data.data || [];
+      }
+		})
+	}
+
+  // 编辑
+  editPriority(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalPriority = true;
+    this.initForm();
+    this.coopData = data;
+    this.validatePriorityForm.controls.alarmUrgency.setValue(data.alarmUrgency.id);
+    this.validatePriorityForm.controls.keywords.setValue(data.keywords?data.keywords:null);
+    this.validatePriorityForm.controls.categoryId.setValue(data.categoryDTO?data.categoryDTO.id:null);
+		this.validatePriorityForm.controls.groupId.setValue(data.groupDTO.id);
+		if(data.groupDTO.id){
+			this.getUserList()
+			this.validatePriorityForm.controls.userId.setValue(data.userDTO?data.userDTO.id:null);
+		}
+		this.validatePriorityForm.controls.flag.setValue(data.flag);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitPriorityForm(): void {
+    for (const i in this.validatePriorityForm.controls) {
+      this.validatePriorityForm.controls[i].markAsDirty();
+      this.validatePriorityForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validatePriorityForm.invalid) {
+      return;
+    }
+    console.log(this.validatePriorityForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+    if (this.add) {
+      //增加
+      postData = {
+				alarmConfig:{
+					alarmUrgency: {
+						id: this.validatePriorityForm.value.alarmUrgency
+					},
+					keywords: this.validatePriorityForm.value.keywords || undefined,
+					categoryId: this.validatePriorityForm.value.categoryId,
+					groupId: this.validatePriorityForm.value.groupId,
+					userId: this.validatePriorityForm.value.userId || undefined,
+					flag: this.validatePriorityForm.value.flag,
+				}
+      };
+    } else {
+      //编辑
+      postData = {
+				alarmConfig:{
+					...this.coopData,
+					alarmUrgency: {
+						id: this.validatePriorityForm.value.alarmUrgency
+					},
+					keywords: this.validatePriorityForm.value.keywords || undefined,
+					categoryId: this.validatePriorityForm.value.categoryId,
+					groupId: this.validatePriorityForm.value.groupId,
+					userId: this.validatePriorityForm.value.userId || undefined,
+					flag: this.validatePriorityForm.value.flag,
+				}
+      };
+    }
+    this.mainService
+      .dataPost(this.add ? "addData": "updData", "alarmConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hidePriorityModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validatePriorityForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validatePriorityForm = this.fb.group({
+      alarmUrgency: [null, [Validators.required]],
+      keywords: [null, []],
+      categoryId: [null, [Validators.required]],
+			groupId: [null, [Validators.required]],
+			userId: [null, []],
+			flag: [1, [Validators.required]],
+    });
+    console.log(this.validatePriorityForm.controls)
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  commonFaultsList: any[] = []; //表格数据
+  tablePriorityHeight:number = 0;
+  getCommonFaultsList() {
+    let data = {
+			idx: 0,
+			sum: 99999,
+			alarmConfig: {
+				hosId: this.hosId
+			},
+		};
+		this.loading1 = true;
+		this.mainService
+			.getFetchDataList("simple/data", "alarmConfig", data)
+			.subscribe((data) => {
+				this.loading1 = false;
+				this.commonFaultsList = data.list || [];
+			});
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    console.log(this.coopData);
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+		this.mainService
+			.simplePost("rmvData", "alarmConfig", [this.coopData.id])
+			.subscribe((data) => {
+				this.btnLoading = false;
+				this.delModal = false;
+				if (data.status == 200) {
+					this.showPromptModal(this.tipsMsg2, true, "");
+				} else {
+					this.showPromptModal(this.tipsMsg2, false, data.msg);
+				}
+			});
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getCommonFaultsList();
+  }
+}

src/app/components/order-scope/order-scope.component.html

@@ -31,7 +31,7 @@
           </div>
         </div>
         <div nz-row>
-          <div nz-col nzSpan="3">运维分组：</div>
+          <div nz-col nzSpan="3">运维分组人员显示范围：</div>
           <div nz-col nzSpan="21">
             <label class="checkAll mb8" nz-checkbox *ngIf="itsmCheckedGroup.length" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="isAllItsmGroupChecked" (ngModelChange)="updateAllItsmGroupChecked()">
               全选
@@ -39,6 +39,15 @@
             <nz-checkbox-group class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="itsmCheckedGroup" (ngModelChange)="changeItsmGroup($event)"></nz-checkbox-group>
           </div>
         </div>
+				<div nz-row>
+				  <div nz-col nzSpan="3">根据分组显示工单：</div>
+				  <div nz-col nzSpan="21">
+				    <label class="checkAll mb8" nz-checkbox *ngIf="itsmCheckedGroup.length" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="isAllItsmReasonGroupChecked" (ngModelChange)="updateReasonAllItsmGroupChecked()">
+				      全选
+				    </label>
+				    <nz-checkbox-group class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="itsmCheckedReasonGroup" (ngModelChange)="changeItsmReasonGroup($event)"></nz-checkbox-group>
+				  </div>
+				</div>
         <div nz-row>
           <div nz-col nzSpan="3">工单范围：</div>
           <div nz-col nzSpan="21">
@@ -110,6 +119,15 @@
             </nz-radio-group>
           </div>
         </div>
+				<div nz-row>
+				  <div nz-col nzSpan="4">是否支持跨院区：</div>
+				  <div nz-col nzSpan="20">
+				    <nz-radio-group class="w100" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="crossHospital">
+				      <label nz-radio nzValue="0">否</label>
+				      <label nz-radio nzValue="1">是</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
       </div>
     </div>
     <div class="btns display_flex justify-content_flex-center">

src/app/components/order-scope/order-scope.component.ts

@@ -15,6 +15,7 @@ export class OrderScopeComponent implements OnInit {
     checkedHos: undefined,
     scopeGroups: [],
     orderScopeRadio: undefined,
+		crossHospital: '0',
   }
   @Input() itsmData:any = {
     checkedHos: undefined,
@@ -36,11 +37,13 @@ export class OrderScopeComponent implements OnInit {
   user = JSON.parse(localStorage.getItem("user")); //用户信息
   checkedHos;//转运-院区
   orderScopeRadio:any = '0';//转运-工单范围
-
+	crossHospital:any = '0';//转运-是否支持跨院区
   itsmCheckedHos:any[] = [];//运维-院区
   itsmCheckedGroup:any[] = [];//运维-分组
   itsmOrderScopeRadio:any = '0';//运维-工单范围
   isAllItsmGroupChecked:boolean = false;//运维-是否全选分组
+	isAllItsmReasonGroupChecked:boolean = false;//运维-根据分组显示工单
+	itsmCheckedReasonGroup:any[] = [];//运维-根据分组显示工单
 	// 工单范选项卡
 	scopeTabs:any[] = [];
 	activeScopeTab:any;
@@ -66,6 +69,7 @@ export class OrderScopeComponent implements OnInit {
 		}
     this.checkedHos = this.hsmsData.checkedHos;
     this.orderScopeRadio = this.hsmsData.orderScopeRadio;
+		this.crossHospital = this.hsmsData.crossHospital+"" || '0';
     this.initOrderScope();
     this.getOrderScope();
   }
@@ -114,14 +118,17 @@ export class OrderScopeComponent implements OnInit {
       // 选中的院区和组
       let itsmCheckedHos = this.itsmData.checkedHos || [];
       let itsmCheckedGroup = this.itsmData.scopeGroups || [];
-
+			let itsmCheckedReasonGroup = this.itsmData.groupIds || [];
       let hosIds = itsmCheckedHos.map(v => v.id);
       let groupIds = itsmCheckedGroup.map(v => v.id);
-
+			let groupIds2 = itsmCheckedReasonGroup.map(v => v.id);
       this.itsmCheckedHos = hosList.map(v => ({ label: v.hosName, value: v.id, checked: hosIds.includes(v.id) }));
       this.itsmCheckedGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds.includes(v.id) }));
       this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
-    }
+			
+			this.itsmCheckedReasonGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds2.includes(v.id) }));
+			this.isAllItsmReasonGroupChecked = this.itsmCheckedReasonGroup.length ? this.itsmCheckedReasonGroup.every(v => v.checked) : false;
+		}
 
     // 全选、全不选分组
     updateAllItsmGroupChecked(){
@@ -131,6 +138,15 @@ export class OrderScopeComponent implements OnInit {
     changeItsmGroup(e){
       this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
     }
+		
+		// 全选、全不选根据分组显示工单
+		updateReasonAllItsmGroupChecked(){
+		  this.itsmCheckedReasonGroup.forEach(v => v.checked = this.isAllItsmReasonGroupChecked);
+		}
+		// 选择根据分组显示工单
+		changeItsmReasonGroup(e){
+		  this.isAllItsmReasonGroupChecked = this.itsmCheckedReasonGroup.length ? this.itsmCheckedReasonGroup.every(v => v.checked) : false;
+		}
     // 选择院区
     changeItsmHospital(hospitalList){
       console.log('hospitalList:', hospitalList)
@@ -140,14 +156,17 @@ export class OrderScopeComponent implements OnInit {
       // 选中的院区和组
       let itsmCheckedHos = this.itsmCheckedHos || [];
       let itsmCheckedGroup = this.itsmCheckedGroup || [];
-
+			let itsmCheckedReasonGroup = this.itsmCheckedReasonGroup|| [];
       let hosIds = itsmCheckedHos.filter(v => v.checked).map(v => v.value);
       let groupIds = itsmCheckedGroup.filter(v => v.checked).map(v => v.value);
-
+			let groupIds2 = itsmCheckedReasonGroup.filter(v => v.checked).map(v => v.value);
       this.itsmCheckedGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds.includes(v.id) }));
       console.log('this.itsmCheckedGroup:', this.itsmCheckedGroup)
       this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
-    }
+			
+			this.itsmCheckedReasonGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds2.includes(v.id) }));
+			this.isAllItsmReasonGroupChecked = this.itsmCheckedReasonGroup.length ? this.itsmCheckedReasonGroup.every(v => v.checked) : false;
+		}
     //#endregion 工单范围-运维end
 
     //#region 工单范围-配送start
@@ -311,6 +330,7 @@ export class OrderScopeComponent implements OnInit {
       console.log(e);
       this.itsmCheckedHos.forEach(v => (v.checked = false));
       this.itsmCheckedGroup = [];
+			this.itsmCheckedReasonGroup = [];
     }
 
     // 保存工单范围设置
@@ -394,24 +414,27 @@ export class OrderScopeComponent implements OnInit {
 				postData.workerOrderScope.showReassign = this.showReassign;
 				postData.workerOrderScope.showGovDuty = this.showGovDuty;
         postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
-        postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
-        postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;
+        postData.workerOrderScope.dutyGroupUserRangeIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
+        postData.workerOrderScope.dutyGroupIds = this.itsmCheckedReasonGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
+				postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;
       }
+
       if(hsms && hsms.checked){
         postData.workerOrderScope.hospitalId = this.checkedHos ? { id: this.checkedHos - 0 } : undefined;
         postData.workerOrderScope.typeIds = typesId || undefined;
         postData.workerOrderScope.groupIds = groupsId || undefined;
         postData.workerOrderScope.range = this.orderScopeRadio - 0;
+				postData.workerOrderScope.crossHospital = this.crossHospital - 0;
       }
       if (this.user.user.scope && this.user.user.scope.id) {
         postData.workerOrderScope["id"] = this.user.user.scope.id;
       }
-      console.log('allDuty', this.allDuty)
+			console.log('88888', this.itsmCheckedReasonGroup)
+			console.log('999999', postData.workerOrderScope.groupIds)
       console.log('itsmCheckedHos', this.itsmCheckedHos)
       console.log('itsmCheckedGroup', this.itsmCheckedGroup)
       console.log('itsmOrderScopeRadio', this.itsmOrderScopeRadio)
       console.log(postData);
-      // return;
       this.mainService
         .coopTypeConfig("addData", "workerOrderScope", postData)
         .subscribe((data) => {

src/app/services/main.service.ts

@@ -1270,5 +1270,12 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
-
+	
+	// 故障工单-告警信息-建单
+	addAlarmIncident(data){
+		return this.http.post(host.host + `/flow/incident/task/createAlarmIncident`, data, {
+		  headers: this.headers,
+		});
+	}
+	
 }

src/app/services/tool.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from "@angular/core";
 import { MainService } from "./main.service";
+import { Subject } from "rxjs";
 
 @Injectable({
   providedIn: "root",
@@ -8,13 +9,39 @@ export class ToolService {
   logoUrl = '';
   logoTitle = '';
   faviconUrl = '';
-
+	changeInpSubject:any;
+	allSubject = new Subject();
+	allEndSubject = new Subject();
+	 
+	// 提供方法来触发事件
+	triggerEvent(data: any) {
+		console.log(9999,data)
+		this.allSubject.next(data);
+	}
+	
+	// 提供方法来触发事件
+	triggerEndEvent(data: any) {
+		this.allEndSubject.next(data);
+	}
+	
+	// 提供方法来订阅事件
+	getEventObservable() {
+		console.log(3333333)
+		return this.allSubject.asObservable();
+	}
+	
+	// 提供方法来订阅事件
+	getEventEndObservable() {
+		return this.allEndSubject.asObservable();
+	}
+	
   // 附件类型
   // word，excel，pdf，txt，ppt
   attachmentsTypes:string = 'text/plain,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/vnd.ms-excel,application/msword,application/vnd.openxmlformats-officedocument.presentationml.presentation';
 
   constructor(private mainService: MainService) {}
-
+	
+	
   // 获取logoUrl和logoTitle
   getSysNameAndLogoAsync(hosId = ''){
     return this.mainService.getSysNameAndLogo(hosId);
@@ -342,6 +369,12 @@ export class ToolService {
 				case "send":
 				  coopBtns.send = true; //发送消息
 				  break;
+				case "batchRecover":
+				  coopBtns.batchRecover = true; //批量恢复
+				  break;
+				case "batchProcessing":
+				  coopBtns.batchProcessing = true; //批量不处理
+				  break;
       }
     });
     console.log(coopBtns);

src/app/views/common-info/common-info-routing.module.ts

@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { CommonInfoComponent } from './common-info.component';
+import { OrderDetailComponent } from 'src/app/share/order-detail/order-detail.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: CommonInfoComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'orderDetail/:id',
+        component: OrderDetailComponent,
+      }
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class CommonInfoRoutingModule { }

src/app/views/common-info/common-info.component.html

@@ -0,0 +1,99 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='19' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">申请科室</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择申请科室" [(ngModel)]="searchDto.applyDept" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('department', $event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+            <ng-container *ngFor="let option of deptList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="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>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">收取人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择收取人" [(ngModel)]="searchDto.collectionUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
+            <ng-container *ngFor="let option of deliveryUserList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="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="list-template__searchItem">
+				  <span class="label">创建时间区间</span>：
+				  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+				</div>
+      </div>
+      <div nz-col nzLg="5" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="9%">业务类型</th>
+            <th nzWidth="10%">创建时间|单号</th>
+            <th nzWidth="13%">申请科室|终点科室</th>
+            <th nzWidth="13%">收取信息</th>
+            <th nzWidth="13%">中转信息</th>
+            <th nzWidth="13%">送达信息</th>
+            <th nzWidth="9%">交接数量</th>
+						<th nzWidth="8%">业务状态</th>
+            <th nzWidth="15%">工单信息</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.businessTaskTypeDTO?.businessName}}</td>
+            <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}<br>{{ data.businessNo }}</td>
+            <td>{{ data.applyDeptDTO?.dept }}<br>{{ data.endDeptDTO?.dept }}</td>
+            <td>
+							<div>{{data.collectionUserDTO?.name}} <span *ngIf="data.collectionUserDTO && data.collectionHandoverUserDTO">|</span> {{data.collectionHandoverUserDTO?.name}}</div>
+							<div>{{data.collectionTime | date: 'yyyy-MM-dd HH:mm'}}</div>
+						</td>
+            <td>
+							{{ data.transferTime | date: 'yyyy-MM-dd HH:mm' }}<br>
+							{{ data.transferStartTime | date: 'yyyy-MM-dd HH:mm' }}<br>
+							{{ data.transferUserDTO?.name }}
+						</td>
+            <td>{{ data.deliveryUserDTO?.name }} <span *ngIf="data.deliveryUserDTO && data.deliveryHandoverUserDTO">|</span>	 {{ data.deliveryHandoverUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+						<td>{{ data.handoverNum1}}</td>
+						<td>{{ data.businessStatus?.name}}</td>
+            <td>
+							<div *ngIf="data.gdCode">收：<span class="clickable" (click)="detail($event, data.gdId)">{{ data.gdCode }}</span></div>
+							<div *ngIf="data.transferGdCode">中转：<span class="clickable" (click)="detail($event, data.transferGdId)">{{ data.transferGdCode }}</span></div>
+						</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 查看日志 -->
+<app-specimen-package-log-prompt-modal
+  *ngIf="logPromptModalShow"
+  [show]="logPromptModalShow"
+  [id]="packId"
+  (closeModelHs)="closeModelLog($event)"
+></app-specimen-package-log-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/common-info/common-info.component.less

@@ -0,0 +1,176 @@
+@import "../../../../src/theme.less";
+
+:host {
+  .list-template__top{
+    overflow: visible!important;
+    .label{
+      width: auto!important;
+    }
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/common-info/common-info.component.ts

@@ -0,0 +1,230 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { startOfDay, endOfDay, format } from 'date-fns';
+@Component({
+  selector: "app-common-info",
+  templateUrl: "./common-info.component.html",
+  styleUrls: ["./common-info.component.less"],
+})
+export class CommonInfoComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modelName = ""; //模态框名称
+
+  searchTimerSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  dateRange: any = []; //发起时间
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getStatus();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.dateRange = [];
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      businessHandover: {
+        hosId: this.currentHospital.id,
+        collectionUser: this.searchDto.collectionUser || undefined,
+        applyDept: this.searchDto.applyDept || undefined,
+        startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "businessHandover", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list || [];
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 搜索
+  changeInp(type, e) {
+    if(type === 'department'){
+      this.searchTimer(this.getDeptList, e);
+    }else if(type === 'patient'){
+      this.searchTimer(this.getDeliveryUserList, e);
+    }
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 获取科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.currentHospital.id,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  openChangePatient(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeliveryUserList();
+  }
+
+  // 获取送达人
+  deliveryUserList: any = [];
+  getDeliveryUserList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      user: {
+        hospital: { id: this.currentHospital.id },
+        name: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deliveryUserList = data.list || [];
+      });
+  }
+
+  //获取状态
+  stateList:any[] = [];
+  getStatus() {
+    this.mainService
+    .getDictionary('list', 'pathology_pack_status')
+    .subscribe((data) => {
+      this.stateList = data || [];
+    });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+
+  // 查看日志弹窗
+  logPromptModalShow = false; //弹窗开关
+  packId = ""; //查看记录携带id
+  showLogs(data) {
+    this.packId = data.id;
+    this.logPromptModalShow = true;
+  }
+  // 关闭日志弹窗
+  closeModelLog(e) {
+    this.logPromptModalShow = JSON.parse(e).show;
+  }
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl(`/main/commonInfo/orderDetail/${id}`);
+  }
+}

src/app/views/common-info/common-info.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { CommonInfoRoutingModule } from './common-info-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { CommonInfoComponent } from './common-info.component';
+
+
+@NgModule({
+  declarations: [
+    CommonInfoComponent
+  ],
+  imports: [
+    CommonModule,
+    CommonInfoRoutingModule,
+    ShareModule,
+  ]
+})
+export class CommonInfoModule { }

src/app/views/emergency-info/emergency-info-routing.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { EmergencyInfoComponent } from './emergency-info.component';
+import { OrderDetailComponent } from '../../share/order-detail/order-detail.component'
+
+const routes: Routes = [{
+  path: '',
+  component: EmergencyInfoComponent,
+	children: [
+	  {
+	    // 查看详情
+	    path: 'orderDetail/:id',
+	    component: OrderDetailComponent,
+	  }
+	]
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class EmergencyInfoRoutingModule { }

src/app/views/emergency-info/emergency-info.component.html

@@ -0,0 +1,225 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="alarmStatus"
+          >
+            <ng-container *ngFor="let data of alarmList">
+              <nz-option
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+          </nz-select>
+        </div>
+      	
+				<div class="list-template__searchItem">
+				  <span class="label">工单状态：</span>
+				  <nz-select
+				    [nzDropdownMatchSelectWidth]="false"
+				    class="formItem"
+				    nzServerSearch
+				    nzShowSearch
+				    nzAllowClear
+				    nzPlaceHolder="请选择工单状态"
+				    [(ngModel)]="incidentStatus"
+				  >
+				    <ng-container *ngFor="let data of gdList">
+				      <nz-option
+				        nzLabel="{{ data.name }}"
+				        nzValue="{{ data.id }}"
+				      ></nz-option>
+				    </ng-container>
+				  </nz-select>
+				</div>
+				
+      	<div class="list-template__searchItem">
+      	  <span class="label">告警ip：</span>
+      	  <input nz-input class="formItem" placeholder="请输入告警ip" [(ngModel)]="alarmIp" />
+      	</div>
+      	
+				<div class="list-template__searchItem">
+				  <span class="label">紧急度：</span>
+				  <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzShowSearch nzAllowClear
+				    nzPlaceHolder="请选择紧急度" [(ngModel)]="alarmUrgency">
+				    <ng-container *ngFor="let data of urgencyList">
+				      <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+				    </ng-container>
+				  </nz-select>
+				</div>
+      	
+      	<div class="list-template__searchItem">
+      	  <span class="label width-105">告警时间区间：</span>
+      	  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
+      	</div>
+      </div>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search()'>搜索</button>
+        <button nz-button class="btn ml8 default" (click)="reset()">重置</button>
+        <button nz-button *ngIf="coopBtns.batchRecover" class="btn ml8 default" (click)="batchRecover($event)">批量恢复</button>
+				<button nz-button *ngIf="coopBtns.batchProcessing" class="btn ml8 default" (click)="batchNo($event)">批量不处理</button>
+			</div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
+              (nzCheckedChange)="checkAll($event)"></th>
+            <th nzWidth="10%">告警id</th>
+            <th nzWidth="10%">告警来源</th>
+            <th nzWidth="20%">告警内容</th>
+            <th nzWidth="9%">告警状态</th>
+						<th nzWidth="10%">告警ip</th>
+						<th nzWidth="9%">紧急度</th>
+						<th nzWidth="15%">告警时间</th>
+						<th nzWidth="10%">工单单号</th>
+            <th nzWidth="120px">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
+            <td>{{ data.alarmId || '-' }}</td>
+            <td>{{ data.alarmSource || '-' }}</td>
+            <td>{{ data.alarmContent || '-' }}</td>
+            <td>{{ data.alarmStatus?.name }}</td>
+						<td>{{ data.alarmIp || '-' }}</td>
+						<td>{{ data.alarmUrgency?.name }}</td>
+						<td>{{ data.alarmActiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+						<td class="text-underline" (click)="detail($event, data)">{{ data.incidentSign || '-' }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.view" (click)="look(data)">查看</span>
+                <span *ngIf="coopBtns.add && !data.incidentSign" (click)="addOrder(data)">建单</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(false,'page')" (nzPageSizeChange)="getList(false, 'page')">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="title">名称</nz-form-label>
+          <nz-form-control nzErrorTip="请填写名称!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="title" placeholder="请填写名称" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskTypeIds">绑定任务类型</nz-form-label>
+          <nz-form-control nzErrorTip="请选择绑定任务类型!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="taskTypeIds" nzShowSearch nzAllowClear nzPlaceHolder="请选择绑定任务类型" nzServerSearch (nzOnSearch)="changeInp($event)" (nzOpenChange)="openTasktype($event)">
+              <ng-container *ngFor="let data of taskTypeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.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-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="deptIds">绑定科室</nz-form-label>
+          <nz-form-control nzErrorTip="请选择绑定科室!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="deptIds" nzShowSearch nzAllowClear nzPlaceHolder="请选择绑定科室" nzServerSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openDept($event)">
+              <ng-container *ngFor="let data of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.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-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="type">快捷类型</nz-form-label>
+          <nz-form-control nzErrorTip="请选择快捷类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="type" nzShowSearch nzAllowClear nzPlaceHolder="请选择快捷类型" (nzOpenChange)="openSchedule($event)">
+              <ng-container *ngFor="let data of typeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.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>
+    </overlay-scrollbars>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 查看模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="lookModal">
+  <div class="viewModalBody">
+    <div class="title">查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+			<div class="df view-item">
+				<div class="df-item">告警id：{{itemData.alarmId || '-'}}</div>
+				<div class="df-item">告警ip：{{itemData.alarmIp || '-'}}</div>
+				<div class="df-item">告警来源：{{itemData.alarmSource || '-'}}</div>
+				<div class="df-item">告警状态：{{itemData.alarmStatus?.name || '-'}}</div>
+			</div>
+			<div class="df view-item">
+				<div class="df-item">告警地点：{{itemData.alarmLocation || '-'}}</div>
+				<div class="df-item">紧急度：{{itemData.alarmUrgency?.name  || '-'}}</div>
+				<div class="df-item">告警时间：{{itemData.alarmActiveTime | date:'yyyy-MM-dd HH:mm:ss' || '-'}}</div>
+			</div>
+			<div class="view-item">告警内容：{{itemData.alarmContent || '-'}}</div>
+			<div class="view-item">其他数据：{{itemData.alarmExtension || '-'}}</div>
+			<div class="view-item">告警描述：{{itemData.alarmDescription  || '-'}}</div>
+    </overlay-scrollbars>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="close()">知道了</button>
+    </div>
+  </div>
+</div>
+
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="optModal" (hideDelModalEvent)="hideOptModal()"
+ [btnLoading]="btnLoading" (confirmDelEvent)="confirmOpt()" 
+ [content]="infoContent"></app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.incidentId" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>
+
+<router-outlet (deactivate)="refreshList()"></router-outlet>

src/app/views/emergency-info/emergency-info.component.less

@@ -0,0 +1,214 @@
+@import "../../../../src/theme.less";
+.width-105{
+	width: 105px !important;
+}
+.text-underline{
+	cursor: pointer;
+	text-decoration: underline;
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+	
+	.viewModalBody{
+		width: 60%;
+		background: #fff;
+		border-radius: 5px;
+		padding: 10px 20px;
+		color: #333;
+		
+		.title {
+		  width: 100%;
+		  text-align: center;
+		  font-size: 18px;
+		  position: relative;
+		
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		
+		.content {
+		  width: 100%;
+		  background: #f9fafb;
+		  border: 1px solid #e5e9ed;
+		  border-radius: 5px;
+		  margin-top: 12px;
+			padding: 20px;
+			
+			.df{
+				display: flex;
+				.df-item{
+					margin-right: 40px;
+				}
+			}
+			
+			.view-item{
+				margin-bottom: 20px;
+				text-align: left;
+			}
+			
+		  div {
+		    text-align: center;
+		    margin: 0;
+		
+		    &.icon {
+		      margin-top: 17px;
+		
+		      i {
+		        color: #34b349;
+		        font-size: 30px !important;
+		
+		        &.transport-wenhao {
+		          color: #f5a523;
+		        }
+		
+		        &.transport-shibai {
+		          color: #ff3a52;
+		        }
+		      }
+		    }
+		
+		    &.defeat {
+		      color: #333;
+		      font-size: 18px;
+		    }
+		  }
+		}
+		
+		button {
+		  margin-top: 10px;
+		
+		  &.btn {
+		    margin-left: 8px;
+		  }
+		}
+	}
+	
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+			
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/emergency-info/emergency-info.component.ts

@@ -0,0 +1,496 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { EmergencyInfoService } from './emergency-info.service';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { NzMessageService } from "ng-zorro-antd";
+
+@Component({
+  selector: "app-emergency-info",
+  templateUrl: "./emergency-info.component.html",
+  styleUrls: ["./emergency-info.component.less"],
+})
+export class EmergencyInfoComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+		private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+		private router: Router,
+    private tool: ToolService,
+    private quickOrderAcceptanceService: EmergencyInfoService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: any; //所属科室
+  hosId: any; //院区（搜索）
+  typeList: Array<any>; //快捷类型
+  taskTypeList: Array<any>; //所有任务类型
+  deptList: Array<any>; //所有科室
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  changeInpSubject = new Subject(); //防抖
+  changeInpDeptSubject = new Subject(); //防抖
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	alarmStatus:any;
+	incidentStatus:any;
+	alarmIp:any;
+	alarmUrgency:any;
+	dateRange:any = [];
+	
+  ngOnInit() {
+		// 全局监听
+		this.tool.getEventEndObservable().subscribe(res => {
+			console.log('全局的监听触发2222', res);
+			let data:any = res;
+			if(data.message == '关单'){
+				this.getList(true)
+			}
+		});
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getTasktype(v[0]);
+    });
+    //防抖
+    this.changeInpDeptSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getDept(v[0]);
+    });
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.initForm();
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getList(true);
+		this.getGdList();
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    return;
+	  }
+		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	  this.dateRange = [this.startDate,this.endDate]
+	}
+	
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.dateRange = [dateStart,dateEnd];
+	  }
+	}
+	
+	// 获取工单状态
+	gdList:any = [];
+	alarmList:any = [];
+	urgencyList:any = [];
+	getGdList() {
+	  this.isLoading = true;
+	  this.quickOrderAcceptanceService.getDictionary("incident_status").subscribe((res) => {
+	    this.isLoading = false;
+	    this.gdList = res || [];
+	  });
+		this.quickOrderAcceptanceService.getDictionary("alarm_status").subscribe((res) => {
+		  this.isLoading = false;
+		  this.alarmList = res || [];
+		});
+		this.quickOrderAcceptanceService.getDictionary("alarm_urgency").subscribe((res) => {
+		  this.isLoading = false;
+		  this.urgencyList = res || [];
+		});
+	}
+	
+  // 搜索
+  search() {
+    this.getList(true);
+  }
+	
+	// 重置
+	reset() {
+		this.alarmStatus = null;
+		this.incidentStatus = null;
+		this.alarmIp = null;
+		this.alarmUrgency = null;
+		this.startDate = null;
+		this.endDate = null;
+		this.dateRange = [];
+	  this.getList(true);
+	}
+	
+  // 表格数据
+  loading1 = false;
+  getList(isResetPageIndex = false, type?) {
+    isResetPageIndex && (this.pageIndex = 1);
+    let data = {
+      pageIndex: this.pageIndex,
+      pageSize: this.pageSize,
+      hosId: this.hosId,
+			alarm:{
+				alarmStatus:{
+					id:this.alarmStatus
+				},
+				incidentStatus:this.incidentStatus,
+				alarmIp:this.alarmIp,
+				alarmUrgency:{
+					id:this.alarmUrgency,
+				},
+				startTime: this.startDate || undefined,
+				endTime: this.endDate || undefined,
+			}
+    };
+		if(this.alarmStatus){
+			data.alarm.alarmStatus.id = this.alarmStatus
+		}else{
+			delete data.alarm.alarmStatus
+		}
+		if(this.alarmUrgency){
+			data.alarm.alarmUrgency.id = this.alarmUrgency
+		}else{
+			delete data.alarm.alarmUrgency
+		}
+    this.loading1 = true;
+		if(type!='page'){
+			this.mapOfCheckedId = {};
+			this.checkedDepIds = [];
+		}
+    this.isAllDisplayDataChecked = false;
+    this.quickOrderAcceptanceService
+      .query(data)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.list;
+        this.listLength = result.totalNum;
+      });
+  }
+
+  // 获取任务类型列表
+  getTasktype(keywords = '') {
+    let hosId = this.tool.getCurrentHospital().id;
+    this.isLoading = true;
+    this.quickOrderAcceptanceService.queryTasktype({
+      hosId,
+      keywords,
+    }).subscribe((res) => {
+      this.isLoading = false;
+      this.taskTypeList = res.list || [];
+    });
+  }
+
+  // 获取科室列表
+  getDept(keywords = '') {
+    let hosId = this.tool.getCurrentHospital().id;
+    this.isLoading = true;
+    this.quickOrderAcceptanceService.queryDept({
+      hosId,
+      keywords,
+    }).subscribe((res) => {
+      this.isLoading = false;
+      this.deptList = res.list || [];
+    });
+  }
+
+  // 获取快捷类型
+  getTypeList() {
+    this.isLoading = true;
+    this.quickOrderAcceptanceService.getDictionary("receiveRuleType").subscribe((res) => {
+      this.isLoading = false;
+      this.typeList = res || [];
+    });
+  }
+
+  // 新增弹框
+  showModal() {
+    this.add = true;
+    this.modal = true;
+    this.initForm();
+  }
+  hideModal() {
+    this.modal = false;
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    if (this.add) {
+      this.typeList = [];
+      this.taskTypeList = [];
+      this.deptList = [];
+    }
+    this.validateForm = this.fb.group({
+      title: ['', [Validators.required]],
+      taskTypeIds: [null, [Validators.required]],
+      deptIds: [null, [Validators.required]],
+      type: [null, [Validators.required]],
+    });
+  }
+  // 表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty({ onlySelf: true });
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+    this.btnLoading = true;
+    if(this.add){
+      this.quickOrderAcceptanceService
+      .add({
+        title: this.validateForm.value.title,
+        taskTypeIds: this.validateForm.value.taskTypeIds,
+        deptIds: this.validateForm.value.deptIds,
+        type: {id: this.validateForm.value.type},
+        hosId: this.hosId,
+      })
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.hideModal();
+        this.initForm();
+        if (data.status == 200) {
+          this.showPromptModal(this.add ? "新增" : "编辑", true, "");
+        } else {
+          this.showPromptModal(this.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
+    }else{
+      this.quickOrderAcceptanceService
+      .update({
+        title: this.validateForm.value.title,
+        taskTypeIds: this.validateForm.value.taskTypeIds,
+        deptIds: this.validateForm.value.deptIds,
+        type: {id: this.validateForm.value.type},
+        coopData: this.coopData,
+      })
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.hideModal();
+        this.initForm();
+        if (data.status == 200) {
+          this.showPromptModal(this.add ? "新增" : "编辑", true, "");
+        } else {
+          this.showPromptModal(this.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
+    }
+  }
+	
+	// 批量恢复
+	infoContent:any;
+	optModal:boolean = false;
+	operationType:any;
+	batchRecover(){
+		if(this.checkedDepIds.length==0){
+			this.message.error('请勾选告警列表')
+			return
+		}
+		this.operationType = 'batchRecovery'
+		this.infoContent=`您确认要恢复${this.checkedDepIds.length}项告警吗？`
+		this.optModal = true
+	}
+	
+	// 批量不处理
+	batchNo(){
+		if(this.checkedDepIds.length==0){
+			this.message.error('请勾选告警列表')
+			return
+		}
+		this.operationType = 'batchUnprocessed'
+		this.infoContent=`您确认要不处理${this.checkedDepIds.length}项告警吗？`
+		this.optModal = true
+	}
+	
+	// 确认
+	confirmOpt() {
+	  this.btnLoading = true;
+	  this.quickOrderAcceptanceService
+	  .operation({
+	    operationType: this.operationType,
+	    ids: this.checkedDepIds,
+	  })
+	  .subscribe((data) => {
+	    this.btnLoading = false;
+	    this.hideOptModal();
+	    if (data.status == 200) {
+	      this.showPromptModal("操作", true, "");
+	    } else {
+	      this.showPromptModal("操作", false, data.msg);
+	    }
+	  });
+	}
+	
+	// 关闭模态框
+	hideOptModal() {
+	  this.optModal = false;
+	}
+	
+	// 建单
+	addOrder(data){
+		this.tool.triggerEvent({
+			message:'建单',
+			data: data
+		})
+	}
+	
+	// 查看工单
+	detailModalShow = false; //弹窗开关
+	detail(e, data) {
+	  e.stopPropagation();
+	  this.coopData = data;
+	  this.detailModalShow = true;
+	}
+	// 关闭弹窗
+	closeDetailModelOrder(e) {
+	  this.detailModalShow = JSON.parse(e).show;
+	}
+	// 弹窗确定
+	confirmDetailModelOrder(e){
+	  console.log(e);
+	  this.detailModalShow = false;
+	  this.getList(true);
+	}
+	
+	refreshList(){
+		
+	}
+	
+	// 查看列表
+	itemData:any;
+	lookModal:boolean = false;
+	look(data){
+		this.itemData = data;
+		this.lookModal = true
+	}
+	
+	// 关闭查看
+	close(){
+		this.lookModal = false
+	}
+	
+  // 选中表格中科室
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中科室id
+  refreshStatus(): void {
+    this.isAllDisplayDataChecked = this.listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+    console.log(this.checkedDepIds);
+  }
+
+  //表格整行选中
+  selectedListData(id) {
+    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
+    this.refreshStatus();
+  }
+
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
+    this.refreshStatus();
+  }
+
+  // 编辑
+  maskFlag: any = false;
+  coopData = {};
+  edit(data) {
+    this.validateForm.controls.title.setValue(data.title);
+    this.validateForm.controls.type.setValue(data.type ? data.type.id : null);
+    this.validateForm.controls.taskTypeIds.setValue(data.taskTypeList ? data.taskTypeList.map(v => v.id) : null);
+    this.validateForm.controls.deptIds.setValue(data.deptList ? data.deptList.map(v => v.id) : null);
+    this.modal = true;
+    this.add = false;
+    this.coopId = data.id;
+    this.coopData = data;
+    this.getTasktype();
+    this.getDept();
+    this.getTypeList();
+  }
+
+  // 删除
+  delModal: boolean = false; //删除模态框
+  del(data) {
+    this.coopId = data.id;
+    this.delModal = true;
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(true);
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(e) {
+    this.changeInpSubject.next([e]);
+  }
+
+  // 边输边搜节流阀
+  changeDeptInp(e) {
+    this.changeInpDeptSubject.next([e]);
+  }
+
+  // 打开任务类型
+  openTasktype(e){
+    if(e){
+      this.getTasktype();
+    }
+  }
+
+  // 打开科室
+  openDept(e){
+    if(e){
+      this.getDept();
+    }
+  }
+
+  // 打开班次
+  openSchedule(e){
+    if(e){
+      this.getTypeList();
+    }
+  }
+}
+
+

src/app/views/emergency-info/emergency-info.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { EmergencyInfoRoutingModule } from './emergency-info-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { EmergencyInfoComponent } from './emergency-info.component';
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
+
+@NgModule({
+  declarations: [
+    EmergencyInfoComponent,
+  ],
+  imports: [
+    CommonModule,
+    EmergencyInfoRoutingModule,
+    ShareModule,
+		IncidentDetailModule
+  ]
+})
+export class EmergencyInfoModule { }

src/app/views/emergency-info/emergency-info.service.ts

@@ -0,0 +1,110 @@
+import { Injectable } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class EmergencyInfoService {
+  constructor(
+    private mainService: MainService,
+  ) { }
+
+  // 列表-查
+  query({pageIndex, pageSize, alarm}) {
+    let data = {
+      idx: pageIndex - 1,
+      sum: pageSize,
+      alarm
+    };
+    return this.mainService.getFetchDataList("simple/data", "alarm", data);
+  }
+
+  // 列表-删
+  delete({id}) {
+    return this.mainService.simplePost("rmvData", "alarm", [id]);
+  }
+
+  // 列表-增
+  add({title, type, taskTypeIds, deptIds, hosId}) {
+    let data = {
+      title,
+      taskTypeIds: taskTypeIds.toString(),
+      deptIds: deptIds.toString(),
+      type,
+      hosId,
+    };
+    return this.mainService.simplePost("addData", "alarm", data);
+  }
+
+  // 列表-改
+  update({title, type, taskTypeIds, deptIds, coopData}) {
+    let data = {
+      title,
+      taskTypeIds: taskTypeIds.toString(),
+      deptIds: deptIds.toString(),
+      type,
+    };
+    data = {...coopData, ...data};
+    return this.mainService.simplePost("addData", "alarm", data);
+  }
+	
+	// 恢复、不处理
+	operation(data) {
+	  return this.mainService.simplePost("updData", "alarm", data);
+	}
+	
+  // 查询任务类型
+  queryTasktype({hosId, keywords}){
+    let postData = {
+      taskType: {
+        simpleQuery: true,
+        hosId: {id: hosId},
+        taskName: keywords,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    return this.mainService.getFetchDataList("configuration", "taskType", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({id: vv.id, name: vv.taskName}));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));
+  }
+
+  // 查询科室
+  queryDept({hosId, keywords}){
+    let postData = {
+      department: {
+        simpleQuery: true,
+        hospital: {id: hosId},
+        dept: keywords,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    return this.mainService.getFetchDataList("data", "department", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({id: vv.id, name: vv.dept}));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));
+  }
+
+  // 字典
+  getDictionary(type) {
+    return this.mainService.getDictionary("list", type);
+  }
+
+  // 打印二维码
+  print(ids) {
+    return this.mainService.coopWorkerOrder("generateReceiveCodes", ids)
+  }
+}
+
+

src/app/views/fuwutai/fuwutai.component.html

@@ -998,9 +998,20 @@
       <div class="title" *ngIf="currentTabIndex !== '故障报修' && currentTabIndex !== '政务值班'">
         <div class="newTop">
           <div class="name">来电咨询</div>
-          <div class="newTopItem">
+					<div class="newTopItem" *ngIf="crossHospital==1">
+					  <span class="grayFont required">院区：</span>
+					  <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="inHosId" (ngModelChange)="changeInHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
+					    <ng-container *ngFor="let option of applicationHospitalList">
+					      <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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="newTopItem" *ngIf="crossHospital==1">
             <span class="grayFont">申请科室：</span>
-            <nz-select style="width: 146px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('hsms', $event)" nzPlaceHolder="请选择申请科室" [(ngModel)]="applyDept" (ngModelChange)="changeApply($event)" (nzOpenChange)="openChangeApply($event)">
+            <nz-select style="width: 146px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('hsms', $event)" nzPlaceHolder="请选择申请科室" [(ngModel)]="applyDept" (ngModelChange)="changeApply($event)">
               <ng-container *ngFor="let option of applicationDepartmentList">
                 <nz-option *ngIf="!isLoadingApply" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -1009,6 +1020,17 @@
               </nz-option>
             </nz-select>
           </div>
+					<div class="newTopItem" *ngIf="crossHospital!=1">
+					  <span class="grayFont">申请科室：</span>
+					  <nz-select style="width: 146px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('hsms', $event)" nzPlaceHolder="请选择申请科室" [(ngModel)]="applyDept" (ngModelChange)="changeApply($event)" (nzOpenChange)="openChangeApply($event)">
+					    <ng-container *ngFor="let option of applicationDepartmentList">
+					      <nz-option *ngIf="!isLoadingApply" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+					    </ng-container>
+					    <nz-option *ngIf="isLoadingApply" nzDisabled nzCustomContent>
+					      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					    </nz-option>
+					  </nz-select>
+					</div>
           <div class="newTopItem" *ngIf="false">
             <span class="grayFont">任务类型：</span>
             <nz-select *ngIf="applyDept" style="width: 146px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="onSearchTaskBuild($event)" nzPlaceHolder="请选择任务类型" [(ngModel)]="taskBuild" (ngModelChange)="changeTaskBuild($event)">
@@ -1203,7 +1225,20 @@
                           </div>
                         </div>
                         <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" [ngStyle]="{ display: (deptZyList['startStatus'] != 201 && !isTaskTypeInspect) ? 'block' : 'none'}">
-                          <nz-form-item>
+                          <nz-form-item *ngIf="(deptZyList.startStatus == 204 || deptZyList.startStatus == 205) && deptZyList.startMultipleHospital==1">
+                            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startHosId">起点科室院区</nz-form-label>
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室院区！">
+                              <nz-select [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择起点科室院区" formControlName="startHosId" (ngModelChange)="changeTypeHospital($event, 1)" nzAllowClear>
+                                <ng-container *ngFor="let option of applicationHospitalList">
+                                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startDept">起点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室！">
                               <nz-select formControlName="startDept" [nzDisabled]="deptZyList.startStatus == 201 || deptZyList.startStatus == 203 || deptZyList.startStatus == 206" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType" (nzOnSearch)="searchHosDepartment(checkedHos, 'start', $event)" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptZy">
@@ -1219,7 +1254,20 @@
                           </nz-form-item>
                         </div>
                         <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24">
-                          <nz-form-item>
+                          <nz-form-item *ngIf="(deptZyList.endStatus == 204 || deptZyList.endStatus == 205) && deptZyList.endMultipleHospital==1">
+                            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endHosId">终点科室院区</nz-form-label>
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室院区！">
+                              <nz-select [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择终点科室院区" formControlName="endHosId" (ngModelChange)="changeTypeHospital($event, 2)" nzAllowClear>
+                                <ng-container *ngFor="let option of applicationHospitalList">
+                                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDepts">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
                               <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType" (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
@@ -1314,7 +1362,20 @@
                           </nz-form-item>
                         </div>
                         <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" [ngStyle]="{ display: deptQtList['startStatus'] != 201 ? 'block' : 'none' }">
-                          <nz-form-item>
+													<nz-form-item *ngIf="(deptQtList.startStatus == 204 || deptQtList.startStatus == 205) && deptQtList.startMultipleHospital==1">
+													  <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startHosId">起点科室院区</nz-form-label>
+													  <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室院区！">
+													    <nz-select [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择起点科室院区" formControlName="startHosId" (ngModelChange)="changeTypeQtHospital($event, 1)" nzAllowClear>
+													      <ng-container *ngFor="let option of applicationHospitalList">
+													        <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startDeptQt">起点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室！">
                               <nz-select formControlName="startDeptQt" [nzDisabled]="deptQtList.startStatus == 201 || deptQtList.startStatus == 203" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType" (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'start', $event)" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptQt">
@@ -1330,7 +1391,20 @@
                           </nz-form-item>
                         </div>
                         <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12">
-                          <nz-form-item>
+                          <nz-form-item *ngIf="(deptQtList.endStatus == 204 || deptQtList.endStatus == 205) && deptQtList.endMultipleHospital==1">
+														<nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endHosId">终点科室院区</nz-form-label>
+														<nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室院区！">
+															<nz-select [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择终点科室院区" formControlName="endHosId" (ngModelChange)="changeTypeQtHospital($event, 2)" nzAllowClear>
+																<ng-container *ngFor="let option of applicationHospitalList">
+																	<nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDeptsQt">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
                               <nz-select formControlName="endDeptsQt" [nzDisabled]="deptQtList.endStatus == 201 || deptQtList.endStatus == 203" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType" (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'end', $event)"

src/app/views/fuwutai/fuwutai.component.less

@@ -1869,7 +1869,7 @@
   // 右侧悬浮菜单-录音盒或呼叫中心状态
   .fixedAll {
     position: fixed;
-    top: 0;
+    top: 30%;
     right: 0;
     z-index: 10;
     border-radius: 5px 0 0 5px;

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

@@ -6,7 +6,7 @@ import {
   ElementRef,
   HostListener,
 } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { FormBuilder, FormGroup, Validators, FormControl } from "@angular/forms";
 import { Router, ActivatedRoute } from "@angular/router";
 
 import { MainService } from "../../services/main.service";
@@ -975,6 +975,8 @@ export class FuwutaiComponent implements OnInit {
       goods: [null], //携带设备
       inspectScore: [null], //陪检方式
       workOrderRemarkZy: [null], //工单备注
+			startHosId: [null, [Validators.required]],
+			endHosId: [null, [Validators.required]],
     });
     //其他
     this.validateFormQt = this.fb.group({
@@ -982,6 +984,8 @@ export class FuwutaiComponent implements OnInit {
       startDeptQt: [null, [Validators.required]], //起点科室
       endDeptsQt: [null, [Validators.required]], //终点科室
       workOrderRemark: [null], //工单备注
+			startHosId: [null, [Validators.required]],
+			endHosId: [null, [Validators.required]],
     });
 
     this.getWebsocketSer();
@@ -1500,7 +1504,7 @@ export class FuwutaiComponent implements OnInit {
   checkedHosDTO;// 配送-院区选择
   scopeGroups = []; //配送-当前所属人员分组
   orderScopeRadio;// 配送-工单范围
-
+	crossHospital:any = '0'; // 配送-是否支持跨院区
   itsmCheckedHos;// 运维-院区选择
   itsmScopeGroups = []; //运维-当前所属人员分组
   itsmOrderScopeRadio;// 运维-工单范围
@@ -1508,13 +1512,17 @@ export class FuwutaiComponent implements OnInit {
     checkedHos: undefined,
     scopeGroups: [],
     orderScopeRadio: '0',
+		crossHospital: '0',
   }; //转运工单范围相关信息
 	showGovDuty:any; //是否开通政务值班
   itsmData: any = {
     checkedHos: [],
     scopeGroups: [],
+		groupIds: [],
     orderScopeRadio: '0',
   }; //运维工单范围相关信息
+	inHosId:any;
+	dutyGroupUserRangeList:any = [];
   initOrderScope() {
     if (!this.user || !this.user.user || !this.user.user.scope){
       this.showOrderScope();
@@ -1524,9 +1532,10 @@ export class FuwutaiComponent implements OnInit {
     this.checkedHos = scopeInfo.hospitalId ? scopeInfo.hospitalId.id : undefined;
     this.checkedHosDTO = scopeInfo.hospitalId || undefined;
     this.orderScopeRadio = scopeInfo.range + "";
+		this.crossHospital = scopeInfo.crossHospital || '0';
 		this.showGovDuty = scopeInfo.showGovDuty;
     let groupIds = scopeInfo.groupIds || [];
-    let dutyGroupList = scopeInfo.dutyGroupList || [];
+    let dutyGroupList = scopeInfo.dutyGroupUserRangeList || [];
     this.scopeGroups = dutyGroupList.concat(groupIds);
     if(this.scopeGroups.length){
       this.typeId = this.scopeGroups[0].id;
@@ -1537,16 +1546,19 @@ export class FuwutaiComponent implements OnInit {
       scopeGroups: this.scopeGroups,
       orderScopeRadio: this.orderScopeRadio || '0',
       hsmsSwitch: scopeInfo.hsmsSwitch === 1,
+			crossHospital: this.crossHospital || '0',
     }
     this.flagList.hsmsFlag1 = this.hsmsData.hsmsSwitch;
     this.flagList.hsmsFlag2 = this.hsmsData.hsmsSwitch;
     this.flagList.hsmsFlag3 = this.hsmsData.hsmsSwitch;
     this.itsmCheckedHos = scopeInfo.dutyList || [];
     this.itsmOrderScopeRadio = scopeInfo.dutyRange + "";
-    this.itsmScopeGroups = scopeInfo.dutyGroupList || [];
+    this.itsmScopeGroups = scopeInfo.dutyGroupUserRangeList || [];
+		this.dutyGroupUserRangeList = scopeInfo.dutyGroupList || []
     this.itsmData = {
       checkedHos: this.itsmCheckedHos,
       scopeGroups: this.itsmScopeGroups,
+			groupIds: this.dutyGroupUserRangeList,
       orderScopeRadio: this.itsmOrderScopeRadio || '0',
       mdv2Switch: scopeInfo.mdv2Switch === 1,
       allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
@@ -2357,9 +2369,10 @@ export class FuwutaiComponent implements OnInit {
         idx: 0,
         sum: 1,
       }
+			let groupIds = this.dutyGroupUserRangeList.map(i=> i.id)
       if(stateId == 1){
         postData.incidentQuery.incident = {
-          // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          "groupIds": groupIds.length>0 ? groupIds.toString() : undefined,
           "acceptDutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "storageAcceptReassign",
@@ -2375,7 +2388,7 @@ export class FuwutaiComponent implements OnInit {
 				!this.user.user.scope.showGovDuty ? undefined : this.user.user.scope.showGovDuty
 			}else if(stateId == 2){
         postData.incidentQuery.incident = {
-          // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          "groupIds": groupIds.length>0 ? groupIds.toString() : undefined,
           "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "todoState",
@@ -2384,7 +2397,7 @@ export class FuwutaiComponent implements OnInit {
         }
       }else if(stateId == 3){
         postData.incidentQuery.incident = {
-          // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          "groupIds": groupIds.length>0 ? groupIds.toString() : undefined,
           "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "doing",
@@ -2822,6 +2835,7 @@ export class FuwutaiComponent implements OnInit {
 		this.malPriorityDTO = null;
     this.buildType = buildType;
 		console.log(123,buildType)
+		this.searchApplicationHospital();
     if(this.itsmData.mdv2Switch){
       if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
         this.resetOrderData();
@@ -2829,7 +2843,6 @@ export class FuwutaiComponent implements OnInit {
         this.resetOrderData2();
       }
 			this.getSysConfig(type);
-      this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
       this.searchApplicationSource();
@@ -2909,7 +2922,9 @@ export class FuwutaiComponent implements OnInit {
       this.noWorkerPhone = false;
     } else {
       //正常初始化
-      this.searchApplicationDepartment("hsms");
+			if(this.crossHospital!=1){
+				this.searchApplicationDepartment("hsms");
+			}
       this.noWorkerPhone = true;
     }
     this.getSearchTaskList("").subscribe((result) => {
@@ -3208,11 +3223,18 @@ export class FuwutaiComponent implements OnInit {
 						if(Number(this.deathTasktypeId) != this.taskTypeId){
 							// 患者信息自动带入
 							let item = this.patientList.find(i=> i.patientCode == this.patientCode)
+							console.log(22222, item)
 							if(item){
 								this.validateFormZy.controls.patient.setValue(item.patientCode+"");
+							}else{
+								this.validateFormZy.controls.patient.setValue(null);
 							}
 						}
 					}
+				}else{
+					this.patientObj = null;
+					this.patientCode = null;
+					this.taskTypeId = null;
 				}
         // if (this.patientList.length) {
         //   this.patientList = this.patientList.filter((item) => !!item.bednum);
@@ -3293,6 +3315,98 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
+	
+	// 患者转运-任务类型-院区切换
+	changeTypeHospital(e, type){
+		console.log(111,e)
+		if(type==1){
+			this.validateFormZy.controls.startDept.setValue(null)
+		}else{
+			this.validateFormZy.controls.endDepts.setValue(null)
+		}
+		this.getStartDept(type)
+	}
+	
+	// 患者转运-任务类型-搜索起点科室
+	getStartDept(type){
+		let dataObj = {
+		  idx: 0,
+		  sum: 20,
+		  department: {
+		    searchType: 1,// 简单查询
+		    cascadeHosId: type==1 ? this.validateFormZy.controls.startHosId.value : this.validateFormZy.controls.endHosId.value,
+		    flag: 1,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "department", dataObj)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+					if(data.list.length>0){
+						data.list.forEach(i=>{
+							if(i.inputcode){
+								i.inputcode = i.inputcode.toUpperCase()
+								i.dept = i.dept + '('+i.inputcode+')'
+							}
+						})
+					}
+					if(type==1){
+						this.deptZyList.startDept = data.list
+					}else{
+						this.deptZyList.endDept = data.list
+					}
+		    }
+		  });
+	}
+	
+	// 物品配送-任务类型-院区切换
+	changeTypeQtHospital(e, type){
+		if(type==1){
+			this.validateFormQt.controls.startDeptQt.setValue(null)
+		}else{
+			this.validateFormQt.controls.endDeptsQt.setValue(null)
+		}
+		this.getStartQtDept(type)
+	}
+	
+	// 物品配送-任务类型-搜索起点科室
+	getStartQtDept(type){
+		let dataObj = {
+		  idx: 0,
+		  sum: 20,
+		  department: {
+		    searchType: 1,// 简单查询
+		    cascadeHosId: type==1 ? this.validateFormQt.controls.startHosId.value : this.validateFormQt.controls.endHosId.value,
+		    flag: 1,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "department", dataObj)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+					if(data.list.length>0){
+						data.list.forEach(i=>{
+							if(i.inputcode){
+								i.inputcode = i.inputcode.toUpperCase()
+								i.dept = i.dept + '('+i.inputcode+')'
+							}
+						})
+					}
+					if(type==1){
+						this.deptQtList.startDept = data.list
+					}else{
+						this.deptQtList.endDept = data.list
+					}
+		    }
+		  });
+	}
+	
+	// 配送院区选择
+	changeInHospital(e){
+		this.applyDept = undefined;
+		this.searchApplicationDepartment('hsms');
+	}
+	
   // 选择院区
   changeApplyHospital(e){
     console.log(e);
@@ -3937,7 +4051,7 @@ export class FuwutaiComponent implements OnInit {
     if(type == 'itsm'){
       cascadeHosId = this.incidentModel.hosId || undefined;
     }else{
-      cascadeHosId = this.checkedHos;
+      cascadeHosId = this.inHosId ? this.inHosId : this.checkedHos;
     }
     let dataObj = {
       idx: 0,
@@ -4232,7 +4346,11 @@ export class FuwutaiComponent implements OnInit {
       if (this.currentTabIndex == "患者转运") {
         //患者转运
         //获取患者信息
-        this.getPatientList(this.applyDept, "");
+				this.patientObj = null;
+				this.patientCode = null;
+				this.taskTypeId = null;
+				console.log(99988778899, this.patientCode)
+        this.getPatientList(this.applyDept, "", "", "change");
       }
       if (this.currentRTab === 0) {
         this.getWorkOrders(this.applyDept);
@@ -4623,6 +4741,8 @@ export class FuwutaiComponent implements OnInit {
         this.jry_shixian();
       }
 			this.goType = null;
+			this.patientObj = null;
+			this.taskTypeId = null;
 			this.patientCode = null;
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
@@ -4788,11 +4908,19 @@ export class FuwutaiComponent implements OnInit {
     //id院区,type起点科室'start',终点科室'end'。科室名称dept。
     let value = "";
     if (dept) {
-      value = dept;
+      value = dept.toUpperCase();
     }
 		if (type === "start" && this.deptZyList["startStatus"] == 202) {
 		  //固定科室范围，禁止搜索
 			this.mainService.getdeptList(this.radioValueZy).subscribe((data:any) => {
+				if(data.startDept){
+					data.startDept.forEach(i=>{
+						if(i.inputcode){
+							i.inputcode = i.inputcode.toUpperCase()
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
+				}
 				let arr = data;
 				if(value!=''){
 					data = arr.startDept.filter(i=>i.dept.indexOf(value) !=-1)
@@ -4805,6 +4933,14 @@ export class FuwutaiComponent implements OnInit {
 		} else if (type === "end" && this.deptZyList["endStatus"] == 202) {
 		  //固定科室范围，禁止搜索
 			this.mainService.getdeptList(this.radioValueZy).subscribe((data:any) => {
+				if(data.endDept){
+					data.endDept.forEach(i=>{
+						if(i.inputcode){
+							i.inputcode = i.inputcode.toUpperCase()
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
+				}
 				let arr = data;
 				if(value!=''){
 					data = arr.endDept.filter(i=>i.dept.indexOf(value) !=-1)
@@ -4815,12 +4951,19 @@ export class FuwutaiComponent implements OnInit {
 			})
 		  return;
 		}
+		let hsoId = null
+		if(type === "start" && this.deptZyList.startMultipleHospital==1){
+			hsoId = this.validateFormZy.controls.startHosId.value
+		}
+		if(type === "end" && this.deptZyList.endMultipleHospital==1){
+			hsoId = this.validateFormZy.controls.endHosId.value
+		}
     let postData = {
       idx: 0,
       sum: 10,
       department: {
         dept: value,
-        cascadeHosId: id
+        cascadeHosId: hsoId ? hsoId : id
       },
     };
     if (type == "start" && this.deptZyList["startStatus"] == 205) {
@@ -4834,6 +4977,14 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         this.isLoading = false;
         if (data["status"] == 200) {
+					if(data.list.length>0){
+						data.list.forEach(i=>{
+							if(i.inputcode){
+							  i.inputcode = i.inputcode.toUpperCase()
+							  i.dept = i.dept + '('+i.inputcode+')'
+							}
+						})
+					}
           if (type === "start") {
             this.deptZyList["startDept"] = data.list;
           } else if (type === "end") {
@@ -4855,11 +5006,19 @@ export class FuwutaiComponent implements OnInit {
     //id院区,type起点科室'start',终点科室'end'。科室名称dept。
     let value = "";
     if (dept) {
-      value = dept;
+      value = dept.toUpperCase();
     }
     if (type === "start" && this.deptQtList["startStatus"] == 202) {
       //固定科室范围，禁止搜索
 			this.mainService.getdeptList(this.psValue).subscribe((data:any) => {
+				if(data.startDept){
+					data.startDept.forEach(i=>{
+						if(i.inputcode){
+							i.inputcode = i.inputcode.toUpperCase()
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
+				}
 				let arr = data;
 				if(value!=''){
 					data = arr.startDept.filter(i=>i.dept.indexOf(value) !=-1)
@@ -4872,6 +5031,14 @@ export class FuwutaiComponent implements OnInit {
     } else if (type === "end" && this.deptQtList["endStatus"] == 202) {
       //固定科室范围，禁止搜索
 			this.mainService.getdeptList(this.psValue).subscribe((data:any) => {
+				if(data.endDept){
+					data.endDept.forEach(i=>{
+						if(i.inputcode){
+							i.inputcode = i.inputcode.toUpperCase()
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
+				}
 				let arr = data;
 				if(value!=''){
 					data = arr.endDept.filter(i=>i.dept.indexOf(value) !=-1)
@@ -4882,12 +5049,19 @@ export class FuwutaiComponent implements OnInit {
 			})
       return;
     }
+		let hsoId = null
+		if(type === "start" && this.deptQtList.startMultipleHospital==1){
+			hsoId = this.validateFormQt.controls.startHosId.value
+		}
+		if(type === "end" && this.deptQtList.endMultipleHospital==1){
+			hsoId = this.validateFormQt.controls.endHosId.value
+		}
     let postData = {
       idx: 0,
       sum: 10,
       department: {
         dept: value,
-        cascadeHosId: id
+        cascadeHosId: hsoId ? hsoId : id
       },
     };
     if (type == "start" && this.deptQtList["startStatus"] == 205) {
@@ -4901,6 +5075,14 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         this.isLoading = false;
         if (data["status"] == 200) {
+					if(data.list.length>0){
+						data.list.forEach(i=>{
+							if(i.inputcode){
+							  i.inputcode = i.inputcode.toUpperCase()
+							  i.dept = i.dept + '('+i.inputcode+')'
+							}
+						})
+					}
           if (type === "start") {
             this.deptQtList["startDept"] = data.list;
           } else if (type === "end") {
@@ -5190,11 +5372,33 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是201 则是默认发起科室，把申请科室作为值
     // 返回值的status是202 则是固定科室范围，会返回科室列表
     // 返回值的status是203 则是固定科室，会返回单个科室
-    // 返回值的status是204 则让前端自己调用科室搜索接口
+    // 返回值的status是204 则让前端自己调用科室搜索接口-自主填写
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     // 返回值的status是206 则是默认患者所在科室，把患者所在科室作为值
     this.mainService.getdeptList(value, patientCode, (taskType.associationTypeValue === 'inspect' ? format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined), (taskType.associationTypeValue === 'inspect' ? format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined)).subscribe((data:any) => {
-      this.deptZyList = data;
+			if(data.startDept){
+				data.startDept.forEach(i=>{
+					if(i.inputcode){
+						i.inputcode = i.inputcode.toUpperCase()
+						i.dept = i.dept + '('+i.inputcode+')'
+					}
+				})
+			}
+			if(data.endDept){
+				data.endDept.forEach(i=>{
+					if(i.inputcode){
+						i.inputcode = i.inputcode.toUpperCase()
+						i.dept = i.dept + '('+i.inputcode+')'
+					}
+				})
+			}
+			this.deptZyList = data;
+			if(this.deptZyList.startMultipleHospital==1){
+				this.deptZyList.startDept = []
+			}
+			if(this.deptZyList.endMultipleHospital==1){
+				this.deptZyList.endDept = []
+			}
 			if(data.startStatus==202 || data.startStatus==204 || data.startStatus==205){
 				this.isStartFixedType = true
 			}else{
@@ -5205,7 +5409,34 @@ export class FuwutaiComponent implements OnInit {
 			}else{
 				this.isEndFixedType = false
 			}
-
+			if((data.startStatus==204 || data.startStatus==205) && data.startMultipleHospital==1){
+				if(this.validateFormZy.value.startHosId){
+					this.validateFormZy.controls.startHosId.setValue(null)
+				}
+				this.validateFormZy.addControl(
+				  "startHosId",
+				  new FormControl(null, Validators.required)
+				);
+			}else{
+				if(this.validateFormZy.value.startHosId){
+					this.validateFormZy.controls.startHosId.setValue(null)
+				}
+				this.validateFormZy.removeControl("startHosId");
+			}
+			if((data.endStatus==204 || data.endStatus==205) && data.endMultipleHospital==1){
+				if(this.validateFormZy.value.endHosId){
+					this.validateFormZy.controls.endHosId.setValue(null)
+				}
+				this.validateFormZy.addControl(
+				  "endHosId",
+				  new FormControl(null, Validators.required)
+				);
+			}else{
+				if(this.validateFormZy.value.endHosId){
+					this.validateFormZy.controls.endHosId.setValue(null)
+				}
+				this.validateFormZy.removeControl("endHosId");
+			}
       // 预约start
       this.currentTasktype = data.taskType;
       this.isYyInspect = false;
@@ -5235,7 +5466,7 @@ export class FuwutaiComponent implements OnInit {
       }
       // 起点科室
       if (data["startStatus"] == 201 || data["startStatus"] == 206) {
-        if (this.applyDept) {
+        if (this.applyDept && data.startMultipleHospital!=1) {
           //选择了申请科室,则起点科室就是申请科室
           this.deptZyList["startDept"] = this.applicationDepartmentList.filter(
             (item) => item.id == this.applyDept
@@ -5244,12 +5475,12 @@ export class FuwutaiComponent implements OnInit {
         }
       } else if (data["startStatus"] == 203) {
         this.startDeptZy = data["startDept"][0]["id"];
-      } else if (data["startStatus"] == 204 || data["startStatus"] == 205) {
+      } else if ((data["startStatus"] == 204 || data["startStatus"] == 205) && data.startMultipleHospital!=1) {
         this.getHosDepartment(this.checkedHos, "start", "");
       }
       // 终点科室
       if (data["endStatus"] == 201 || data["endStatus"] == 206) {
-        if (this.applyDept) {
+        if (this.applyDept && data.endMultipleHospital!=1) {
           //选择了申请科室,则终点科室就是申请科室
           this.deptZyList["endDept"] = this.applicationDepartmentList.filter(
             (item) => item.id == this.applyDept
@@ -5258,7 +5489,7 @@ export class FuwutaiComponent implements OnInit {
         }
       } else if (data["endStatus"] == 203) {
         this.endDeptZy = data["endDept"][0]["id"];
-      } else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
+      } else if ((data["endStatus"] == 204 || data["endStatus"] == 205) && data.endMultipleHospital!=1) {
         this.getHosDepartment(this.checkedHos, "end", "");
       }
       if (this.currentTabIndex == "患者转运") {
@@ -5336,7 +5567,30 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是204 则让前端自己调用科室搜索接口
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     this.mainService.getdeptList(value).subscribe((data:any) => {
+			if(data.startDept){
+				data.startDept.forEach(i=>{
+					if(i.inputcode){
+					  i.inputcode = i.inputcode.toUpperCase()
+					  i.dept = i.dept + '('+i.inputcode+')'
+					}
+				})
+			}
+			if(data.endDept){
+				data.endDept.forEach(i=>{
+					if(i.inputcode){
+					  i.inputcode = i.inputcode.toUpperCase()
+					  i.dept = i.dept + '('+i.inputcode+')'
+					}
+				})
+			}
       this.deptQtList = data;
+			if(this.deptQtList.startMultipleHospital==1){
+				this.deptQtList.startDept = []
+			}
+			if(this.deptQtList.endMultipleHospital==1){
+				this.deptQtList.endDept = []
+			}
+
 			if(data.startStatus==202 || data.startStatus==204 || data.startStatus==205){
 				this.isStartFixedType = true
 			}else{
@@ -5347,6 +5601,34 @@ export class FuwutaiComponent implements OnInit {
 			}else{
 				this.isEndFixedType = false
 			}
+			if((data.startStatus==204 || data.startStatus==205) && data.startMultipleHospital==1){
+				if(this.validateFormQt.value.startHosId){
+					this.validateFormQt.controls.startHosId.setValue(null)
+				}
+				this.validateFormQt.addControl(
+				  "startHosId",
+				  new FormControl(null, Validators.required)
+				);
+			}else{
+				if(this.validateFormQt.value.startHosId){
+					this.validateFormQt.controls.startHosId.setValue(null)
+				}
+				this.validateFormQt.removeControl("startHosId");
+			}
+			if((data.endStatus==204 || data.endStatus==205) && data.endMultipleHospital==1){
+				if(this.validateFormQt.value.endHosId){
+					this.validateFormQt.controls.endHosId.setValue(null)
+				}
+				this.validateFormQt.addControl(
+				  "endHosId",
+				  new FormControl(null, Validators.required)
+				);
+			}else{
+				if(this.validateFormQt.value.endHosId){
+					this.validateFormQt.controls.endHosId.setValue(null)
+				}
+				this.validateFormQt.removeControl("endHosId");
+			}
       // 预约start
       this.currentTasktype = data.taskType;
       this.isYyInspect = false;
@@ -5366,7 +5648,7 @@ export class FuwutaiComponent implements OnInit {
         }
       } else if (data["startStatus"] == 203) {
         this.startDeptQt = data["startDept"][0]["id"];
-      } else if (data["startStatus"] == 204 || data["startStatus"] == 205) {
+      } else if ((data["startStatus"] == 204 || data["startStatus"] == 205) && data.startMultipleHospital!=1) {
         this.getHosDepartmentQt(this.checkedHos, "start", "");
       }
       // 终点科室
@@ -5380,7 +5662,7 @@ export class FuwutaiComponent implements OnInit {
         }
       } else if (data["endStatus"] == 203) {
         this.endDeptQt = data["endDept"][0]["id"];
-      } else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
+      } else if ((data["endStatus"] == 204 || data["endStatus"] == 205) && data.endMultipleHospital!=1) {
         this.getHosDepartmentQt(this.checkedHos, "end", "");
       }
     });
@@ -5420,6 +5702,14 @@ export class FuwutaiComponent implements OnInit {
 		if(this.currentTabIndex!='患者转运'){
 			this.patientCode = null;
 		}
+		if(this.crossHospital==1){
+			if(!this.inHosId){
+				this.msg.error('院区不能为空'!)
+				this.isOkLoading = false;
+				this.isGoLoading = false;
+				return
+			}
+		}
     if (objZy && objZy.associationTypeValue === 'patientTransport') {
       //患者转运
       go === "&go&" ? this.submitFormZy(go) : this.submitFormZy();
@@ -5452,6 +5742,7 @@ export class FuwutaiComponent implements OnInit {
 		this.selectProvince = false;
 		this.itsmZwOrders = [];
 		this.patientCode = null;
+		this.inHosId = null;
     this.currentTabIndex = "";
     this.fixedTab = "";
     this.fixedMenuShangla();
@@ -5467,6 +5758,9 @@ export class FuwutaiComponent implements OnInit {
     this.goodsNow = [];
     this.workOrderInspectScore = undefined;
     this.patientList = [];
+		this.patientObj = null;
+		this.taskTypeId = null;
+		this.patientCode = null;
     this.workOrderRemark = "";
     this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
@@ -5901,7 +6195,7 @@ export class FuwutaiComponent implements OnInit {
 						'position': 'fixed',
 						'top': '0',
 						'left': '0',
-						'z-index': '8',
+						'z-index': '50',
 						'border-radius': '5px 0 0 5px'
 					}
 				}else if(this.leftMenuLocation==2){
@@ -5909,7 +6203,7 @@ export class FuwutaiComponent implements OnInit {
 						'position': 'fixed',
 						'top': '40%',
 						'left': '0',
-						'z-index': '8',
+						'z-index': '50',
 						'border-radius': '5px 0 0 5px'
 					}
 				}else{
@@ -5917,7 +6211,7 @@ export class FuwutaiComponent implements OnInit {
 						'position': 'fixed',
 						'bottom': '0',
 						'left': '0',
-						'z-index': '8',
+						'z-index': '50',
 						'border-radius': '5px 0 0 5px'
 					}
 				}
@@ -5926,7 +6220,7 @@ export class FuwutaiComponent implements OnInit {
 						'position': 'fixed',
 						'top': '0',
 						'right': '0',
-						'z-index': '8',
+						'z-index': '50',
 						'border-radius': '5px 0 0 5px'
 					}
 				}else if(this.rightMenuLocation==2){
@@ -5934,7 +6228,7 @@ export class FuwutaiComponent implements OnInit {
 						'position': 'fixed',
 						'top': '40%',
 						'right': '0',
-						'z-index': '8',
+						'z-index': '50',
 						'border-radius': '5px 0 0 5px'
 					}
 				}else{
@@ -5942,7 +6236,7 @@ export class FuwutaiComponent implements OnInit {
 						'position': 'fixed',
 						'bottom': '0',
 						'right': '0',
-						'z-index': '8',
+						'z-index': '50',
 						'border-radius': '5px 0 0 5px'
 					}
 				}
@@ -6016,6 +6310,7 @@ export class FuwutaiComponent implements OnInit {
 		console.log(99999,e)
     if (e === "close") {
 			this.goType = null;
+			this.inHosId = null;
       this.newOrderShowOpen = false; //此时可出现新的弹窗
     } else if (e === "closeGo") {
 			console.log(1111)

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

@@ -44,6 +44,10 @@
 	<ng-container *ngIf="activeTagLink === 'sysConfiguration'">
 	  <app-configuration-sys></app-configuration-sys>
 	</ng-container>
+	<!-- 自动建单 -->
+	<ng-container *ngIf="activeTagLink === 'incidentConfigVoluntarilyBuild'">
+	  <app-configuration-voluntarilyBuild [voluntarilyTabList]="voluntarilyTabList"></app-configuration-voluntarilyBuild>
+	</ng-container>
 </div>
 
 

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

@@ -31,7 +31,7 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 5, name: '状态', key: "incident_status"},
     { id: 6, name: '维修记录', key: "repair_type"},
     { id: 7, name: '满意度评价', key: "incident_degree"},
-		// { id: 8, name: '告警紧急度', key: "alarm_urgency"},
+		{ id: 8, name: '告警紧急度', key: "alarm_urgency"},
   ]
 
   // 院区配置
@@ -40,6 +40,10 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 2, name: '评价', key: "evaluate"}
   ]
 	
+	// 自动建单
+	voluntarilyTabList:any[] = [
+	  { id: 1, name: '告警建单', key: "alarmConfig"},
+	]
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/incident-config/incident-config.module.ts

@@ -13,7 +13,7 @@ import { ConfigurationDictionaryModule } from 'src/app/components/configurationC
 import { ConfigurationMessageModule } from 'src/app/components/configurationCenter/configuration-message/configuration-message.module';
 import { ConfigurationCommonFaultsComponent } from 'src/app/components/configurationCenter/configuration-commonFaults/configuration-commonFaults.component';
 import { ConfigurationSysComponent } from 'src/app/components/configurationCenter/configuration-sys/configuration-sys.component';
-
+import { ConfigurationVoluntarilyBuildComponent } from 'src/app/components/configurationCenter/configuration-voluntarilyBuild/configuration-voluntarilyBuild.component';
 
 @NgModule({
   declarations: [
@@ -24,7 +24,8 @@ import { ConfigurationSysComponent } from 'src/app/components/configurationCente
 		ConfigurationDeptUserComponent,
     ConfigurationHospitalComponent,
     ConfigurationCommonFaultsComponent,
-		ConfigurationSysComponent
+		ConfigurationSysComponent,
+		ConfigurationVoluntarilyBuildComponent
   ],
   imports: [
     CommonModule,

src/app/views/main/main-routing.module.ts

@@ -668,7 +668,16 @@ const routes: Routes = [
 			  path: "governmentDuty",
 			  loadChildren: () => import("../government-duty/government-duty.module").then((m) => m.GovernmentDutyModule),
 			},
-			
+			// 故障管理-告警信息
+			{
+			  path: "emergencyInfo",
+			  loadChildren: () => import("../emergency-info/emergency-info.module").then((m) => m.EmergencyInfoModule),
+			},
+			// 故障管理-通用信息
+			{
+			  path: "commonInfo",
+			  loadChildren: () => import("../common-info/common-info.module").then((m) => m.CommonInfoModule),
+			}
     ],
   },
 ];

src/app/views/main/main.component.html

@@ -321,7 +321,7 @@
 									<div class="col alignItemsStart">
 										<span class="name required">故障描述：</span>
 										<nz-input-group [nzSuffix]="suffixTemplate">
-											<textarea class="w100" nz-input rows="4" placeholder="请填写故障描述" [(ngModel)]="incidentModel.description"></textarea>
+											<textarea class="w100" [innerHTML]="incidentModel.description" nz-input rows="4" placeholder="请填写故障描述" [(ngModel)]="incidentModel.description"></textarea>
 										</nz-input-group>
 										<span #suffixTemplate class="ant-input-clear-icon ml8" *ngIf="incidentModel.description" (click)="incidentModel.description = null">清空</span>
 									</div>

src/app/views/main/main.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, TemplateRef, ViewChild } from "@angular/core";
+import { Component, OnInit, TemplateRef, ViewChild, OnDestroy  } from "@angular/core";
 import { NavigationEnd, Router } from "@angular/router";
 import { MainService } from "../../services/main.service";
 
@@ -34,7 +34,7 @@ function range(start: number, end: number): number[] {
   templateUrl: "./main.component.html",
   styleUrls: ["./main.component.less"],
 })
-export class MainComponent implements OnInit {
+export class MainComponent implements OnInit, OnDestroy {
   userInfo: any = JSON.parse(localStorage.getItem("user"));
 	user: any = JSON.parse(localStorage.getItem("user"));
   menus: any = JSON.parse(localStorage.getItem("menu"));
@@ -78,8 +78,12 @@ export class MainComponent implements OnInit {
     public tool: ToolService,
 		public incomingService: WebsocketIncomingService,
 		private http: HttpClient,
+		// private eventSubscription: Subscription
   ) {}
+	
+	eventData:any
   ngOnInit() {
+		this.getEvent();
 		this.initHospitalAndDuty(this.tool.getCurrentHospital());
     this.highlightMenuByUrl();
     this.routerEventsListener = this.router.events
@@ -92,13 +96,29 @@ export class MainComponent implements OnInit {
     this.initMenu();
     this.getWebsocket();
   }
-
+	
+	getEvent(){
+		// 全局监听
+		let that = this;
+		that.tool.getEventObservable().subscribe(res => {
+			that.eventData = res;
+			console.log('全局的监听触发111111', that.eventData);
+			if(that.eventData.message == '建单'){
+				that.speedinessAdd()
+			}
+		});
+	}
+	
   // 离开管理端
   ngOnDestroy() {
     //取消路由监听
     this.routerEventsListener.unsubscribe();
     // 断掉连接
     this.webs.closeWs(true);
+		
+		// if (this.eventSubscription) {
+			// this.eventSubscription.unsubscribe();
+		// }
   }
 
   // 菜单图标名称是否包含transport-
@@ -755,7 +775,7 @@ export class MainComponent implements OnInit {
 	      this.applyDept = null;
 	      this.countRemarkIndex = -1;
 	      this.incidentModel.department = isInit ? this.incidentModel.department : null;
-
+				
 	      //正常初始化
 	      this.getAutoWorkTypes(false, isInit);
 				this.newOrderShowOpen = true
@@ -1352,6 +1372,7 @@ export class MainComponent implements OnInit {
 	  let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
 	  let postData:any = {
 	    solutionId: this.solutionId,
+			alarmId:null,
 	    "incident": {
 	      "id": this.incidentModel.id || undefined,
 	      "deleteFlag": 0,
@@ -1393,10 +1414,16 @@ export class MainComponent implements OnInit {
 	      postData.incident = Object.assign({}, this.editOrder, postData.incident);
 	    }
 	  }
-
-	  this.mainService
+		let url = null
+		if(this.eventData){
+			postData.alarmId = this.eventData.data.id
+			url = this.mainService.addAlarmIncident(postData)
+		}else{
+			delete postData.alarmId
+			url = this.mainService
 	    .flowPost("incident/task/accept", postData)
-	    .subscribe((result) => {
+		}
+	  url.subscribe((result) => {
 	      this.msg.remove(this.maskFlag);
 	      this.maskFlag = false;
 
@@ -1789,6 +1816,27 @@ export class MainComponent implements OnInit {
 	            this.changeApplicationDepartment(phone);
 	          }
 	        }else if(type == 'itsm'){
+						if(this.eventData){
+							this.applicationRequesterList.push({
+								name: this.userInfo.user.name,
+								id: this.userInfo.user.id,
+							})
+							this.incidentModel.requester = this.userInfo.user.id;
+							this.incidentModel.description = 
+							'告警id：' + this.eventData.data.alarmId + ';' +
+							'告警来源：' + this.eventData.data.alarmSource + ';' +
+							'\n' +
+							'告警地点：' + this.eventData.data.alarmLocation + ';' +
+							'\n' +
+							'紧急度：' + this.eventData.data.alarmUrgency.name + ';' +
+							'告警时间：' + format(new Date(this.eventData.data.alarmActiveTime), 'yyyy-MM-dd HH:mm:ss') + ';' +
+							'\n' +
+							'告警ip：' + this.eventData.data.alarmIp + ';' +
+							'\n' +
+							'告警描述：' + this.eventData.data.alarmDescription + ';' +
+							'\n' +
+							'告警内容：' + this.eventData.data.alarmContent 
+						}
 	          this.applicationDeptList = data.list;
 	          let ids = this.applicationDeptList.map(v => v.id);
 	          isInit && !ids.includes(this.incidentModel.department) && (this.applicationDeptList.unshift({id: this.incidentModel.department, dept: this.incidentMsg.deptName}))
@@ -2133,6 +2181,7 @@ export class MainComponent implements OnInit {
 
 	  let postData:any = {
 	    solutionId: this.solutionId,
+			alarmId:null,
 	    "incident": {
 	      "id": this.incidentModel.id || undefined,
 	      "deleteFlag": 0,
@@ -2170,12 +2219,18 @@ export class MainComponent implements OnInit {
 	      postData.incident = Object.assign({}, this.editOrder, postData.incident);
 	    }
 	  }
-	  console.log(postData);
+	  console.log('哈哈哈哈哈哈=====', this.eventData);
 	  // return;
-
-	  this.mainService
-	    .flowPost("incident/task/accept", postData)
-	    .subscribe((result) => {
+		let url = null
+		if(this.eventData){
+			postData.alarmId = this.eventData.data.id
+			url = this.mainService.addAlarmIncident(postData)
+		}else{
+			delete postData.alarmId
+			url = this.mainService
+		  .flowPost("incident/task/accept", postData)
+		}
+		url.subscribe((result) => {
 	      this.msg.remove(this.maskFlag);
 	      this.maskFlag = false;
 
@@ -3036,6 +3091,10 @@ export class MainComponent implements OnInit {
 	  this.deptQtList["endDept"] = [];
 	  this.deptQtList["startStatus"] = 0;
 	  this.deptQtList["endStatus"] = 0;
+		this.eventData = null
+		this.tool.triggerEndEvent({
+			message:'关单',
+		})
 	}
 
 	// 撤回
@@ -3479,6 +3538,10 @@ export class MainComponent implements OnInit {
 	  // }
 		// this.newOrderShow = false;
 		// this.newOrderShowOpen = false;
+		this.eventData = null
+		this.tool.triggerEndEvent({
+			message:'关单',
+		})
 	  this.fixedTab = "";
 	  this.fixedMenuShangla();
 	}
@@ -3909,12 +3972,16 @@ export class MainComponent implements OnInit {
 									break;
 							}
 						});
-						if(this.publicRepair && !this.deptRepair){
+						if(this.eventData){
 							this.incidentModel.repairIncidentType = 'public'
-							this.isRelatedDepartment = false
-						}
-						if(!this.publicRepair && this.deptRepair){
-							this.incidentModel.repairIncidentType = 'dept'
+						}else{
+							if(this.publicRepair && !this.deptRepair){
+								this.incidentModel.repairIncidentType = 'public'
+								this.isRelatedDepartment = false
+							}
+							if(!this.publicRepair && this.deptRepair){
+								this.incidentModel.repairIncidentType = 'dept'
+							}
 						}
 						if(this.hospitalModel==1){
 							if(this.tool.getCurrentHospital().parent){

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

@@ -1,7 +1,7 @@
 <div class="incidentConfig">
   <div class="tagsAndTemplete">
     <div class="tags">
-      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;护士端配置</div>
+      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;配送陪检配置</div>
       <div class="tagList">
         <span *ngFor="let tag of tagList" [ngClass]="{ active: activeTagLink === tag.link }" (click)="clickTag(tag)">{{ tag.title }}</span>
       </div>
@@ -16,6 +16,10 @@
   <ng-container *ngIf="activeTagLink === 'nurseDictionary'">
     <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
+	<!-- 自定义业务 -->
+	<ng-container *ngIf="activeTagLink === 'customBusiness'">
+	  <app-configuration-custom-business [customBusinessList]="customBusinessList"></app-configuration-custom-business>
+	</ng-container>
 </div>
 
 

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

@@ -19,13 +19,19 @@ export class NurseConfigComponent implements OnInit, AfterViewInit {
   // 数据字典
   dictionaryKeyList:any[] = [
     { id: 1, name: '携带设备', key: "goods"},
+		{ id: 2, name: '业务类型', key: "business_type"},
   ]
 
   // 院区配置
   hospitalTabList:any[] = [
     { id: 2, name: '评价', key: "evaluate"}
   ]
-
+	
+	// 自定义业务
+	customBusinessList:any[] = [
+	  { id: 1, name: '一键交接', key: "one_connect"}
+	]
+	
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/nurse-config/nurse-config.module.ts

@@ -6,17 +6,19 @@ import { NurseConfigComponent } from './nurse-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationDistributionHospitalComponent } from 'src/app/components/configurationCenter/configuration-distribution-hospital/configuration-distribution-hospital.component';
 import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
+import { ConfigurationCustomBusinessComponent } from 'src/app/components/configurationCenter/configuration-custom-business/configuration-custom-business.component';
 
 @NgModule({
   declarations: [
     NurseConfigComponent,
     ConfigurationDistributionHospitalComponent,
+		ConfigurationCustomBusinessComponent
   ],
   imports: [
     CommonModule,
     NurseConfigRoutingModule,
     ShareModule,
-    ConfigurationDictionaryModule,
+    ConfigurationDictionaryModule
   ]
 })
 export class NurseConfigModule { }

src/app/views/operation-search/operation-search.component.html

@@ -17,7 +17,7 @@
             nzAllowClear
             nzPlaceHolder="请选择申请科室"
             [(ngModel)]="searchCriteria.department"
-            (nzOnSearch)="changeInp($event, 'search')"
+            (nzOnSearch)="changeDeptInp($event)"
             (nzOpenChange)="changeSearch($event)"
           >
             <ng-container *ngFor="let data of departmentSearch">
@@ -90,6 +90,7 @@
 				</div>
       </div>
       <div nz-col nzXl="6" class="list-template__btns">
+				<button nz-button class="btn default" (click)="addMoadl()" *ngIf="coopBtns.add">新增</button>
 				<button nz-button class="btn default ml8" (click)="getList(1)">
 				  搜索
 				</button>
@@ -110,25 +111,56 @@
         <thead (nzSortChange)="sort($event)">
           <tr class="thead">
             <th>序号</th>
+						<th>安排单号</th>
+						<th>台次台序</th>
             <th>患者信息</th>
-            <th>手术时间</th>
-            <th>申请科室</th>
-            <th>手术室</th>
-            <th>手术名称</th>
+						<th>申请日期|手术时间</th>
+						<th>手术室|申请科室</th>
+						<th>手术名称|手术诊断</th>
+						<th>手术医生</th>
+						<th>洗手|巡回</th>
             <th>状态</th>
             <th>是否首台</th>
+						<th>操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
             <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.patientName }} <span *ngIf="data.patientDTO && data.patientDTO.bedNum">({{data.patientDTO.bedNum}} 床)</span> | {{data.patientDTO ? data.patientDTO.residenceNo : '无'}}</td>
-						<td>{{ data.printDate | date:"yyyy-MM-dd HH:mm:ss"  }}</td>
-            <td>{{ data.areaDeptDTO ? data.areaDeptDTO.dept : '-' }}</td>
-            <td>{{ data.surgeryDeptDTO ? data.surgeryDeptDTO.dept : '-' }}</td>
-            <td>{{ data.surgeryName }}</td>
+            <td>{{ data.applyCode }}</td>
+						<td>{{ data.total }}</td>
+						<td>
+							<div>{{data.patientDTO && data.patientDTO.residenceNo || ''}}</div>
+							<div>
+								{{ data.patientName}}<span *ngIf="data.patientDTO && data.patientDTO.bedNum">({{data.patientDTO.bedNum}})</span>
+							</div>
+						</td>
+						<td>
+							<div>{{ data.applyDate | date:"yyyy-MM-dd HH:mm:ss"  }}</div>
+							<div>{{ data.printDate | date:"yyyy-MM-dd HH:mm:ss"  }}</div>
+						</td>
+						<td>
+							<div>{{ data.surgeryDeptDTO ? data.surgeryDeptDTO.dept : '-'  }}</div>
+							<div>{{ data.areaDeptDTO ? data.areaDeptDTO.dept : '-' }}</div>
+						</td>
+						<td>
+							<div>{{ data.surgeryName || '-'  }}</div>
+							<div>{{ data.diagnose || '-' }}</div>
+						</td>
+            <td>{{ data.doctorName }} 、{{data.assistantDoctorName}}</td>
+            <td>
+							<div>{{ data.nurseName }}</div>
+							<div>{{ data.itinerantNurseName || ''}}</div>
+						</td>
             <td>{{ data.state ? data.state.name : "-" }}</td>
             <td>{{ data.firstOperation==1 ? '是' : '否'}}</td>
+						<td>
+						  <div class="coop">
+						    <span *ngIf="coopBtns.look" (click)="detail($event,data)">查看</span>
+								<span *ngIf="coopBtns.edit" (click)="edit($event,data)">编辑</span>
+								<span *ngIf="coopBtns.log && data.logs" (click)="viewLog($event,data)">查看日志</span>
+							</div>
+						</td>
           </tr>
         </tbody>
       </nz-table>
@@ -145,6 +177,252 @@
     </div>
   </div>
 </div>
+
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":view?"查看":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+				<div class="df"> 
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="patientName">患者</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择患者!">
+					    <nz-input-group>
+								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changePatient($event)" (ngModelChange)="onPatientChange($event)" nzAllowClear nzPlaceHolder="请选择患者" formControlName="patientName">
+									<ng-container *ngFor="let option of patientList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [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-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="7" [nzXs]="24" nzFor="patientPhone">患者电话</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择患者电话!">
+					    <nz-input-group>
+								<input nz-input [disabled]="view" class="formItem" formControlName="patientPhone" placeholder="请输入患者电话" nzSize="default" />
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="patientFamilyPhone">患者家属电话</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择患者家属电话!">
+					    <nz-input-group>
+								<input nz-input [disabled]="view" class="formItem" formControlName="patientFamilyPhone" placeholder="请输入患者家属电话" nzSize="default" />
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+      	<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="applyDate">申请日期</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择申请日期!">
+					    <nz-input-group>
+					      <nz-date-picker
+									[nzDisabled]="view"
+									nzShowTime
+									nzFormat="yyyy-MM-dd HH:mm"
+									nzPlaceHolder="请选择申请日期"
+									formControlName="applyDate"
+									(ngModelChange)="onApplyChange($event)"
+								></nz-date-picker>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="printDate">手术时间</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择手术时间!">
+					    <nz-input-group>
+					      <nz-date-picker
+									[nzDisabled]="view"
+									nzShowTime
+									nzFormat="yyyy-MM-dd HH:mm"
+									nzPlaceHolder="请选择手术时间"
+									formControlName="printDate"
+									(ngModelChange)="onOperationChange($event)"
+								></nz-date-picker>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" nzRequired [nzXs]="24" nzFor="firstOperation">是否首台</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否首台!">
+					    <nz-input-group>
+								<nz-radio-group [nzDisabled]="view" [disabled]="view" formControlName="firstOperation">
+									<label nz-radio nzValue="1">是</label>
+									<label nz-radio nzValue="0">否</label>
+								</nz-radio-group>
+							</nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+				<div class="df">
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="areaDept">申请科室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择申请科室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeDeptInp($event,2)" (nzOpenChange)="changeSearch($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="areaDept">
+									<ng-container *ngFor="let option of departmentSearch">
+										<nz-option *ngIf="!isLoading" [nzLabel]="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-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="surgeryDept">手术室</nz-form-label>
+						<nz-form-control nzErrorTip="请选择手术室!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeOperatingRoomInp($event, 'search')" (nzOpenChange)="changeSearch2($event)" nzAllowClear nzPlaceHolder="请选择手术室" formControlName="surgeryDept">
+									<ng-container *ngFor="let option of operatingRoomDept">
+										<nz-option *ngIf="!isLoading" [nzLabel]="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-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+	<!--      	<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="surgeryName">手术名称</nz-form-label>
+						<nz-form-control nzErrorTip="请选择手术名称!">
+							<nz-input-group>
+								<textarea [disabled]="view" formControlName="surgeryName" nz-input rows="3" placeholder="请输入手术名称"></textarea>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item> -->
+					
+					<nz-form-item>
+						<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="doctorId">主刀医生</nz-form-label>
+						<nz-form-control nzErrorTip="请选择主刀医生!">
+							<nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+									(nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择主刀医生" formControlName="doctorId">
+									<ng-container *ngFor="let option of userList">
+										<nz-option *ngIf="!isLoading" [nzLabel]="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>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+				</div>
+				
+				<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="docAssistantInfos">助理医生</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择助理医生!">
+					    <nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择助理医生" formControlName="docAssistantInfos">
+									<ng-container *ngFor="let option of userList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="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>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="itinerantNurseId">巡回护士</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择巡回护士!">
+					    <nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择巡回护士" formControlName="itinerantNurseId">
+									<ng-container *ngFor="let option of userList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="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>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="nurseId">洗手护士</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择洗手护士!">
+					    <nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择洗手护士" formControlName="nurseId">
+									<ng-container *ngFor="let option of userList">
+									  <nz-option *ngIf="!isLoading" [nzLabel]="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>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+				
+				<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="state">状态</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择状态!">
+					    <nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" 
+								nzShowSearch nzAllowClear nzPlaceHolder="请选择状态" 
+								formControlName="state">
+								  <ng-container *ngFor="let option of types">
+								    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="type">手术类型</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择手术类型!">
+					    <nz-input-group>
+								<nz-select [nzDisabled]="view" class="formItem" [nzDropdownMatchSelectWidth]="false" 
+								nzShowSearch nzAllowClear nzPlaceHolder="请选择手术类型" 
+								formControlName="type">
+								  <ng-container *ngFor="let option of operationType">
+								    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								</nz-select>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal
   *ngIf="promptModalShow"
@@ -154,3 +432,35 @@
   [info]="promptInfo"
 >
 </app-prompt-modal>
+
+	<!-- 日志查看模态框 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="logModal">
+	  <div class="modalBody modalLogBody">
+	    <div class="title">日志查看<i class="icon_transport transport-guanbi" (click)="hideLogModal()"></i>
+	    </div>
+	    <div class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="itemData.logs" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading2">
+	          <thead>
+	            <tr class="thead">
+								<th>动作</th>
+	              <th>操作时间</th>
+	              <th>操作人</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of itemData.logs">
+								<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
+	              <td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
+	              <td>{{ data.username }}</td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+	    </div>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideLogModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>

src/app/views/operation-search/operation-search.component.less

@@ -16,7 +16,7 @@
   z-index: 99;
 
   .modalBody {
-    width: 350px;
+    width: 80%;
     height: 220px;
     background: #fff;
     border-radius: 5px;
@@ -97,7 +97,7 @@
   // 新增
   &.add {
     .modalBody {
-      width: 480px;
+      width: 80%;
       height: auto;
 
       .content {
@@ -106,21 +106,119 @@
         padding: 18px 14px 0 14px;
         max-height: 497px;
         overflow-y: auto;
-
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  // padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				}
+				
         .addForm {
-          .ant-form-item {
-            margin-bottom: 15px;
-
-            .ant-form-item-label {
-              line-height: 14px;
-              text-align: left;
-            }
-
-            .desc {
-              margin-top: 5px;
-            }
-          }
+					.df{
+						display: flex;
+						margin-bottom: 15px;
+						.ant-form-item {
+							width: 30%;
+							margin-right: 3%;
+							.ant-form-item-label{
+								overflow: visible !important;
+							}
+							
+							.ant-select{
+								width: 100% !important;
+							}
+							
+						  .ant-form-item-label {
+						    line-height: 14px;
+						    text-align: left;
+						  }
+						
+						  .desc {
+						    margin-top: 5px;
+						  }
+						}
+					}
 
+					.ant-form-item {
+						.ant-select{
+							width: 100% !important;
+						}
+						
+					  .ant-form-item-label {
+					    line-height: 14px;
+					    text-align: left;
+					  }
+					
+					  .desc {
+					    margin-top: 5px;
+					  }
+					}
+					
           .datesControl {
             margin-top: -16px;
 

src/app/views/operation-search/operation-search.component.ts

@@ -4,13 +4,21 @@ import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { format } from "date-fns";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup, FormControl } from "@angular/forms";
 @Component({
   selector: "app-operation-search",
   templateUrl: "./operation-search.component.html",
   styleUrls: ["./operation-search.component.less"],
 })
 export class OperationSearchComponent implements OnInit {
-  constructor(private mainService: MainService, private tool: ToolService) {}
+  constructor(
+		private mainService: MainService, 
+		private tool: ToolService,
+		public route: ActivatedRoute,
+		private router: Router,
+		private fb: FormBuilder,
+	) {}
 
   currentUserAccount: any = JSON.parse(localStorage.getItem("user")).user.account; //当前登录人账号
   searchCriteria = {
@@ -34,20 +42,386 @@ export class OperationSearchComponent implements OnInit {
     { label: "服务中心收取", value: "0", checked: true },
   ];
   changeInpSubject = new Subject();
-  changeInp2Subject = new Subject();
+  changeInpUserSubject = new Subject();
+	changeDeptInpSubject = new Subject();
 	changeRoomInpSubject = new Subject();
+	changeDoctorSubject = new Subject();
+	validateForm: FormGroup; //新增/编辑表单
+	coopBtns:any;
+	hosId:any;
+	
   ngOnInit() {
+		this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      this.searchDepartment(v[0], v[1]);
+      this.getPatient(v);
     });
-    this.changeInp2Subject.pipe(debounceTime(500)).subscribe((v) => {
-      this.searchUser(v[0], v[1]);
+    this.changeInpUserSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getUserList(v);
     });
+		this.changeDeptInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchDepartment(v);
+		});
 		this.changeRoomInpSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.operatingRoom(v[0], v[1]);
 		});
+		this.getPatient();
+		this.getUserList();
+		this.operatingRoom('', '');
+		this.searchDepartment('');
+		this.searchTypes();
     this.getAllHospital();
   }
+	
+	// 搜索患者
+	changePatient(e){
+		this.isLoading = true;
+		this.changeInpSubject.next(e);
+	}	
+	
+	// 搜索用户
+	changeUser(e){
+		this.isLoading = true;
+		this.changeInpUserSubject.next(e);
+	}	
+	
+	// 获取用户
+	userList:any = [];
+	getUserList(name?){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  user: {
+		    name: name,
+		    hospital: { id: this.hosId || "" },
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "user", data)
+		  .subscribe((data) => {
+		    this.isLoading = false;
+		    this.userList = data.list;
+		  });
+	}
+	
+	// 获取患者
+	patientList:any = [];
+	getPatient(patientName?){
+		let postData = {
+		  idx: 0,
+		  sum: 20,
+		  hosId: this.hosId,
+		  patientName: patientName,
+		};
+		this.mainService.listMsgByMain('listPatient',postData).subscribe((data) => {
+		  this.isLoading = false;
+		  if (data["status"] == 200) {
+				data["list"].forEach(i=>{
+					if(i.bedNum && i.residenceNo){
+						i.patientName = i.patientName + '('+ i.bedNum +')' +'-'+ i.residenceNo
+					}
+					if(i.bedNum && !i.residenceNo){
+						i.patientName = i.patientName + '('+ i.bedNum +')'
+					}
+					if(!i.bedNum && !i.residenceNo){
+						i.patientName = i.patientName 
+					}
+					if(!i.bedNum && i.residenceNo){
+						i.patientName = i.patientName +'-'+ i.residenceNo
+					}
+				})
+		    this.patientList = data["list"];
+		  }
+		});
+	}
+	
+	// 选择患者
+	onPatientChange(e){
+		console.log(2222, e)
+		let item = this.patientList.find(i=>i.id == e)
+		console.log(777,item)
+		if(item){
+			if(item.department){
+				let list = this.departmentSearch.find(i =>i.id == item.department.id)
+				if(list){
+					this.validateForm.controls.areaDept.setValue(item.department.id)
+				}else{
+					this.departmentSearch.push({
+						dept: item.department.dept,
+						id: item.department.id
+					})
+					this.validateForm.controls.areaDept.setValue(item.department.id)
+				}
+			}else{
+				this.validateForm.controls.areaDept.setValue(null)
+			}
+		}
+	}
+	
+	//  选择开始时间
+	applyDate:any;
+	onApplyChange(result: Date): void {
+		this.applyDate = format(result, 'yyyy-MM-dd HH:mm');
+		console.log('Selected Time: ', this.applyDate );
+		this.validateForm.controls.applyDate.setValue(this.applyDate + ':00');
+	}
+	
+	//  选择开始时间
+	printDate:any;
+	onOperationChange(result: Date): void {
+		this.printDate = format(result, 'yyyy-MM-dd HH:mm');
+		console.log('Selected Time: ', this.printDate );
+		this.validateForm.controls.printDate.setValue(this.printDate + ':00');
+	}
+	
+	// 新增弹框
+	add:boolean = true;
+	modal:boolean = false;
+	addMoadl() {
+	  this.add = true;
+		this.view = false;
+		this.modal = true;
+		this.itemData = null;
+		this.getUserList();
+	  this.initForm();
+	}
+	hideModal() {
+	  this.modal = false;
+	  this.initForm();
+	}
+	
+	// 初始化新增form表单
+	initForm() {
+	  this.validateForm = this.fb.group({
+			patientName:[null, [Validators.required]],
+	    patientPhone: [null, []],
+	    patientFamilyPhone: [null, []],
+			applyDate: [null, [Validators.required]],
+	    printDate: [null, [Validators.required]],
+	    firstOperation: ['0', [Validators.required]],
+			areaDept: [null, [Validators.required]],
+			surgeryDept: [null, [Validators.required]],
+			// surgeryName: [null, [Validators.required]],
+			doctorId: [null, []],
+			docAssistantInfos: [null, []],
+			itinerantNurseId: [null, []],
+			nurseId: [null, []],
+			state: [null, [Validators.required]],
+			type: [null, [Validators.required]],
+	  });
+	}
+		
+	// 表单提交
+	submitForm(): void {
+	  var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+	  let data = {
+			surgery:{
+				...this.itemData,
+				patientDTO:{
+					id: this.validateForm.value.patientName
+				},
+				patientPhone: this.validateForm.value.patientPhone || undefined,
+				patientFamilyPhone: this.validateForm.value.patientFamilyPhone || undefined,
+				applyDate: this.validateForm.value.applyDate,
+				printDate: this.validateForm.value.printDate,
+				firstOperation: this.validateForm.value.firstOperation,
+				areaDept: this.validateForm.value.areaDept,
+				surgeryDept: this.validateForm.value.surgeryDept,
+				// surgeryName: this.validateForm.value.surgeryName,
+				doctorId: this.validateForm.value.doctorId,
+				docAssistantInfos: this.validateForm.value.docAssistantInfos ? this.validateForm.value.docAssistantInfos.join(",") : undefined,
+				itinerantNurseId: this.validateForm.value.itinerantNurseId || undefined,
+				nurseId: this.validateForm.value.nurseId || undefined,
+				state:{
+					id:this.validateForm.value.state,
+				},
+				type:{
+					id:this.validateForm.value.type,
+				},
+				id:0,
+			}
+	  };
+	  if (!that.add) {
+	    data.surgery.id = that.coopId;
+	  }else{
+			delete data.surgery.id
+		}
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost(this.add ? "addData":"updData", "surgery", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideModal();
+	      that.initForm();
+	      if (data.status == 200) {
+	        that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+	      } else {
+	        that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 查看
+	view:boolean = false
+	detail(e, data){
+		this.view = true;
+		this.initForm();
+		this.itemData = data;
+		this.coopId = data.id;
+		this.setForm(data)
+	}
+	
+	// 编辑
+	itemData:any;
+	coopId:any;
+	edit(e, data) {
+		this.view = false;
+		this.add = false
+		this.initForm();
+		this.getUserList();
+		this.itemData = data;
+		this.coopId = data.id;
+		this.setForm(data)
+	}
+	
+	// 数据回显
+	setForm(data){
+		if(data.patientDTO){
+			let item = this.patientList.find(i => i.id == data.patientDTO.id)
+			if(item){
+				this.validateForm.controls.patientName.setValue(data.patientDTO.id);
+			}else{
+				let i = data.patientDTO
+				if(i.bedNum && i.residenceNo){
+					i.patientName = i.patientName + '('+ i.bedNum +')' +'-'+ i.residenceNo
+				}
+				if(i.bedNum && !i.residenceNo){
+					i.patientName = i.patientName + '('+ i.bedNum +')'
+				}
+				if(!i.bedNum && !i.residenceNo){
+					i.patientName = i.patientName 
+				}
+				if(!i.bedNum && i.residenceNo){
+					i.patientName = i.patientName +'-'+ i.residenceNo
+				}
+				this.patientList.push({
+					patientName: i.patientName,
+					id: data.patientDTO.id,
+					department: i.department
+				})
+				this.validateForm.controls.patientName.setValue(data.patientDTO.id);
+			}
+		}
+		this.validateForm.controls.patientPhone.setValue(data.patientPhone);
+		this.validateForm.controls.patientFamilyPhone.setValue(data.patientFamilyPhone);
+		this.validateForm.controls.applyDate.setValue(data.applyDate)
+		this.validateForm.controls.printDate.setValue(data.printDate);
+		this.validateForm.controls.firstOperation.setValue(data.firstOperation+"");
+		if(data.areaDeptDTO){
+			let item = this.departmentSearch.find(i => i.id == data.areaDeptDTO.id)
+			if(item){
+				this.validateForm.controls.areaDept.setValue(data.areaDeptDTO.id);
+			}else{
+				this.departmentSearch.push({
+					dept: data.areaDeptDTO.dept,
+					id: data.areaDeptDTO.id
+				})
+				this.validateForm.controls.areaDept.setValue(data.areaDeptDTO.id);
+			}
+		}
+		if(data.surgeryDeptDTO){
+			let item = this.operatingRoomDept.find(i => i.id == data.surgeryDeptDTO.id)
+			if(item){
+				this.validateForm.controls.surgeryDept.setValue(data.surgeryDeptDTO.id);
+			}else{
+				this.operatingRoomDept.push({
+					dept: data.surgeryDeptDTO.dept,
+					id: data.surgeryDeptDTO.id
+				})
+				this.validateForm.controls.surgeryDept.setValue(data.surgeryDeptDTO.id);
+			}
+		}
+		if(data.doctorId){
+			let item = this.userList.find(i => i.id == data.doctorId)
+			if(item){
+				this.validateForm.controls.doctorId.setValue(data.doctorId);
+			}else{
+				this.userList.push({
+					name: data.doctorName,
+					id: data.doctorId
+				})
+				this.validateForm.controls.doctorId.setValue(data.doctorId);
+			}
+		}
+		if(data.docAssistantInfos){
+			let arr = data.docAssistantInfos.split(";")
+			let arr2 = data.assistantDoctorName.split(";")
+			let docAssistantInfosArr = []
+			for(let i = 0; i<arr.length; i++){
+				arr[i] = Number(arr[i])
+				docAssistantInfosArr.push({
+					name: arr2[i],
+					id: arr[i]
+				})
+			}
+			docAssistantInfosArr.forEach(i=> {
+				let item = this.userList.find(x => x.id == i.id)
+				if(!item){
+					this.userList.push({
+						name: i.name,
+						id: i.id
+					})
+				}
+			})
+			this.validateForm.controls.docAssistantInfos.setValue(arr);
+		}
+		if(data.itinerantNurseId){
+			let item = this.userList.find(i => i.id == data.itinerantNurseId)
+			if(item){
+				this.validateForm.controls.itinerantNurseId.setValue(data.itinerantNurseId);
+			}else{
+				this.userList.push({
+					name: data.itinerantNurseName,
+					id: data.itinerantNurseId
+				})
+				this.validateForm.controls.itinerantNurseId.setValue(data.itinerantNurseId);
+			}
+		}
+		if(data.nurseId){
+			let item = this.userList.find(i => i.id == data.nurseId)
+			if(item){
+				this.validateForm.controls.nurseId.setValue(data.nurseId);
+			}else{
+				this.userList.push({
+					name: data.nurseName,
+					id: data.nurseId
+				})
+				this.validateForm.controls.nurseId.setValue(data.nurseId);
+			}
+		}
+		this.validateForm.controls.state.setValue(data.state && data.state.id || null);
+		this.validateForm.controls.type.setValue(data.type && data.type.id || null);
+		this.modal = true
+	}
+	
+	// 查看日志
+	logModal:boolean = false;
+	viewLog(e, data){
+		this.view = false;
+		this.add = false;
+		this.itemData = data;
+		this.logModal = true;
+	}
+	
+	hideLogModal(){
+		this.logModal = false;
+	}
+	
   // 表格筛选
   log(value: object[]): void {
     console.log(value);
@@ -55,12 +429,17 @@ export class OperationSearchComponent implements OnInit {
   }
   // 搜索类型
   isLoading1 = false;
+	operationType:any = [];
   searchTypes() {
     this.isLoading1 = true;
     this.mainService.getDictionary("list", "surgery_trans_state").subscribe((res) => {
       this.isLoading1 = false;
       this.types = res;
     });
+		this.mainService.getDictionary("list", "surgery_trans_type").subscribe((res) => {
+		  this.isLoading1 = false;
+		  this.operationType = res;
+		});
   }
   // 清空标本
   delModal: boolean = false; //删除模态框
@@ -156,7 +535,7 @@ export class OperationSearchComponent implements OnInit {
   // 打开搜索框
   changeSearch(flag) {
     if (flag) {
-      this.changeInp("no", "search");
+      this.changeDeptInp("no", "search");
     }
   }
   // 打开搜索框
@@ -165,10 +544,16 @@ export class OperationSearchComponent implements OnInit {
       this.changeOperatingRoomInp("no", "search");
     }
   }
+	
+	changeDoctor(name){
+		this.isLoading = true;
+		this.changeDoctorSubject.next(name);
+	}
+	
   // 边输边搜节流阀
   isLoading = false;
   deptKey = "";
-  changeInp(dept, type) {
+  changeDeptInp(dept, type?) {
     if (!dept) {
       return;
     }
@@ -177,7 +562,7 @@ export class OperationSearchComponent implements OnInit {
     }
     this.deptKey = dept;
     this.isLoading = true;
-    this.changeInpSubject.next([dept, type]);
+    this.changeDeptInpSubject.next(dept);
   }
 	
 	changeOperatingRoomInp(dept, type) {
@@ -193,7 +578,7 @@ export class OperationSearchComponent implements OnInit {
   }
 	
   // 搜索科室
-  searchDepartment(dept, type) {
+  searchDepartment(dept) {
     let data = {
       department: {
         dept,
@@ -208,12 +593,8 @@ export class OperationSearchComponent implements OnInit {
       .getFetchDataList("data", "department", data)
       .subscribe((data) => {
         if (data.status == 200) {
-          if (type === "search") {
-            if (this.deptKey === dept) {
-              this.isLoading = false;
-              this.departmentSearch = data.list;
-            }
-          }
+					this.isLoading = false;
+					this.departmentSearch = data.list;
         }
       });
   }
@@ -237,12 +618,8 @@ export class OperationSearchComponent implements OnInit {
 			that.mainService
 			  .getFetchDataList("data", "department", data1)
 			  .subscribe((res) => {
-					if (type === "search") {
-					  if (this.deptKey === dept) {
-					    this.isLoading = false;
-					    that.operatingRoomDept = res.list;
-					  }
-					}
+					this.isLoading = false;
+					that.operatingRoomDept = res.list;
 			  });
 		});
 	}
@@ -250,15 +627,15 @@ export class OperationSearchComponent implements OnInit {
   // 边输边搜节流阀
   userKey = "";
   changeInp2(keyword, type) {
-    if (!keyword) {
-      return;
-    }
-    if (keyword === "no") {
-      keyword = "";
-    }
-    this.userKey = keyword;
-    this.isLoading = true;
-    this.changeInp2Subject.next([keyword, type]);
+    // if (!keyword) {
+    //   return;
+    // }
+    // if (keyword === "no") {
+    //   keyword = "";
+    // }
+    // this.userKey = keyword;
+    // this.isLoading = true;
+    // this.changeInp2Subject.next([keyword, type]);
   }
   // 搜索科室
   searchUser(keyword, type) {
@@ -312,6 +689,7 @@ export class OperationSearchComponent implements OnInit {
       surgery: {
 				applyDateStart: this.startDate,
 				applyDateEnd: this.endDate,
+				platform: 'list',
         firstOperation: this.searchCriteria.firstOperation ? 1 : undefined,
         hosId: this.searchCriteria.hospital,
         areaDept: this.searchCriteria.department ? this.searchCriteria.department :undefined,

src/app/views/questionnaire-answer/questionnaire-answer.component.html

@@ -38,6 +38,7 @@
 						<td *ngIf="data.data">{{ data.data.patientName }}</td>
 						<td *ngIf="data.data">{{ data.data.residenceNo }}</td>
 						<td *ngIf="data.data">{{data.data.gdCode}}/{{data.data.taskTypeName}}</td>
+						<td *ngIf="data.data">{{data.data.userName}}</td>
 						<td *ngFor="let item of data">
 							{{ item.answer }}
 						</td>

src/app/views/questionnaire-answer/questionnaire-answer.component.ts

@@ -156,6 +156,7 @@ export class QuestionnaireAnswerComponent implements OnInit {
 							{describe:'患者姓名'},
 							{describe:'住院号'},
 							{describe:'工单编号/任务类型'},
+							{describe:'执行人员'},
 						]
 						for(let i in this.listBaseInfos){
 							this.listOfData[i].data = this.listBaseInfos[i]

src/app/views/shortcut-build-orders/shortcut-build-orders.component.html

@@ -91,9 +91,9 @@
           <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="roundRobinType">快捷建单类型</nz-form-label>
             <nz-form-control nzErrorTip="请选择快捷建单类型!">
-              <nz-select [nzDropdownMatchSelectWidth]="false" [nzDisabled]="true" formControlName="roundRobinType"
-                nzShowSearch nzAllowClear nzPlaceHolder="请选择快捷建单类型">
-                <nz-option nzLabel="{{data.hosName}}" nzValue="{{data.id}}" *ngFor="let data of roundRobinTypes">
+              <nz-select [nzDropdownMatchSelectWidth]="false" [nzDisabled]="false" formControlName="roundRobinType"
+                (ngModelChange)="changeType($event)" nzShowSearch nzAllowClear nzPlaceHolder="请选择快捷建单类型">
+                <nz-option nzLabel="{{data.taskName}}" nzValue="{{data.id}}" *ngFor="let data of roundRobinTypes">
                 </nz-option>
               </nz-select>
             </nz-form-control>
@@ -144,7 +144,7 @@
           <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="endDepartment">终点科室</nz-form-label>
             <nz-form-control nzErrorTip="请选择终点科室!">
-              <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
+              <nz-select [(nzMode)]="isOrther" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
                 nzShowSearch nzAllowClear nzPlaceHolder="请选择终点科室" nzServerSearch
                 (nzOnSearch)="changeInp($event,'formEnd')" (nzOpenChange)="changeFormEnd($event)">
                 <ng-container *ngFor="let data of department1">

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

@@ -83,18 +83,16 @@ export class ShortcutBuildOrdersComponent implements OnInit {
   getRoundRobinTypes(id) {
     this.mainService
       .getFetchDataList("configuration", "taskType", {
-        taskType: { hosId: { id }, associationType: { id: 380 } },
+        taskType: { hosId: { id }, associationTypeIds: '380,259' },
         idx: 0,
         sum: 100,
       })
       .subscribe((data) => {
         if (data.status == 200) {
-          this.roundRobinTypes = data.list.map((item) => {
-            return { id: item.id + "", hosName: item.taskName };
-          });
-          this.validateForm.controls.roundRobinType.setValue(
-            this.roundRobinTypes[0] && this.roundRobinTypes[0].id
-          );
+          this.roundRobinTypes = data.list
+          // this.validateForm.controls.roundRobinType.setValue(
+          //   this.roundRobinTypes[0] && this.roundRobinTypes[0].id
+          // );
         }
       });
   }
@@ -196,6 +194,11 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       idx: 0,
       sum: 20,
     };
+		if(this.deptDicId){
+			delete data2.department.type
+		}else{
+			data2.department.type.id = 282
+		}
     this.mainService
       .getFetchDataList("data", "department", data2)
       .subscribe((data) => {
@@ -251,6 +254,9 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     let data = {
       department: {
         dept,
+				deptHandoverType:{
+					id: null
+				},
         type: { id: 383 },
         hospital: {
           id: this.hosId,
@@ -260,8 +266,15 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       sum: 20,
     };
     if (type === "form") {
+			if(this.deptDicId){
+				data.department.deptHandoverType.id = this.deptDicId;
+				delete data.department.type
+			}else{
+				data.department.type.id = 383
+				delete data.department.deptHandoverType
+			}
       if(this.validateForm.value.startDepartmentHospital){
-        data.department.hospital.id = this.validateForm.value.startDepartmentHospital;
+				data.department.hospital.id = this.validateForm.value.startDepartmentHospital;
       }else{
         this.department = [];
         this.isLoading = false;
@@ -270,7 +283,13 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     }
     // 终点科室的科室类型为检验科
     if (type === "formEnd") {
-      data.department.type.id = 282;
+			if(this.deptDicId){
+				delete data.department.deptHandoverType
+				delete data.department.type
+			}else{
+				data.department.type.id = 282
+				delete data.department.deptHandoverType
+			}
       if(this.validateForm.value.endDepartmentHospital){
         data.department.hospital.id = this.validateForm.value.endDepartmentHospital;
       }else{
@@ -356,7 +375,47 @@ export class ShortcutBuildOrdersComponent implements OnInit {
         }
       });
   }
-
+	
+	// 选择任务类型
+	isOrther:any = 'multiple';
+	changeType(e){
+		this.validateForm.controls.startDepartmentHospital.setValue(null);
+		this.validateForm.controls.startDepartment.setValue(null);
+		this.validateForm.controls.endDepartmentHospital.setValue(null);
+		this.department1 = [];
+		this.validateForm.controls.endDepartment.setValue(null);
+		let item = this.roundRobinTypes.find(i=>i.id == e)
+		if(item){
+			if(item.associationType.value == 'other'){
+				this.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
+				  let item = data.find(i=>i.value == 'comprehensive')
+					if(item){
+						this.isOrther = 'default'
+						this.deptDicId = item.id
+					}else{
+						this.isOrther = 'multiple'
+						this.deptDicId = null
+					}
+				});
+			}else{
+				this.isOrther = 'multiple'
+				this.deptDicId = null
+			}
+		}else{
+			this.isOrther = 'multiple'
+			this.deptDicId = null
+		}
+		
+		setTimeout(_=>{
+			this.validateForm.controls.startDepartmentHospital.setValue(null);
+			this.validateForm.controls.startDepartment.setValue(null);
+			this.validateForm.controls.endDepartmentHospital.setValue(null);
+			this.department1 = [];
+			this.validateForm.controls.endDepartment.setValue(null);
+		},100)
+	}
+	
+	deptDicId:any;
   // 新增/编辑弹框
   addModal() {
     this.add = true; //新增
@@ -379,9 +438,9 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       endDepartmentHospital: [null, [Validators.required]],
       endDepartment: [null, [Validators.required]],
     });
-    this.validateForm.controls.roundRobinType.setValue(
-      this.roundRobinTypes[0] && this.roundRobinTypes[0].id
-    );
+    // this.validateForm.controls.roundRobinType.setValue(
+    //   this.roundRobinTypes[0] && this.roundRobinTypes[0].id
+    // );
     this.timeSelectedValue = [];
   }
 
@@ -405,8 +464,8 @@ export class ShortcutBuildOrdersComponent implements OnInit {
           title: this.validateForm.value.roundRobinName,
           hospital: this.hosId,
           startDept: this.validateForm.value.startDepartment,
-          taskType: this.roundRobinTypes[0].id,
-          targetDept: this.validateForm.value.endDepartment.join(),
+          taskType: this.validateForm.value.roundRobinType,
+          targetDept: this.deptDicId ? this.validateForm.value.endDepartment : this.validateForm.value.endDepartment.join(),
         },
       };
     } else {
@@ -417,8 +476,8 @@ export class ShortcutBuildOrdersComponent implements OnInit {
           title: this.validateForm.value.roundRobinName,
           hospital: this.hosId,
           startDept: this.validateForm.value.startDepartment,
-          taskType: this.roundRobinTypes[0].id,
-          targetDept: this.validateForm.value.endDepartment.join(),
+          taskType: this.validateForm.value.roundRobinType,
+          targetDept: this.deptDicId ? this.validateForm.value.endDepartment : this.validateForm.value.endDepartment.join(),
         },
       };
     }
@@ -453,7 +512,7 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       {
         taskType: {
           hosId: { id: data.hospital },
-          associationType: { id: 380 },
+          associationTypeIds: '380,259',
         },
         idx: 0,
         sum: 100,
@@ -476,11 +535,41 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     // --------/起点科室---
     // --------终点科室---
     let targetDeptArr = []; //临时终点科室数组
-    let targetDept = data.targetDept.split(","); //科室id
-    let targetDeptShow = data.targetDeptShow.split(","); //科室名称
-    targetDept.forEach((item, index) => {
-      targetDeptArr.push({ id: item, dept: targetDeptShow[index] });
-    });
+		let item = this.roundRobinTypes.find(i=>i.id == data.taskType)
+		if(item){
+			if(item.associationType.value == 'other'){
+				this.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
+				  let item = data.find(i=>i.value == 'comprehensive')
+					if(item){
+						this.isOrther = 'default'
+						this.deptDicId = item.id
+					}else{
+						this.isOrther = 'multiple'
+						this.deptDicId = null
+					}
+				});
+			}else{
+				this.isOrther = 'multiple'
+				this.deptDicId = null
+			}
+		}else{
+			this.isOrther = 'multiple'
+			this.deptDicId = null
+		}
+		let targetDept = null;
+		let targetDeptShow = null;
+		if(!this.deptDicId){
+			targetDept = data.targetDept.split(","); //科室id
+			targetDeptShow = data.targetDeptShow.split(","); //科室名称
+			targetDept.forEach((item, index) => {
+			  targetDeptArr.push({ id: item, dept: targetDeptShow[index] });
+			});
+		}else{
+			targetDept = data.targetDept;
+			targetDeptShow = data.targetDeptShow; //科室名称
+			targetDeptArr.push({ id: targetDept, dept: targetDeptShow });
+		}
+
     let targetDept$ = this.mainService.getFetchDataList("data", "department", {
       department: {
         hospital: { id: data.targetDeptHosId },
@@ -499,11 +588,9 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       this.modal = true;
       // 任务类型
       if (res[0]["status"] == 200) {
-        this.roundRobinTypes = res[0]["list"].map((item) => {
-          return { id: item.id + "", hosName: item.taskName };
-        });
+        this.roundRobinTypes = res[0]["list"]
         this.validateForm.controls.roundRobinType.setValue(
-          this.roundRobinTypes[0].id
+          data.taskType + ""
         ); //快捷建单类型
       }
       //起点科室
@@ -518,11 +605,19 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       }
       //终点科室
       if (res[2]["status"] == 200) {
-        let add = targetDeptArr.filter(
-          (item) => !res[2]["list"].some((ele) => ele.id == item.id)
-        ); //过滤掉已有的选项
-        this.department1 = add.concat(res[2]["list"]); //拼接数组
-        this.validateForm.controls.endDepartment.setValue(targetDept); //终点科室
+				if(!this.deptDicId){
+					let add = targetDeptArr.filter(
+					  (item) => !res[2]["list"].some((ele) => ele.id == item.id)
+					); //过滤掉已有的选项
+					this.department1 = add.concat(res[2]["list"]); //拼接数组
+					this.validateForm.controls.endDepartment.setValue(targetDept); //终点科室
+				}else{
+					let add = targetDeptArr.filter(
+					  (item) => !res[2]["list"].some((ele) => ele.id == item.id)
+					); //过滤掉已有的选项
+					this.department1 = add.concat(res[2]["list"]); //拼接数组
+					this.validateForm.controls.endDepartment.setValue(targetDept.toString());
+				}
       }
     });
   }

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

@@ -101,6 +101,13 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
+				<div class="mb8 w100" *ngIf="association.value == 'other'">
+				  <nz-form-label class="label" nzRequired>是否配送人员可以新建工单</nz-form-label>
+				  <nz-radio-group class="handlerType" [(ngModel)]="deliveryUserCreate">
+				    <label nz-radio nzValue='1'>是</label>
+				    <label nz-radio nzValue='0'>否</label>
+				  </nz-radio-group>
+				</div>
         <!-- 患者其他服务 -->
         <div class="mb8 w100" *ngIf="association.value == 'patientTransport'">
           <nz-form-label class="label" nzRequired>护士端是否允许预约建单</nz-form-label>
@@ -778,9 +785,9 @@
             <label nz-checkbox [(ngModel)]="carryingCourses[indexs].handoverSwitch">是否必填交接人信息</label>
           </div>
 					<!-- 是否支持多院区 -->
-					<!-- <div class="turnoff" *ngIf="departmentStrategy.idv=='20047__3' || departmentStrategy.idv=='20048__4'">
+					<div class="turnoff" *ngIf="multipleShow">
 					  <label nz-checkbox [(ngModel)]="carryingCourses[indexs].multipleHospital">是否支持多院区</label>
-					</div> -->
+					</div>
           <!-- 是否支持拍照签到 -->
           <div class="turnoff" *ngIf="currentChoice.associationType.value == 'other'&&indexs==0">
             <label nz-checkbox [nzDisabled]="carryingCourses[indexs].actionsSwitch == 1" [(ngModel)]="carryingCourses[indexs].photoSwitch">是否支持拍照签到</label>
@@ -817,6 +824,10 @@
           <div class="turnoff" *ngIf="carryingCourses[indexs].actionsSwitch">
             <label nz-checkbox [(ngModel)]="carryingCourses[indexs].actionPhotoSwitch">拍照动作</label>
           </div>
+					<!-- 数字交接 -->
+					<div class="turnoff" *ngIf="carryingCourses[indexs].actionsSwitch && association.value == 'other' && indexs == 0">
+					  <label nz-checkbox [(ngModel)]="carryingCourses[indexs].digitalHandover">数字交接</label>
+					</div>
           <!-- 运送过程备注 -->
           <div class="mb8 w100" *ngIf="currentChoice.associationType.value == 'other' && indexs==1">
             <label nz-checkbox [(ngModel)]="carryingCourses[indexs].logSwitch" (ngModelChange)="changeLogSwitch($event)">是否开通备注填写</label>

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

@@ -105,6 +105,7 @@ export class TaskTypeManagementComponent implements OnInit {
   allowUrgent = "1"; //是否加急
   urgentAudit = "0"; //加急是否审核
   autoFlag = "0"; //调度台是否可以新建工单
+	deliveryUserCreate = "0"; //是否配送人员可以新建工单
   isRemand = "0"; //是否开通自动送回
   remandTypeId = null; //开通自动送回,选择的任务类型
   defaultNullDeptId = null; //空单默认科室-标本配送
@@ -848,7 +849,7 @@ export class TaskTypeManagementComponent implements OnInit {
   //选择类型
   currentChoice;
   itemChoice(data, index) {
-    console.log(data);
+    console.log('点击了任务类型', data);
     if (data === undefined) {
       return;
     }
@@ -961,6 +962,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.allowUrgent = data.allowUrgent + "";
     this.urgentAudit = data.urgentAudit + "";
     this.autoFlag = data.autoFlag + "";
+		this.deliveryUserCreate = data.deliveryUserCreate ? data.deliveryUserCreate + "" : "0";
     this.isRemand = data.isRemand ? data.isRemand + "" : "0";
     if (data.remandTypeId) {
       this.remandTypeId = `${data.remandTypeId.id}__${data.remandTypeId.taskName}`;
@@ -1072,6 +1074,21 @@ export class TaskTypeManagementComponent implements OnInit {
       if (this.indexs == 2 && this.association.value != "inspect") {
         this.indexs = 1;
       }
+			if(data.carryingCourses[0].multipleHospital==1){
+				data.carryingCourses[0].multipleHospital = true
+			}else{
+				data.carryingCourses[0].multipleHospital = false
+			}
+			if(data.carryingCourses[1].multipleHospital==1){
+				data.carryingCourses[1].multipleHospital = true
+			}else{
+				data.carryingCourses[1].multipleHospital = false
+			}
+			if(data.carryingCourses[0].digitalHandover==1){
+				data.carryingCourses[0].digitalHandover = true
+			}else{
+				data.carryingCourses[0].digitalHandover = false
+			}
       this.carryingCourses = data.carryingCourses;
       this.ysgcData(this.carryingCourses[this.indexs]);
       this.depa(
@@ -1260,6 +1277,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.taskData.taskType["allowUrgent"] = parseInt(this.allowUrgent);
     this.taskData.taskType["urgentAudit"] = parseInt(this.urgentAudit);
     this.taskData.taskType["autoFlag"] = parseInt(this.autoFlag);
+		this.taskData.taskType["deliveryUserCreate"] = parseInt(this.deliveryUserCreate);
     this.taskData.taskType["isRemand"] = parseInt(this.isRemand);
     if (this.isRemand == "1") {
       let arr = this.remandTypeId.split("__");
@@ -1414,10 +1432,16 @@ export class TaskTypeManagementComponent implements OnInit {
     }
     for(let i = 0; i < this.taskData.taskType.carryingCourses.length; i++){
       // 其他临床服务，是否支持多动作签到开启后，必须配置至少确认动作，拍照动作
-      if(this.taskData.taskType.associationType.value === 'other' && this.taskData.taskType.carryingCourses[i].actionsSwitch && !this.taskData.taskType.carryingCourses[i].actionConfirmSwitch && !this.taskData.taskType.carryingCourses[i].actionPhotoSwitch){
-        this.showPromptModal("提示", false, `【${i == 0 ? '起点科室' : '终点科室'}】是否支持多动作签到开启后，请配置确认动作或拍照动作！`);
-        return;
-      }
+      if(this.taskData.taskType.associationType.value === 'other'){
+				if(i==0 && this.taskData.taskType.carryingCourses[i].actionsSwitch && !this.taskData.taskType.carryingCourses[i].actionConfirmSwitch && !this.taskData.taskType.carryingCourses[i].actionPhotoSwitch && !this.taskData.taskType.carryingCourses[i].digitalHandover){
+					this.showPromptModal("提示", false, `【起点科室】是否支持多动作签到开启后，请配置确认动作或拍照动作或数字交接！`);
+					return;
+				}else if(i==1 && this.taskData.taskType.carryingCourses[i].actionsSwitch && !this.taskData.taskType.carryingCourses[i].actionConfirmSwitch && !this.taskData.taskType.carryingCourses[i].actionPhotoSwitch){
+					this.showPromptModal("提示", false, `【终点科室】是否支持多动作签到开启后，请配置确认动作或拍照动作！`);
+					return;
+				}
+			}
+
       // 其他临床服务，多动作开启后，必须配置至少一个动作
       if(this.taskData.taskType.associationType.value === 'other' && this.taskData.taskType.carryingCourses[i].actionConfirmSwitch && !this.taskData.taskType.carryingCourses[i].actionRemarks){
         this.showPromptModal("提示", false, `【${i == 0 ? '起点科室' : '终点科室'}】确认动作开启后，至少配置一个动作！`);
@@ -1429,11 +1453,28 @@ export class TaskTypeManagementComponent implements OnInit {
         return;
       }
     }
-    console.log(this.taskData);
-    // return;
+		let newData = JSON.parse(JSON.stringify(this.taskData))
+		if(newData.taskType.carryingCourses[0].multipleHospital){
+			newData.taskType.carryingCourses[0].multipleHospital = 1
+		}else{
+			newData.taskType.carryingCourses[0].multipleHospital = 0
+		}
+		if(newData.taskType.carryingCourses[1].multipleHospital){
+			newData.taskType.carryingCourses[1].multipleHospital = 1
+		}else{
+			newData.taskType.carryingCourses[1].multipleHospital = 0
+		}
+		
+		if(newData.taskType.carryingCourses[0].digitalHandover){
+			newData.taskType.carryingCourses[0].digitalHandover = 1
+		}else{
+			newData.taskType.carryingCourses[0].digitalHandover = 0
+		}
+		
+    console.log(newData.taskType.carryingCourses[this.indexs]);
     this.loading5 = true;
     that.mainService
-      .coopTypeConfig("addData", "taskType", this.taskData)
+      .coopTypeConfig("addData", "taskType", newData)
       .subscribe((data) => {
         this.loading5 = false;
         if (data.status == 200) {
@@ -1511,6 +1552,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.allowUrgent = "1"; //是否加急
     this.urgentAudit = "0"; //加急是否审核
     this.autoFlag = "0"; //调度台是否可以新建工单
+		this.deliveryUserCreate = "0"; //是否配送人员可以新建工单
     this.isRemand = "0"; //是否开通自动送回
     this.remandTypeId = null; //自动送回，选择任务类型
     this.defaultNullDeptId = null; //标本配送空单默认值
@@ -2315,6 +2357,7 @@ export class TaskTypeManagementComponent implements OnInit {
   }
   //默认科室选择
 	selectValue:boolean = false;
+	multipleShow:boolean = false;
   depa(data, e, doing?): void {
     let arr = e.split("__");
     if (doing === "clear") {
@@ -2327,8 +2370,9 @@ export class TaskTypeManagementComponent implements OnInit {
         data.id = null;
         data.value = null;
       }
+			// this.carryingCourses[this.indexs].multipleHospital = false
     }
-		console.log(999999, data.idv);
+		console.log(999999, data);
     let value = arr[1];
     if (value) {
       if (value == "2") {
@@ -2376,10 +2420,16 @@ export class TaskTypeManagementComponent implements OnInit {
         this.depaShow = false;
         this.depaShow4 = false;
       }
+			if(value == 4 || value == 5){
+				this.multipleShow = true
+			}else{
+				this.multipleShow = false;
+			}
     } else {
       this.depaShow = false;
       this.depaShow1 = false;
       this.depaShow4 = false;
+			this.multipleShow = false;
     }
   }
   //删除标本类型