拉取代码

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

@@ -22,9 +22,10 @@
               <div class="thumb" *ngFor="let item of imgs_incident;let index = index;" (click)="previewImageHandler(imgs_incident, index)"><img [src]="item.thumbFilePath" alt=""></div>
             </div>
           </div>
-          <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
-          <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
-          <div nz-col nzSpan="8">维修总金额：{{orderInfo.rsPrice === undefined ? '无' : orderInfo.rsPrice + '元'}}</div>
+					<div nz-col nzSpan="6">关联资产：<ng-container *ngIf="orderInfo.assetDTO">{{ orderInfo.assetDTO.name }}</ng-container></div>
+          <div nz-col nzSpan="6">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
+          <div nz-col nzSpan="6">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
+          <div nz-col nzSpan="6">维修总金额：{{orderInfo.rsPrice === undefined ? '无' : orderInfo.rsPrice + '元'}}</div>
         </div>
       </div>
       <div class="center" *ngIf="amplificationShow">

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

@@ -184,7 +184,7 @@
 <!-- 查看模态框 -->
 <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 class="title">查看<i class="icon_transport transport-guanbi" (click)="close()"></i>
     </div>
     <overlay-scrollbars #osComponentRef1 class="content">
 			<div class="df view-item">

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

@@ -1083,7 +1083,7 @@
             <ng-container *ngIf="buildType !== '报修转事件'">
               <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
                 <ng-container *ngFor="let option of applicationRequesterList">
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name + '('+option.account+')'" [nzValue]="option.id"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -1527,6 +1527,18 @@
                   </div>
 
                   <div class="row">
+										<div class="col" *ngIf="cmdbRepair">
+											<span class="name">资产：</span>
+											<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" [(ngModel)]="incidentModel.assetId">
+												<ng-container *ngFor="let option of assetData">
+													<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="col">
                       <span class="name required">故障现象：</span>
                       <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">

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

@@ -177,7 +177,7 @@ export class FuwutaiComponent implements OnInit {
   searchHosDepartmentQtSubject = new Subject();
   searchPatientListSubject = new Subject();
   inspectSubject = new Subject();
-
+	changeAssetInpSubject = new Subject();
   // 运维相关
   incidentModel:any = {};
   incidentMsg:any = {};
@@ -966,6 +966,9 @@ export class FuwutaiComponent implements OnInit {
     this.inspectSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.refreshInspectList();
     });
