一键建单科室类型优化

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

@@ -37,7 +37,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
-                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
+                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
                             <ng-container *ngFor="let option of buildMsg.start.start.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>
@@ -71,7 +71,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
-                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzAllowClear nzPlaceHolder="请选择目标科室">
+                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
                             <ng-container *ngFor="let option of buildMsg.end.end.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>
@@ -93,7 +93,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
-                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
+                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
                             <ng-container *ngFor="let option of buildMsg.start.start.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>
@@ -108,7 +108,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
-                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzPlaceHolder="请选择目标科室">
+                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
                             <ng-container *ngFor="let option of buildMsg.end.end.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>

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

@@ -58,6 +58,7 @@ export class BuildQuickConfirmComponent implements OnInit {
   nLoading = false;
 	isEndFixedType: boolean = false;
 	isStartFixedType: boolean = false;
+	msgId:any;
   newShortcutOrder(data, type) {
     this.workOrderRemark = "";
     this.customRemarks = [];
@@ -67,6 +68,7 @@ export class BuildQuickConfirmComponent implements OnInit {
     this.shortcutMsg = data;
     this.initForm();
     this.buildMsg = {};
+		this.msgId = data.id;
     let postData:any = {
       taskTypeId: data.id,
     };
@@ -79,14 +81,18 @@ export class BuildQuickConfirmComponent implements OnInit {
       .subscribe((result) => {
         this.buildMsg = result;
 				if(result.end){
-					if(result.end.end.departmentStrategy==202){
+					if(result.end.end.departmentStrategy==202 ||
+					result.end.end.departmentStrategy==204 ||
+					result.end.end.departmentStrategy==205){
 						this.isEndFixedType = true
 					}else{
 						this.isEndFixedType = false
 					}
 				}
 				if(result.start){
-					if(result.start.start.departmentStrategy==202){
+					if(result.start.start.departmentStrategy==202 ||
+					result.start.start.departmentStrategy==204 ||
+					result.start.start.departmentStrategy==205){
 						this.isStartFixedType = true
 					}else{
 						this.isStartFixedType = false
@@ -164,6 +170,35 @@ export class BuildQuickConfirmComponent implements OnInit {
       (type == "start" && msg.start.start.departmentStrategy == 202) ||
       (type == "target" && msg.end.end.departmentStrategy == 202)
     ) {
+			let data = [];
+			let postData = {
+			  taskTypeId: this.msgId
+			};
+			if(type == "start"){
+				this.mainService
+				.postCustom("nurse", "workOrder/buildTrip", postData)
+				.subscribe((result) => {
+					let arr = result.start.start.list;
+					if(key!=''){
+						data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						msg.start.start.list = data
+					}else{
+						msg.start.start.list = arr
+					}
+				});
+			}else{
+				this.mainService
+				.postCustom("nurse", "workOrder/buildTrip", postData)
+				.subscribe((result) => {
+					let arr = result.end.end.list;
+					if(key!=''){
+						data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						msg.end.end.list = data
+					}else{
+						msg.end.end.list = arr
+					}
+				});
+			}
       return; //固定科室范围禁用搜索
     }
     let postData: any = {

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

@@ -1136,7 +1136,7 @@
                           <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" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptZy">
+                              <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">
                                 <ng-container *ngFor="let option of deptZyList.startDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
@@ -1152,7 +1152,7 @@
                           <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" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
+                              <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()">
                                 <ng-container *ngFor="let option of deptZyList.endDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
@@ -1247,7 +1247,7 @@
                           <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" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptQt">
+                              <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">
                                 <ng-container *ngFor="let option of deptQtList.startDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
@@ -1263,7 +1263,7 @@
                           <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"
+                              <nz-select formControlName="endDeptsQt" [nzDisabled]="deptQtList.endStatus == 201 || deptQtList.endStatus == 203" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType" (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'end', $event)"
                                 nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptQt">
                                 <ng-container *ngFor="let option of deptQtList.endDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>

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

@@ -4202,13 +4202,31 @@ export class FuwutaiComponent implements OnInit {
     if (dept) {
       value = dept;
     }
-    if (type === "start" && this.deptZyList["startStatus"] == 202) {
-      //固定科室范围，禁止搜索
-      return;
-    } else if (type === "end" && this.deptZyList["endStatus"] == 202) {
-      //固定科室范围，禁止搜索
-      return;
-    }
+		if (type === "start" && this.deptZyList["startStatus"] == 202) {
+		  //固定科室范围，禁止搜索
+			this.mainService.getdeptList(this.radioValueZy).subscribe((data:any) => {
+				let arr = data;
+				if(value!=''){
+					data = arr.startDept.filter(i=>i.dept.indexOf(value) !=-1)
+					this.deptZyList.startDept = data
+				}else{
+					this.deptZyList.startDept = arr.startDept
+				}
+			})
+		  return;
+		} else if (type === "end" && this.deptZyList["endStatus"] == 202) {
+		  //固定科室范围，禁止搜索
+			this.mainService.getdeptList(this.radioValueZy).subscribe((data:any) => {
+				let arr = data;
+				if(value!=''){
+					data = arr.endDept.filter(i=>i.dept.indexOf(value) !=-1)
+					this.deptZyList.endDept = data
+				}else{
+					this.deptZyList.endDept = arr.endDept
+				}
+			})
+		  return;
+		}
     let postData = {
       idx: 0,
       sum: 10,
@@ -4253,9 +4271,27 @@ export class FuwutaiComponent implements OnInit {
     }
     if (type === "start" && this.deptQtList["startStatus"] == 202) {
       //固定科室范围，禁止搜索
+			this.mainService.getdeptList(this.psValue).subscribe((data:any) => {
+				let arr = data;
+				if(value!=''){
+					data = arr.startDept.filter(i=>i.dept.indexOf(value) !=-1)
+					this.deptQtList.startDept = data
+				}else{
+					this.deptQtList.startDept = arr.startDept
+				}
+			})
       return;
     } else if (type === "end" && this.deptQtList["endStatus"] == 202) {
       //固定科室范围，禁止搜索
+			this.mainService.getdeptList(this.psValue).subscribe((data:any) => {
+				let arr = data;
+				if(value!=''){
+					data = arr.endDept.filter(i=>i.dept.indexOf(value) !=-1)
+					this.deptQtList.endDept = data
+				}else{
+					this.deptQtList.endDept = arr.endDept
+				}
+			})
       return;
     }
     let postData = {
@@ -4572,12 +4608,12 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的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.startStatus==202){
+			if(data.startStatus==202 || data.startStatus==204 || data.startStatus==205){
 				this.isStartFixedType = true
 			}else{
 				this.isStartFixedType = false
 			}
-			if(data.endStatus==202){
+			if(data.endStatus==202 || data.endStatus==204 || data.endStatus==205){
 				this.isEndFixedType = true
 			}else{
 				this.isEndFixedType = false
@@ -4671,11 +4707,13 @@ export class FuwutaiComponent implements OnInit {
       }
     }, 0)
   }
+	psValue:any;
   radioChangeQt(value) {
     //任务类型id
     if (value === "" || value === null) {
       return;
     }
+		this.psValue = value
     this.startDeptQt = null;
     this.endDeptQt = null;
     // 返回值的status是201 则是默认发起科室，把申请科室作为值
@@ -4685,12 +4723,12 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     this.mainService.getdeptList(value).subscribe((data:any) => {
       this.deptQtList = data;
-			if(data.startStatus==202){
+			if(data.startStatus==202 || data.startStatus==204 || data.startStatus==205){
 				this.isStartFixedType = true
 			}else{
 				this.isStartFixedType = false
 			}
-			if(data.endStatus==202){
+			if(data.endStatus==202 || data.endStatus==204 || data.endStatus==205){
 				this.isEndFixedType = true
 			}else{
 				this.isEndFixedType = false

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

@@ -585,7 +585,7 @@
                                             <nz-form-item>
                                               <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
                                               <nz-form-control nzErrorTip="请选择起点科室!">
-                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
+                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
                                                   <ng-container *ngFor="let option of buildMsg.start.start.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -607,7 +607,7 @@
                                             <nz-form-item>
                                               <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
                                               <nz-form-control nzErrorTip="请选择目标科室!">
-                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzAllowClear nzPlaceHolder="请选择目标科室">
+                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
                                                   <ng-container *ngFor="let option of buildMsg.end.end.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -629,7 +629,7 @@
                                             <nz-form-item>
                                               <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
                                               <nz-form-control nzErrorTip="请选择起点科室!">
-                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
+                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
                                                   <ng-container *ngFor="let option of buildMsg.start.start.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -644,7 +644,7 @@
                                             <nz-form-item>
                                               <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
                                               <nz-form-control nzErrorTip="请选择目标科室!">
-                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzPlaceHolder="请选择目标科室">
+                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
                                                   <ng-container *ngFor="let option of buildMsg.end.end.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -1543,7 +1543,7 @@
             <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
-                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
+                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
                   <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
@@ -1571,7 +1571,7 @@
             <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
-                <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType"  nzPlaceHolder="请选择目标科室">
+                <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false"  [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
                   <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
                     <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>

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

@@ -1904,7 +1904,7 @@ export class HushijiandanComponent implements OnInit {
 
   // 目标科室输入搜索
   searchDept(type, msg, e) {
-    this.getDeptList(type, msg, e);
+		this.getDeptList(type, msg, e)
   }
   // 获取科室
   getDeptList(type, msg, key?): void {
@@ -1917,6 +1917,40 @@ export class HushijiandanComponent implements OnInit {
       (type == "start" && msg.start.start.departmentStrategy == 202) ||
       (type == "target" && msg.end.end.departmentStrategy == 202)
     ) {
+			let data = [];
+			let postData = null
+			if(this.patientModal){
+				postData = this.patientQuery
+			}else{
+				postData = {
+				  taskTypeId: this.msgId
+				};
+			}
+			if(type == "start"){
+				this.mainService
+				.postCustom("nurse", "workOrder/buildTrip", postData)
+				.subscribe((result) => {
+					let arr = result.start.start.list;
+					if(key!=''){
+						data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						msg.start.start.list = data
+					}else{
+						msg.start.start.list = arr
+					}
+				});
+			}else{
+				this.mainService
+				.postCustom("nurse", "workOrder/buildTrip", postData)
+				.subscribe((result) => {
+					let arr = result.end.end.list;
+					if(key!=''){
+						data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						msg.end.end.list = data
+					}else{
+						msg.end.end.list = arr
+					}
+				});
+			}
       return; //固定科室范围禁用搜索
     }
     let postData: any = {
@@ -3060,6 +3094,7 @@ export class HushijiandanComponent implements OnInit {
   historyCustomRemarks2 = [];
 	isStartFixedType:boolean = false;
 	isEndFixedType:boolean = false;
+	patientQuery:any={};
   changeCheckedType(isInit = false) {
     isInit && (this.inspectToday = new Date());
     this.customRemarks2 = [];
@@ -3108,7 +3143,7 @@ export class HushijiandanComponent implements OnInit {
     // 判断这个任务类型是否允许加急 end
     let that = this;
     let isInpect = this.checkTypeLis.some((item) => item.id == this.patientForm.controls.checkedType.value && item.associationType.value == "inspect");
-    let postData = {
+    this.patientQuery = {
       taskTypeId: that.patientForm.controls.checkedType.value,
       patientCode: that.patientMsg.patientCode,
       startTime: isInpect ? format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined,
@@ -3116,7 +3151,7 @@ export class HushijiandanComponent implements OnInit {
     };
     this.cLoading = true;
     that.mainService
-      .postCustom("nurse", "workOrder/buildTrip", postData)
+      .postCustom("nurse", "workOrder/buildTrip", this.patientQuery)
       .subscribe((data) => {
         this.cLoading = false;
         this.message.remove(this.maskFlag);
@@ -3124,14 +3159,18 @@ export class HushijiandanComponent implements OnInit {
         this.patientModal = true;
         that.checkedShowMsg = data;
 				if(data.end){
-					if(data.end.end.departmentStrategy==202){
+					if(data.end.end.departmentStrategy==202 || 
+					data.end.end.departmentStrategy==204 ||
+					data.end.end.departmentStrategy==205){
 						this.isEndFixedType = true
 					}else{
 						this.isEndFixedType = false
 					}
 				}
 				if(data.start){
-					if(data.start.start.departmentStrategy==202){
+					if(data.start.start.departmentStrategy==202 ||
+					data.start.start.departmentStrategy==204 ||
+					data.start.start.departmentStrategy==205){
 						this.isStartFixedType = true
 					}else{
 						this.isStartFixedType = false
@@ -3385,6 +3424,7 @@ export class HushijiandanComponent implements OnInit {
   buildMsg: any = {}; //一键发起返回信息
   buildType: string = ""; //快捷建单类型
   historyCustomRemarks = []; //历史快捷输入
+	msgId:any;
   // 打开一键发起建单模态框
   newShortcutOrder(msg, type) {
     this.workOrderRemark = "";
@@ -3395,6 +3435,7 @@ export class HushijiandanComponent implements OnInit {
     this.shortcutMsg = msg;
     this.initForm();
     this.buildMsg = {};
+		this.msgId = msg.id;
     let postData = {
       taskTypeId: msg.id,
     };
@@ -3404,14 +3445,18 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((result) => {
         this.buildMsg = result;
 				if(result.end){
-					if(result.end.end.departmentStrategy==202){
+					if(result.end.end.departmentStrategy==202 ||
+					result.end.end.departmentStrategy==204 ||
+					result.end.end.departmentStrategy==205){
 						this.isEndFixedType = true
 					}else{
 						this.isEndFixedType = false
 					}
 				}
 				if(result.start){
-					if(result.start.start.departmentStrategy==202){
+					if(result.start.start.departmentStrategy==202 ||
+					result.start.start.departmentStrategy==204 ||
+					result.start.start.departmentStrategy==205){
 						this.isStartFixedType = true
 					}else{
 						this.isStartFixedType = false

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

@@ -1244,7 +1244,8 @@
         <div>
           <nz-form-label class="label" nzRequired>固定科室</nz-form-label>
           <nz-select class="mb8 w100" [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" nzShowSearch
-            nzAllowClear nzPlaceHolder="请选择固定科室" nzShowSearch  
+            nzAllowClear nzPlaceHolder="请选择固定科室" nzShowSearch 
+
              [(ngModel)]="departments">
             <ng-container *ngFor="let data of courseListDataAll">
               <nz-option *ngIf="!loading1" [nzLabel]="data.dept" [nzValue]="data"></nz-option>

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

@@ -1131,7 +1131,6 @@ export class TaskTypeManagementComponent implements OnInit {
         this.loading1 = false;
         if (data.status == 200) {
           this.courseListDataAll = data.list;
-					
         }
       });
   }
@@ -2093,8 +2092,10 @@ export class TaskTypeManagementComponent implements OnInit {
       );
     });
   }
+	clysData:any;
   //处理运送过程字段
   ysgcData(data) {
+		this.clysData = data;
     console.log(data, "---运送过程自动建单字段(包含各个班次的信息)-----");
     console.log(this.indexs, "----索引(起点科室，终点科室对应数组的索引)----");
     if (data.departmentStrategy) {
@@ -2126,8 +2127,8 @@ export class TaskTypeManagementComponent implements OnInit {
 					result.push(arr[i]);
 				}
 			}
-			console.log(1234,arr)
-			console.log(89898,result)
+			// console.log(1234,arr)
+			// console.log(89898,result)
 			this.courseListDataAll = result
       this.departmentIds = data.departmentIds;
     } else {