解决冲突

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

@@ -68,7 +68,8 @@ export class ConfigurationVoluntarilyBuildComponent implements OnInit {
 			idx: 0,
 			sum: 99999,
 			group2: {
-				statisticalHosId: this.hosId
+				statisticalHosId: this.hosId,
+				type:'3'
 			}
 		};
 		this.mainService
@@ -184,31 +185,35 @@ export class ConfigurationVoluntarilyBuildComponent implements OnInit {
     if (this.add) {
       //增加
       postData = {
-				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,
+				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 = {
-				...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,
+				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
-      .simplePost(this.add ? "addData": "upData", "alarmConfig", postData)
+      .dataPost(this.add ? "addData": "updData", "alarmConfig", postData)
       .subscribe((result) => {
         this.btnLoading = false;
         this.hidePriorityModal();
@@ -235,7 +240,7 @@ export class ConfigurationVoluntarilyBuildComponent implements OnInit {
       categoryId: [null, [Validators.required]],
 			groupId: [null, [Validators.required]],
 			userId: [null, []],
-			flag: [null, [Validators.required]],
+			flag: [1, [Validators.required]],
     });
     console.log(this.validatePriorityForm.controls)
   }

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

@@ -51,7 +51,7 @@
 				  <span class="label">紧急度：</span>
 				  <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzShowSearch nzAllowClear
 				    nzPlaceHolder="请选择紧急度" [(ngModel)]="alarmUrgency">
-				    <ng-container *ngFor="let data of alarmList">
+				    <ng-container *ngFor="let data of urgencyList">
 				      <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
 				    </ng-container>
 				  </nz-select>
@@ -101,7 +101,7 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.view" (click)="look(data)">查看</span>
-                <span *ngIf="coopBtns.add" (click)="addOrder(data)">建单</span>
+                <span *ngIf="coopBtns.add && !data.incidentSign" (click)="addOrder(data)">建单</span>
               </div>
             </td>
           </tr>
@@ -109,7 +109,7 @@
       </nz-table>
       <div class="list-template__pagination">
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+          (nzPageIndexChange)="getList(false,'page')" (nzPageSizeChange)="getList(false, 'page')">
         </nz-pagination>
       </div>
     </div>
@@ -219,10 +219,7 @@
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
 
-<!-- 二维码打印 -->
-<div id="report" style="display: none">
-  <div *ngFor="let img of codes" style="display: inline-block;">
-    <img style="width: 200px;height:200px;" [src]="img.base64" alt="">
-    <p style="margin: 0;text-align: center; font-size: 20px;width: 200px;">{{img.name}}</p>
-  </div>
-</div>
+<!-- 详情 -->
+<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

@@ -2,6 +2,10 @@
 .width-105{
 	width: 105px !important;
 }
+.text-underline{
+	cursor: pointer;
+	text-decoration: underline;
+}
 .save {
   position: fixed;
   left: 0;
@@ -80,11 +84,6 @@
 		      color: #333;
 		      font-size: 18px;
 		    }
-		
-		    &:nth-child(3) {
-		      font-size: 14px;
-		      color: #666;
-		    }
 		  }
 		}
 		

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

@@ -113,6 +113,7 @@ export class EmergencyInfoComponent implements OnInit {
 	// 获取工单状态
 	gdList:any = [];
 	alarmList:any = [];
+	urgencyList:any = [];
 	getGdList() {
 	  this.isLoading = true;
 	  this.quickOrderAcceptanceService.getDictionary("incident_status").subscribe((res) => {
@@ -123,6 +124,10 @@ export class EmergencyInfoComponent implements OnInit {
 		  this.isLoading = false;
 		  this.alarmList = res || [];
 		});
+		this.quickOrderAcceptanceService.getDictionary("alarm_urgency").subscribe((res) => {
+		  this.isLoading = false;
+		  this.urgencyList = res || [];
+		});
 	}
 	
   // 搜索
@@ -144,7 +149,7 @@ export class EmergencyInfoComponent implements OnInit {
 	
   // 表格数据
   loading1 = false;
-  getList(isResetPageIndex = false) {
+  getList(isResetPageIndex = false, type?) {
     isResetPageIndex && (this.pageIndex = 1);
     let data = {
       pageIndex: this.pageIndex,
@@ -174,8 +179,10 @@ export class EmergencyInfoComponent implements OnInit {
 			delete data.alarm.alarmUrgency
 		}
     this.loading1 = true;
-    this.mapOfCheckedId = {};
-    this.checkedDepIds = [];
+		if(type!='page'){
+			this.mapOfCheckedId = {};
+			this.checkedDepIds = [];
+		}
     this.isAllDisplayDataChecked = false;
     this.quickOrderAcceptanceService
       .query(data)
@@ -348,17 +355,30 @@ export class EmergencyInfoComponent implements OnInit {
 	addOrder(data){
 		this.tool.triggerEvent({
 			message:'建单',
-			data:{id:data.id}
+			data: data
 		})
 	}
 	
 	// 查看工单
+	detailModalShow = false; //弹窗开关
 	detail(e, data) {
-		if(!data.workOrderDTO){
-			return
-		}
 	  e.stopPropagation();
-	  this.router.navigateByUrl("/main/emergencyInfo/orderDetail/" + data.workOrderDTO.id);
+	  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(){
+		
 	}
 	
 	// 查看列表
@@ -404,31 +424,6 @@ export class EmergencyInfoComponent implements OnInit {
     this.refreshStatus();
   }
 
-  // 打印
-  codes = []; //二维码
-  printLoading: boolean = false; //批量打印按钮loading状态
-  print(e, batch, id?) {
-    e.stopPropagation();
-    this.printLoading = true;
-    this.quickOrderAcceptanceService
-      .print({
-        ids: batch ? this.checkedDepIds.toString() : id.toString()
-      })
-      .subscribe((data) => {
-        this.codes = data.data;
-        this.printLoading = false;
-        setTimeout(() => {
-          const printContent = document.getElementById("report");
-          const WindowPrt = window.open("", "", "width=700,height=900");
-          WindowPrt.document.write(printContent.innerHTML);
-          WindowPrt.document.close();
-          WindowPrt.focus();
-          WindowPrt.print();
-          WindowPrt.close();
-        }, 100);
-      });
-  }
-
   // 编辑
   maskFlag: any = false;
   coopData = {};

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

@@ -4,7 +4,7 @@ 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: [
@@ -14,6 +14,7 @@ import { EmergencyInfoComponent } from './emergency-info.component';
     CommonModule,
     EmergencyInfoRoutingModule,
     ShareModule,
+		IncidentDetailModule
   ]
 })
 export class EmergencyInfoModule { }

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

@@ -1011,7 +1011,7 @@
 					</div>
           <div class="newTopItem">
             <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>
@@ -1215,9 +1215,9 @@
                         </div>
                         <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" [ngStyle]="{ display: (deptZyList['startStatus'] != 201 && !isTaskTypeInspect) ? 'block' : 'none'}">
                           <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>
+                            <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>
@@ -1244,9 +1244,9 @@
                         </div>
                         <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24">
                           <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>
+                            <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>
@@ -1352,9 +1352,9 @@
                         </div>
                         <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" [ngStyle]="{ display: deptQtList['startStatus'] != 201 ? 'block' : 'none' }">
 													<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>
+													  <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>
@@ -1381,9 +1381,9 @@
                         </div>
                         <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12">
                           <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>
+														<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>

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

@@ -2835,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();
@@ -2842,7 +2843,6 @@ export class FuwutaiComponent implements OnInit {
         this.resetOrderData2();
       }
 			this.getSysConfig(type);
-      this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
       this.searchApplicationSource();
@@ -2922,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) => {
@@ -3333,6 +3335,14 @@ export class FuwutaiComponent implements OnInit {
 		  .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{
@@ -3344,7 +3354,6 @@ export class FuwutaiComponent implements OnInit {
 	
 	// 物品配送-任务类型-院区切换
 	changeTypeQtHospital(e, type){
-		console.log(111,e)
 		if(type==1){
 			this.validateFormQt.controls.startDeptQt.setValue(null)
 		}else{
@@ -3368,6 +3377,14 @@ export class FuwutaiComponent implements OnInit {
 		  .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{
@@ -4878,11 +4895,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)
@@ -4895,6 +4920,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)
@@ -4905,12 +4938,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) {
@@ -4924,6 +4964,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") {
@@ -4945,11 +4993,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)
@@ -4962,6 +5018,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)
@@ -4972,12 +5036,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) {
@@ -4991,6 +5062,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") {
@@ -5284,7 +5363,29 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的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{
@@ -5296,19 +5397,31 @@ export class FuwutaiComponent implements OnInit {
 				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
@@ -5340,7 +5453,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
@@ -5349,12 +5462,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
@@ -5363,7 +5476,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 == "患者转运") {
@@ -5441,7 +5554,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{
@@ -5453,19 +5589,31 @@ export class FuwutaiComponent implements OnInit {
 				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
@@ -5487,7 +5635,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", "");
       }
       // 终点科室
@@ -5501,7 +5649,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", "");
       }
     });
@@ -5541,6 +5689,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();

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

@@ -100,8 +100,8 @@ export class MainComponent implements OnInit, OnDestroy {
 		// 全局监听
 		let that = this;
 		that.tool.getEventObservable().subscribe(res => {
-			console.log('全局的监听触发111111', res);
 			that.eventData = res;
+			console.log('全局的监听触发111111', that.eventData);
 			if(that.eventData.message == '建单'){
 				that.speedinessAdd()
 			}
@@ -774,7 +774,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      this.applyDept = null;
 	      this.countRemarkIndex = -1;
 	      this.incidentModel.department = isInit ? this.incidentModel.department : null;
-
+				
 	      //正常初始化
 	      this.getAutoWorkTypes(false, isInit);
 				this.newOrderShowOpen = true
@@ -1815,6 +1815,27 @@ export class MainComponent implements OnInit, OnDestroy {
 	            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}))
@@ -3950,12 +3971,16 @@ export class MainComponent implements OnInit, OnDestroy {
 									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>

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

@@ -130,9 +130,9 @@
             <td>{{ data.applyCode }}</td>
 						<td>{{ data.total }}</td>
 						<td>
-							<div>{{data.residenceNo}}</div>
+							<div>{{data.patientDTO && data.patientDTO.residenceNo || ''}}</div>
 							<div>
-								{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span>
+								{{ data.patientName}}<span *ngIf="data.patientDTO && data.patientDTO.bedNum">({{data.patientDTO.bedNum}})</span>
 							</div>
 						</td>
 						<td>
@@ -191,7 +191,7 @@
 					  <nz-form-control nzErrorTip="请选择患者!">
 					    <nz-input-group>
 								<nz-select class="formItem" [nzDisabled]="view" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-								  (nzOnSearch)="changePatient($event)" nzAllowClear nzPlaceHolder="请选择患者" formControlName="patientName">
+								  (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>

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

@@ -116,11 +116,47 @@ export class OperationSearchComponent implements OnInit {
 		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){
+		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 {
@@ -502,7 +538,7 @@ export class OperationSearchComponent implements OnInit {
   // 边输边搜节流阀
   isLoading = false;
   deptKey = "";
-  changeDeptInp(dept, type) {
+  changeDeptInp(dept, type?) {
     if (!dept) {
       return;
     }

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

@@ -91,7 +91,7 @@
           <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"
+              <nz-select [nzDropdownMatchSelectWidth]="false" [nzDisabled]="false" formControlName="roundRobinType"
                 nzShowSearch nzAllowClear nzPlaceHolder="请选择快捷建单类型">
                 <nz-option nzLabel="{{data.hosName}}" nzValue="{{data.id}}" *ngFor="let data of roundRobinTypes">
                 </nz-option>

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

@@ -92,9 +92,9 @@ export class ShortcutBuildOrdersComponent implements OnInit {
           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.validateForm.controls.roundRobinType.setValue(
+          //   this.roundRobinTypes[0] && this.roundRobinTypes[0].id
+          // );
         }
       });
   }
@@ -379,9 +379,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,7 +405,7 @@ export class ShortcutBuildOrdersComponent implements OnInit {
           title: this.validateForm.value.roundRobinName,
           hospital: this.hosId,
           startDept: this.validateForm.value.startDepartment,
-          taskType: this.roundRobinTypes[0].id,
+          taskType: this.validateForm.value.roundRobinType,
           targetDept: this.validateForm.value.endDepartment.join(),
         },
       };
@@ -417,7 +417,7 @@ export class ShortcutBuildOrdersComponent implements OnInit {
           title: this.validateForm.value.roundRobinName,
           hospital: this.hosId,
           startDept: this.validateForm.value.startDepartment,
-          taskType: this.roundRobinTypes[0].id,
+          taskType: this.validateForm.value.roundRobinType,
           targetDept: this.validateForm.value.endDepartment.join(),
         },
       };
@@ -503,7 +503,7 @@ export class ShortcutBuildOrdersComponent implements OnInit {
           return { id: item.id + "", hosName: item.taskName };
         });
         this.validateForm.controls.roundRobinType.setValue(
-          this.roundRobinTypes[0].id
+          data.taskType + ""
         ); //快捷建单类型
       }
       //起点科室

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)]="distribution">
+				    <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>
@@ -810,6 +817,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].numSwitch">数字交接</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"; //调度台是否可以新建工单
+	distribution = "0"; //是否配送人员可以新建工单
   isRemand = "0"; //是否开通自动送回
   remandTypeId = null; //开通自动送回,选择的任务类型
   defaultNullDeptId = null; //空单默认科室-标本配送
@@ -847,7 +848,7 @@ export class TaskTypeManagementComponent implements OnInit {
   //选择类型
   currentChoice;
   itemChoice(data, index) {
-    console.log(data);
+    console.log('点击了任务类型', data);
     if (data === undefined) {
       return;
     }
@@ -960,6 +961,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.allowUrgent = data.allowUrgent + "";
     this.urgentAudit = data.urgentAudit + "";
     this.autoFlag = data.autoFlag + "";
+		this.distribution = data.distribution ? data.distribution + "" : "0";
     this.isRemand = data.isRemand ? data.isRemand + "" : "0";
     if (data.remandTypeId) {
       this.remandTypeId = `${data.remandTypeId.id}__${data.remandTypeId.taskName}`;
@@ -1070,6 +1072,16 @@ 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
+			}
       this.carryingCourses = data.carryingCourses;
       this.ysgcData(this.carryingCourses[this.indexs]);
       this.depa(
@@ -1258,6 +1270,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["distribution"] = parseInt(this.distribution);
     this.taskData.taskType["isRemand"] = parseInt(this.isRemand);
     if (this.isRemand == "1") {
       let arr = this.remandTypeId.split("__");
@@ -1415,6 +1428,13 @@ export class TaskTypeManagementComponent implements OnInit {
         this.showPromptModal("提示", false, `【${i == 0 ? '起点科室' : '终点科室'}】是否支持多动作签到开启后，请配置确认动作或拍照动作！`);
         return;
       }
+			// if(i==0){
+			// 	this.showPromptModal("提示", false, `【起点科室】是否支持多动作签到开启后，请配置确认动作或拍照动作或数字交接！`);
+			// 	return;
+			// }else{
+			// 	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 ? '起点科室' : '终点科室'}】确认动作开启后，至少配置一个动作！`);
@@ -1426,16 +1446,21 @@ export class TaskTypeManagementComponent implements OnInit {
         return;
       }
     }
-		if(this.taskData.taskType.carryingCourses[this.indexs].multipleHospital){
-			this.taskData.taskType.carryingCourses[this.indexs].multipleHospital = 1
+		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{
-			this.taskData.taskType.carryingCourses[this.indexs].multipleHospital = 0
+			newData.taskType.carryingCourses[1].multipleHospital = 0
 		}
-    console.log(this.taskData);
-    // return;
+    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) {
@@ -1513,6 +1538,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.allowUrgent = "1"; //是否加急
     this.urgentAudit = "0"; //加急是否审核
     this.autoFlag = "0"; //调度台是否可以新建工单
+		this.distribution = "0"; //是否配送人员可以新建工单
     this.isRemand = "0"; //是否开通自动送回
     this.remandTypeId = null; //自动送回，选择任务类型
     this.defaultNullDeptId = null; //标本配送空单默认值