+		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getAssetData(v);
+		});
     this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       if(v[0] === 'requester'){
         this.searchApplicationRequester(v[1]);
@@ -2730,6 +2733,7 @@ export class FuwutaiComponent implements OnInit {
   // 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
   patientLogTasktypeLoading: boolean = false;
 	showGovDutyConfig:any;
+	cmdbRepair:boolean = false;
   patientLogTasktype() {
     if(!this.hsmsData.hsmsSwitch){
       return;
@@ -2753,6 +2757,13 @@ export class FuwutaiComponent implements OnInit {
 						case "governmentDuty":
 							this.showGovDutyConfig =  c.valueconfig
 							break;
+						case "cmdbRepair":
+							if(c.valueconfig=='1'){
+								this.cmdbRepair = true
+							}else{
+								this.cmdbRepair = false
+							}
+							break;	
 					}
 				});
       } else {
@@ -2760,6 +2771,32 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+	
+	changeAsset(e){
+		this.changeAssetInpSubject.next(e);
+	}
+	
+	// 获取资产列表
+	assetData:any = [];
+	getAssetData(name?){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  asset: {
+		    hosId: this.incidentModel.hosId,
+		    name: name
+		  },
+		};
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "asset", data)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+		      this.assetData = data.list;
+		    }
+		  });
+	}
+	
   // 重置新建工单数据
   resetOrderData(){
     this.applicationRequesterList = [];
@@ -3441,7 +3478,10 @@ export class FuwutaiComponent implements OnInit {
 
     this.incidentModel.department = undefined;
     this.searchApplicationDepartment('itsm');
-
+		if(this.cmdbRepair){
+			this.incidentModel.assetId = null;
+			this.getAssetData()
+		}
     if(this.buildType !== '报修转事件'){
       this.incidentModel.requester = undefined;
       this.searchApplicationRequester();
@@ -3519,6 +3559,7 @@ export class FuwutaiComponent implements OnInit {
         hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
         dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
         name: keyWord,
+				phone: this.incidentModel.incomingPhone || undefined
         // simpleQuery: true,
       },
     };
@@ -3725,6 +3766,7 @@ export class FuwutaiComponent implements OnInit {
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
         "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
       },
     };
 
@@ -4542,6 +4584,7 @@ export class FuwutaiComponent implements OnInit {
         "candidateGroups": this.incidentModel.group || undefined,
         "assignee": this.incidentModel.user || undefined,
         "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
       }
     };
     if(this.buildType){
@@ -4617,6 +4660,7 @@ export class FuwutaiComponent implements OnInit {
         "candidateGroups": this.incidentModel.group || undefined,
         "assignee": this.incidentModel.user || undefined,
         "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
       }
     };
     if(this.buildType){
@@ -6634,6 +6678,10 @@ export class FuwutaiComponent implements OnInit {
     console.log('incidentModel:', incidentModel)
     this.showNewOrder(0, '', '', true, '报修转事件');
 		console.log(2345,this.incidentModel.repairIncidentType)
+		if(incidentModel.assetId){
+			this.getAssetData()
+			incidentModel.assetId = Number(incidentModel.assetId)
+		}
     // 查询报修图片
     this.getRepairImgs(data.id);
   }

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

@@ -2413,7 +2413,33 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
-        <nz-form-item>
+        <nz-form-item *ngIf="cmdbRepair">
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzFor="contacts">资产</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-select style="width:168px;margin-right: 8px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" formControlName="assetId">
+            	<ng-container *ngFor="let option of assetData">
+            		<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-form-control>
+        
+          <nz-form-label nzFor="contactsInformation">故障现象</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-select style="width:185px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp($event)" nzPlaceHolder="请选择故障现象" formControlName="category" (ngModelChange)="changeApplyCategory($event)">
+            	<ng-container *ngFor="let option of applicationCategoryList">
+            		<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 [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
           <nz-form-control>
             <nz-input-group style="width:442px;">

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

@@ -118,6 +118,8 @@ export class HushijiandanComponent implements OnInit {
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
   inspectSubject = new Subject();
+	changeAssetInpSubject = new Subject();
+	changeCommonInpSubject = new Subject();
   isYyInspect = false; //需要预约检查
   inspectAndPatientTransportConfig:any = {timeMod: 30};
   constructor(
@@ -191,6 +193,7 @@ export class HushijiandanComponent implements OnInit {
     this.getUpdateTipsForNurses();
     this.getRefreshNurseWorkOrderTime();
     this.getCloseTimeFlag();
+		this.getCmdbRepairFlag();
     this.currentDept = this.tool.getCurrentUserDept();
     console.log(this.currentDept, this.tabSearchCont);
     this.currentDept.typeValue == 'surgery' && !this.tabSearchCont && this.getSurgeryConfig();
@@ -209,7 +212,12 @@ export class HushijiandanComponent implements OnInit {
     this.inspectSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.refreshInspectList();
     });
-
+		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getAssetData(v);
+		});
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchApplicationCategory(v);
+		});
     this.getTodayNum();
     this.initLogin();
     this.getDeptTaskType();
@@ -1027,6 +1035,90 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+	// 获取资产报修是否开启
+	cmdbRepair:Boolean = false;
+	getCmdbRepairFlag() {
+	  let postData = {
+	    idx: 0,
+	    sum: 1,
+	    systemConfiguration: { keyconfig: "cmdbRepair" },
+	  };
+	  this.mainService
+	    .getFetchDataList("simple/data", "systemConfiguration", postData)
+	    .subscribe((result) => {
+	      if (result.status == 200) {
+					if(result.list[0].valueconfig==1){
+						this.cmdbRepair = true
+						this.getAssetData();
+						this.searchApplicationCategory();
+					}else{
+						this.cmdbRepair = false
+					}
+	      }
+	    });
+	}
+	
+	changeCommonInp(e) {
+	  this.changeCommonInpSubject.next(e);
+	}
+	changeApplyCategory(e){
+	  console.log(111, e)
+		if(e){
+		  // 根据故障现象带出故障描述
+		  if(this.validateBxForm.value.description){
+				this.validateBxForm.controls.description.setValue(this.validateBxForm.value.description +';'+this.applicationCategoryList.find(v => v.id == e).mutiCategory)
+		  }else{
+				this.validateBxForm.controls.description.setValue(this.applicationCategoryList.find(v => v.id == e).mutiCategory)
+		  }
+		}
+	}
+	// 故障现象列表
+	applicationCategoryList:any[] = [];
+	searchApplicationCategory(keyWord?) {
+	  let postData = {
+	    category: {
+	      category: keyWord,
+	      selectType: 'mutlQuery',
+	      hierarchy: 3,//只差有三级的故障现象列表
+	    },
+	  };
+	  console.log(postData);
+	  this.isLoading = true;
+	  this.mainService
+	    .incidentPost("listIncidentCategory", postData)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      if (data.status == 200) {
+	        this.applicationCategoryList = data.data;
+	      }
+	    });
+	}
+	
+	changeAsset(e){
+		this.changeAssetInpSubject.next(e);
+	}
+	
+	// 获取资产列表
+	assetData:any = [];
+	getAssetData(name?){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  asset: {
+		    hosId: this.currentHospital.id,
+		    name: name
+		  },
+		};
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "asset", data)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+		      this.assetData = data.list;
+		    }
+		  });
+	}
+	
   //获取综合日志
   rLoading = false;
   listDeptOrderRecords: any = [];
@@ -1532,7 +1624,22 @@ export class HushijiandanComponent implements OnInit {
       officeAddress: [null, [Validators.required]],
       contacts: [this.loginUser.name, [Validators.required]],
       contactsInformation: [this.loginUser.phone, [Validators.required]],
+			assetId: [null, []],
+			category: [null, []],
     });
+		if(this.cmdbRepair){
+			this.validateBxForm.addControl(
+				'assetId',
+				new FormControl(null, [])
+			);
+			this.validateBxForm.addControl(
+				'category',
+				new FormControl(null, [])
+			);
+		}else{
+			this.validateBxForm.removeControl('assetId');
+			this.validateBxForm.removeControl('category');
+		}
     this.getDeptById(this.currentDept.id);
   }
   // 根据科室ID获取详情
@@ -1711,6 +1818,8 @@ export class HushijiandanComponent implements OnInit {
               requester: this.loginUser,
               acceptUser: this.loginUser,
               deleteFlag: 0,
+							assetId: this.validateBxForm.value.assetId || undefined,
+							category: this.validateBxForm.value.category ? { id: this.validateBxForm.value.category } : undefined,
             },
           };
           if (this.coopBx.category) {

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

@@ -199,7 +199,7 @@
 					<ng-container *ngIf="buildType !== '报修转事件'">
 						<nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
 							<ng-container *ngFor="let option of applicationRequesterList">
-								<nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								<nz-option *ngIf="!isLoading" [nzLabel]="option.name + '('+option.account+')'" [nzValue]="option.id"></nz-option>
 							</ng-container>
 							<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 								<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -304,6 +304,18 @@
 								</div>
 
 								<div class="row">
+									<div class="col" *ngIf="cmdbRepair">
+										<span class="name">资产：</span>
+										<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" [(ngModel)]="incidentModel.assetId">
+											<ng-container *ngFor="let option of assetData">
+												<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="col">
 										<span class="name required">故障现象：</span>
 										<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">

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

@@ -544,7 +544,8 @@ export class MainComponent implements OnInit, OnDestroy {
 	searchHosDepartmentQtSubject = new Subject();
 	searchPatientListSubject = new Subject();
 	inspectSubject = new Subject();
-
+	changeAssetInpSubject = new Subject();
+	
 	// 运维相关
 	incidentModel:any = {};
 	incidentMsg:any = {};
@@ -654,9 +655,9 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	// 获取院区配置配置，是否核酸打印
 	getHospitalConfigList(key) {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  let postData = { idx: 0, sum: 1, hospitalConfig: { hosId: this.checkedHos, key } };
 	  this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe(result=>{
 	    if(result.status == 200){
@@ -670,9 +671,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 获取配置文件写死的任务类型ID(送病人回病房9)，选择此任务类型的话，患者信息从终点科室获取
 	getConfigTasktypeLoading: boolean = false;
 	getConfigTasktype() {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  let postData = {
 	    idx: 0,
 	    sum: 1,
@@ -694,9 +695,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
 	patientLogTasktypeLoading: boolean = false;
 	patientLogTasktype() {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  let postData = {
 	    idx: 0,
 	    sum: 1,
@@ -857,9 +858,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	searchTaskList;
 	searchTaskLoading = false;
 	getSearchTaskList(keyword, countRemark = '') {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  this.searchTaskLoading = true;
 	  return this.mainService.getTaskTypeBySearchKey({
 	    searchKey: keyword || undefined,
@@ -883,9 +884,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	patientLogList:any;
 	loading5:boolean = false
 	getPatientLog(id) {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  if (id == -1 || id === null || id === undefined) {
 	    this.patientLogList = [];
 	    return;
@@ -911,9 +912,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 服务台新建工单—根据申请科室id来查询未到达工单(科室id)
 	loading4 = false;
 	getWorkOrders(id) {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  if (id == -1 || id === null || id === undefined) {
 	    this.noArrives = [];
 	    return;
@@ -952,9 +953,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	loading6 = false;
 	itsmOrders:any[] = [];
 	getItsmOrders(id) {
-	  if(!this.itsmData.mdv2Switch){
-	    return;
-	  }
+	  // if(!this.itsmData.mdv2Switch){
+	  //   return;
+	  // }
 	  if (id == -1 || id === null || id === undefined && this.incidentModel.repairIncidentType === 'dept') {
 	    this.itsmOrders = [];
 	    return;
@@ -1019,9 +1020,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	loading7 = false;
 	knowageList:any[] = [];
 	getKnowageList() {
-	  if(!this.itsmData.mdv2Switch){
-	    return;
-	  }
+	  // if(!this.itsmData.mdv2Switch){
+	  //   return;
+	  // }
 
 	  if(!(this.incidentModel.category && this.solutionStatus && this.solutionType)){
 	    this.loading7 = false;
@@ -1159,7 +1160,10 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	//   this.incidentModel.department = undefined;
 	  this.searchApplicationDepartment('itsm');
-
+		if(this.cmdbRepair){
+			this.incidentModel.assetId = null;
+			this.getAssetData()
+		}
 	  if(this.buildType !== '报修转事件'){
 	    this.incidentModel.requester = undefined;
 	    this.searchApplicationRequester();
@@ -1401,6 +1405,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      "callID": this.incidentModel.callID || undefined,
 	      "incomingPhone": this.incidentModel.incomingPhone || undefined,
 	      "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
 	    },
 	  };
 
@@ -1750,9 +1755,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	applicationDeptList:any[] = [];
 	applyStartDept:any;
 	searchApplicationDepartment(type, e?, phone?, deptId?, isInit?) {
-	  if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
+	  //   return;
+	  // }
 	  let keyWord = "";
 	  if (e && e !== "&ks&" && e !== "&go&") {
 	    keyWord = e;
@@ -2207,6 +2212,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      "candidateGroups": this.incidentModel.group || undefined,
 	      "assignee": this.incidentModel.user || undefined,
 	      "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
 	    }
 	  };
 	  if(this.buildType){
@@ -2496,53 +2502,14 @@ export class MainComponent implements OnInit, OnDestroy {
 	getAutoWorkTypes(isFirst, isInit) {
 	  this.workTypesArrange = [];
 	  // 运维
-	  if(this.itsmData.mdv2Switch){
+	  // if(this.itsmData.mdv2Switch){
 	    this.workTypesArrange = [{key:'故障报修', value: []}];
-	    if(!this.hsmsData.hsmsSwitch){
-	      console.log('workTypesArrange', this.workTypesArrange);
-	      // 是否显示操作项
-	      this.workTypesFlag = this.workTypesArrange.length >= 5;
-	    }
-	  }
-	  // 配送
-	  if(this.hsmsData.hsmsSwitch){
-	    this.newLoading = true;
-	    this.mainService.getTaskTypeBySearchKey({
-	      hosId: this.checkedHos,
-	    }).subscribe((data) => {
-	      this.newLoading = false;
-	      if (data["status"] == 200) {
-	        this.workTypes = data["data"];
-	        // 整理后的任务类型
-	        this.isShowResidenceNo = false;
-	        this.workTypes.forEach((item) => {
-	          if(item.associationTypeValue === 'patientTransport' || item.associationTypeValue === 'inspect'){
-	            // 患者其他服务
-	            let obj = this.workTypesArrange.find(v => v.key === '患者转运');
-	            if(obj){
-	              obj.value.push(item);
-	            }else{
-	              this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
-	              this.isShowResidenceNo = true;
-	            }
-	          }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
-	            // 物品配送
-	            let obj = this.workTypesArrange.find(v => v.key === '物品配送');
-	            if(obj){
-	              obj.value.push(item);
-	            }else{
-	              this.workTypesArrange.unshift({ key: '物品配送', value: [item] });
-	            }
-	          }
-	        });
-	        console.log('workTypesArrange', this.workTypesArrange);
-	        // 任务类型是否显示操作项
-	        let arr = this.workTypesArrange;
-	        this.workTypesFlag = arr.length >= 5;
-	      }
-	    });
-	    this.getTaskTypeCountRemarkList();
-	  }
+	    // if(!this.hsmsData.hsmsSwitch){
+	    //   console.log('workTypesArrange', this.workTypesArrange);
+	    //   // 是否显示操作项
+	    //   this.workTypesFlag = this.workTypesArrange.length >= 5;
+	    // }
+	  // }
 	}
 	// 查类型
 	getTaskTypeCountRemarkList(){
@@ -3701,12 +3668,12 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	// 运维、配送工单切换
 	filterOrderList(type, state){
-	  if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
-	    return;
-	  }
-	  if(this.itsmData.mdv2Switch && !this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
+	  // if(this.itsmData.mdv2Switch && !this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  this.flagList[`${type}Flag${state}`] = !this.flagList[`${type}Flag${state}`];
 	  // this.getOrderList(state, state === 1);
 	}
@@ -3907,6 +3874,11 @@ export class MainComponent implements OnInit, OnDestroy {
 		    this.getPatientByResidenceNo(v[1]);
 		  }
 		});
+		
+		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getAssetData(v);
+		});
+		
 		this.onSearchTaskBuildSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.getTasktypeByPhone(v);
 		});
@@ -3937,6 +3909,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	applicantMustFillIn:any; //申请人是否必填 1是，0否
 	deptRepair:boolean = false; //科内报修
 	publicRepair:boolean = false; ; //公共报修
+	cmdbRepair:boolean = false; ; //是否支持资产报修
 	getSysConfig() {
 		const postData = { idx: 0, sum: 99 };
 		this.mainService
@@ -3970,6 +3943,13 @@ export class MainComponent implements OnInit, OnDestroy {
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
 									break;
+								case "cmdbRepair":
+									if(c[1]=='1'){
+										this.cmdbRepair = true
+									}else{
+										this.cmdbRepair = false
+									}
+									break;	
 							}
 						});
 						if(this.eventData){
@@ -3995,7 +3975,35 @@ export class MainComponent implements OnInit, OnDestroy {
 				}
 			});
 	 }
-
+	
+	changeAsset(e){
+		this.changeAssetInpSubject.next(e);
+	}
+	
+  // 获取资产列表
+	assetData:any = [];
+	getAssetData(name?){
+		if(!this.incidentModel.hosId){
+			return
+		}
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  asset: {
+		    hosId: this.incidentModel.hosId,
+		    name: name
+		  },
+		};
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "asset", data)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+		      this.assetData = data.list;
+		    }
+		  });
+	}
+	
 	// 新增报修
 	speedinessAdd(): void {
 		this.addOrder();