拉取代码

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

@@ -10,7 +10,8 @@
         <div class="dictionaryRow">
           <div class="orders">排序号</div>
           <div class="name">键</div>
-          <div class="value">值</div>
+          <div [ngClass]="{value_2: activeDictionaryKey.key == 'alarm_urgency', value: activeDictionaryKey.key != 'alarm_urgency'}">值</div>
+					<div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">关键字</div>
         </div>
         <overlay-scrollbars #osComponentRef2 class="contentBody2">
           <form nz-form [formGroup]="validateDictionaryForm" class="w100">
@@ -33,7 +34,7 @@
                   </nz-form-control>
                 </nz-form-item>
               </div>
-              <div class="value">
+              <div [ngClass]="{value_2: activeDictionaryKey.key == 'alarm_urgency', value: activeDictionaryKey.key != 'alarm_urgency'}">
                 <nz-form-item>
                   <nz-form-control [nzSpan]="24" nzErrorTip="请输入值!">
                     <nz-input-group>
@@ -41,9 +42,20 @@
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
-                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')"></i>
-                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')" (click)="removeField(data, i)"></i>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key != 'alarm_urgency'"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key != 'alarm_urgency'" (click)="removeField(data, i)"></i>
               </div>
+							<div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">
+							  <nz-form-item>
+							    <nz-form-control [nzSpan]="24" nzErrorTip="请输入关键字!">
+							      <nz-input-group>
+							        <input [formControlName]="'extra1_' + data.id" nz-input class="valueInput">
+							      </nz-input-group>
+							    </nz-form-control>
+							  </nz-form-item>
+							  <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key == 'alarm_urgency'"></i>
+							  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key == 'alarm_urgency'" (click)="removeField(data, i)"></i>
+							</div>
             </div>
           </form>
         </overlay-scrollbars>

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

@@ -72,7 +72,20 @@
           cursor: pointer;
         }
       }
-
+			
+			.value_2{
+			  flex: 1.5;
+			  display: flex;
+			  align-items: center;
+			  .valueInput{
+			    width: 320px;
+			  }
+			  .icon_transport{
+			    font-size: 20px;
+			    color: #8a8a8a;
+			    cursor: pointer;
+			  }
+			}
     }
   }
   .content{

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

@@ -234,6 +234,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
         name: rawValueObj['name_' + this.dictionaryList[i].id],
         value: rawValueObj['value_' + this.dictionaryList[i].id],
         orders: rawValueObj['orders_' + this.dictionaryList[i].id],
+				extra1: this.activeDictionaryKey.key == 'alarm_urgency' ? rawValueObj['extra1_' + this.dictionaryList[i].id]: undefined,
         system: uuidValidate(this.dictionaryList[i].id) ? false : this.dictionaryList[i].system,
         key: this.activeDictionaryKey.key,
       })

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

@@ -6,7 +6,6 @@
       </overlay-scrollbars>
     </div> -->
 		<div class="addressAssign">
-			<div class="hos-title">{{currentHospital.hosName}}</div>
 		  <overlay-scrollbars #osComponentRef2 class="contentBody2">
 		    <div class="contentBody">
 					<div class="mar-10">
@@ -37,6 +36,7 @@
 		    </div>
 		  	<div class="contentBtns">
 		  	  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+					<button nz-button nzType="primary" [nzLoading]="cacheLoading" (click)="resetCache()">常用耗材缓存刷新</button>
 		  	</div>
 		  </overlay-scrollbars>
 		</div>

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

@@ -212,6 +212,9 @@
 			position: absolute;
 			bottom: 0;
 			width: 100%;
+			button{
+				margin-right: 10px;
+			}
 	  }
 	}
 }

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

@@ -40,6 +40,26 @@ export class ConfigurationSysComponent implements OnInit {
 		this.getSysConfig();
   }
 	
+	// 刷新耗材缓存
+	cacheLoading:boolean = false;
+	resetCache(){
+		this.cacheLoading = true;
+		this.mainService.resetCache('commonlyUseConsumables').subscribe(
+		  (result) => {
+		    this.cacheLoading = false;
+		    if (result["status"] == 200) {
+		      this.showPromptModal("刷新", true, "");
+		    } else {
+		      this.showPromptModal("刷新", false, "");
+		    }
+		  },
+		  (error) => {
+		    this.cacheLoading = false;
+		    this.showPromptModal("刷新", false, "");
+		  }
+		);
+	}
+	
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
   submitMessageForm(): void {

src/app/components/display-form/display-form.component.ts

@@ -30,7 +30,7 @@ export class DisplayFormComponent implements OnInit {
   orderType: string = 'priority'; //排序方式
 	leftMenuLocation: any = 2; //左侧菜单
 	rightMenuLocation: any = 2; //右侧菜单
-	showSource: any = 0; //是否展示来源
+	showSource: any = 2; //是否展示来源
   ngOnInit() {
     this.initControlView();
   }
@@ -68,9 +68,9 @@ export class DisplayFormComponent implements OnInit {
         this.workerRefreshTime = this.workerInfoTime = data.list[0].workerInfoTime;
         this.audioNotDispatched = data.list[0].unsendOrderVoice !== false;
         this.orderType = data.list[0].orderType || 'priority';
-				this.leftMenuLocation = data.list[0].leftMenuLocation;
-				this.rightMenuLocation = data.list[0].rightMenuLocation;
-				this.showSource = data.list[0].showSource;
+				this.leftMenuLocation = data.list[0].leftMenuLocation || 2;
+				this.rightMenuLocation = data.list[0].rightMenuLocation || 2;
+				this.showSource = data.list[0].showSource || 2;
 				
       });
   }

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.html

@@ -1,12 +1,12 @@
 <div class="incident_handle_info" [hidden]="handleInfoLoading">
-<!--  <div class="formItem column" *ngIf="itsmSimpleHandle.value==1 && itsmWriteSolution.value==1">
+ <div class="formItem column">
     <div class="name"><i class="icon_transport transport-required red"></i>解决方案：</div>
     <div class="value">
       <textarea rows="4" nz-input [(ngModel)]="incidentDataCopy.handleDescription" placeholder="请输入解决方案"></textarea>
     </div>
-  </div> -->
+  </div>
 
-  <div class="formItem" *ngIf="itsmSimpleHandle.value != 1">
+  <div class="formItem">
     <div class="name"><i class="icon_transport transport-required red"></i>故障现象：</div>
     <div class="value w100">
       <nz-select class="w100" [(ngModel)]="incidentDataCopy.category" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch

src/app/components/incidentManagement/incident-handle/incident-handle.component.ts

@@ -237,10 +237,10 @@ export class IncidentHandleComponent implements OnInit {
       // 详细处理
       console.log(this.incidentHandleInfoComponent)
       // return;
-      // if(!this.incidentHandleInfoComponent.incidentDataCopy.handleDescription){
-      //   this.message.warning('请选择解决方案！');
-      //   return;
-      // }
+      if(!this.incidentHandleInfoComponent.incidentDataCopy.handleDescription){
+        this.message.warning('请选择解决方案！');
+        return;
+      }
       if(!this.incidentHandleInfoComponent.incidentDataCopy.category){
         this.message.warning('请选择故障现象！');
         return;

src/app/services/main.service.ts

@@ -1256,4 +1256,11 @@ export class MainService {
 		});
 	}
 	
+	// 常用耗材缓存刷新
+	resetCache(model){
+		return this.http.post(host.host + `/incident/refresh/cache/${model}`, {}, {
+		  headers: this.headers,
+		});
+	}
+	
 }

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -318,7 +318,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
       taskTypeConfig: {
         taskTypeDTO: {
           hosId: {
-            id: this.orderHosId
+            id: this.orderHosId ? this.orderHosId : this.hosId
           },
           ordinaryField: {
             key: 'ordinary_field',
@@ -333,6 +333,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
         if (result.status == 200) {
           let list = result.list || [];
           this.configs = list[0] || {};
+					console.log(886886,this.configs)
           this.getDrugsBugList(idx);
         }else{
           this.hsLoading = false;

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

@@ -1298,6 +1298,7 @@
   [show]="businessDataModalShow"
   [type]="businessDataModalType"
   [orderId]="orderId"
+	[orderHosId]="orderHosId"
 	[taskTypeValue]="taskTypeValue"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-modal>

src/app/share/order-detail/order-detail.component.ts

@@ -166,9 +166,11 @@ export class OrderDetailComponent implements OnInit {
   businessDataModalType = ''; //业务数据类型
   orderId = ""; //查看业务数据携带
 	taskTypeValue:any;
+	orderHosId:any;
   viewDetail(data, type) {
-		console.log(4444,data)
+		console.log(4444,data, type)
     this.orderId = data.id;
+		this.orderHosId = data.hosId;
 		this.taskTypeValue = data.taskType.associationType.value;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;

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

@@ -81,8 +81,8 @@
 				</div>
 				
 				<div class="list-template__searchItem">
-				  <span class="label width-105">开始时间区间：</span>
-				  <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				  <span class="label width-105">收取时间区间：</span>
+				  <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
 				</div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
@@ -125,10 +125,10 @@
 							<div>{{ data.packTime }}</div>
 						</td>
 						<td>
-							<div>{{ data.sendUser?.name }}</div>
+							<div>{{ data.sendUserDTO?.name }}</div>
 							<div>{{ data.signtime }}</div>
 						</td>
-						<td>{{ data.sendHandoverUser?.name }}</td>
+						<td>{{ data.sendHandoverUserDTO?.name }}</td>
 						<td>{{ data.drugsState?.name }}</td>
             <td class="text-underline" (click)="detail($event, data)">{{ data.workOrderDTO?.gdcode }}</td>
             <td>
@@ -138,7 +138,7 @@
 							<div class="coop" *ngIf="coopBtns.edit">
 							  <span (click)="edit(data)">编辑</span>
 							</div>
-							<div class="coop" *ngIf="coopBtns.send && (data.drugsState.value == 1 || data.drugsState.value == 2 || data.drugsState.value == 4 || data.drugsState.value == 8)">
+							<div class="coop" *ngIf="coopBtns.send && data.isCreatOder!='YES' && (data.drugsState.value == 1 || data.drugsState.value == 2 || data.drugsState.value == 4 || data.drugsState.value == 8)">
 							  <span (click)="sendMsg(data)">消息发送</span>
 							</div>
 						</td>
@@ -198,8 +198,8 @@
 				  <nz-form-control nzErrorTip="请选择发药科室!">
 				    <nz-input-group>
 							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-							  (nzOnSearch)="changeDept($event)" nzAllowClear nzPlaceHolder="请选择发药科室" formControlName="launch">
-								<ng-container *ngFor="let option of deptList">
+							  (nzOnSearch)="changeDept($event,1)" nzAllowClear nzPlaceHolder="请选择发药科室" formControlName="launch">
+								<ng-container *ngFor="let option of deptList1">
 								  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
 								</ng-container>
 								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -215,8 +215,8 @@
 				  <nz-form-control nzErrorTip="请选择申请科室!">
 				    <nz-input-group>
 							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-							  (nzOnSearch)="changeDept($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="target">
-								<ng-container *ngFor="let option of deptList">
+							  (nzOnSearch)="changeDept($event,2)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="target">
+								<ng-container *ngFor="let option of deptList2">
 								  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
 								</ng-container>
 								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -228,7 +228,7 @@
 				</nz-form-item>
 				
 				<nz-form-item>
-				  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="creatTime">开始时间</nz-form-label>
+				  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="creatTime">同步时间</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择同步时间!">
 				    <nz-input-group>
 				      <nz-date-picker
@@ -246,7 +246,7 @@
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="drugsState">药品状态</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择药品状态!">
 				    <nz-input-group>
-							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择药品状态" formControlName="drugsState">
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择药品状态" formControlName="drugsState">
 							  <ng-container *ngFor="let option of types">
 							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 							  </ng-container>
@@ -259,7 +259,7 @@
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="drugsBagType">药品类型</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择药品类型!">
 				    <nz-input-group>
-							<nz-select class="formItem" [nzDisabled]="!add" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择药品类型" formControlName="drugsBagType">
+							<nz-select class="formItem" [nzDisabled]="!add" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择药品类型" formControlName="drugsBagType">
 							  <ng-container *ngFor="let option of drugsList">
 							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 							  </ng-container>

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

@@ -38,6 +38,7 @@ export class DrugSearchComponent implements OnInit {
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
+	changeSearchSubject = new Subject();
   changeInpSubject = new Subject();
 	changeUserInpSubject = new Subject();
 	coopBtns:any;
@@ -45,15 +46,18 @@ export class DrugSearchComponent implements OnInit {
 	
   ngOnInit() {
 		this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.changeSearchSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getDept(v);
+		});
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      this.searchDept(v);
+      this.searchDept(v[0], v[1]);
     });
 		this.changeUserInpSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.searchUser(v);
 		});
     this.getHospital();
 		this.getDrugsList();
-		this.searchDept('');
+		this.getDept('');
 		this.searchUser('');
 		this.searchTypes();
   }
@@ -142,7 +146,7 @@ export class DrugSearchComponent implements OnInit {
 	searchUser(keyword) {
 	  let data = {
 	    user: {
-	      usertype: { id: 106 },
+	      // usertype: { id: 106 },
 	      name: keyword,
 	      hospital: {
 	        id: this.hosId,
@@ -180,6 +184,17 @@ export class DrugSearchComponent implements OnInit {
 	  this.searchCriteria.dateRange = [this.startDate,this.endDate]
 	}
 	
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.searchCriteria.dateRange = [dateStart,dateEnd];
+	  }
+	}
+	
   // 重置
   reset() {
     this.searchCriteria = {
@@ -229,10 +244,12 @@ export class DrugSearchComponent implements OnInit {
       dept = "";
     }
     this.isLoading = true;
-    this.changeInpSubject.next(dept);
+    this.changeSearchSubject.next(dept);
   }
   // 搜索科室
-  searchDept(dept) {
+	deptList1:any = [];
+	deptList2:any = [];
+  searchDept(dept, type) {
     let postData = {
       department: {
         hospital: { id: this.hosId },
@@ -246,11 +263,36 @@ export class DrugSearchComponent implements OnInit {
       .subscribe((result) => {
         if (result.status == 200) {
           this.isLoading = false;
-          this.deptList = result.list;
+					if(type == 1){
+						this.deptList1 = result.list;
+					}else{
+						this.deptList2 = result.list;
+					}
         }
       });
   }
 	
+	getDept(dept){
+		let postData = {
+		  department: {
+		    hospital: { id: this.hosId },
+				dept,
+		  },
+		  idx: 0,
+		  sum: 10,
+		};
+		this.mainService
+		  .getFetchDataList("data", "department", postData)
+		  .subscribe((result) => {
+		    if (result.status == 200) {
+		      this.isLoading = false;
+					this.deptList = result.list;
+		      this.deptList1 = result.list;
+					this.deptList2 = result.list;
+		    }
+		  });
+	}
+	
 	// 查看
 	detail(e, data) {
 		if(!data.workOrderDTO){
@@ -264,20 +306,22 @@ export class DrugSearchComponent implements OnInit {
 	modal:boolean = false;
 	add:boolean = false;
 	addMoadl() {
+		this.getDept('');
 	  this.add = true;
 		this.modal = true;
 		this.itemData = null;
 	  this.initForm();
 	}
 	hideModal() {
+		this.getDept('');
 	  this.modal = false;
 	  this.initForm();
 	}
 	
 	// 搜索科室
-	changeDept(dept){
+	changeDept(dept, type){
 		this.isLoading = true;
-		this.changeInpSubject.next(dept);
+		this.changeInpSubject.next([dept, type]);
 	}
 	
 	// 初始化新增form表单
@@ -344,8 +388,8 @@ export class DrugSearchComponent implements OnInit {
 	    .dataPost(this.add ? "addData":"updData", "drugsBag", data)
 	    .subscribe((data) => {
 	      that.btnLoading = false;
-	      that.hideModal();
 	      if (data.status == 200) {
+					that.hideModal();
 	        that.showPromptModal(that.add ? "新增" : "编辑", true, "");
 	      } else {
 	        that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
@@ -361,13 +405,27 @@ export class DrugSearchComponent implements OnInit {
 		this.initForm();
 		this.itemData = data;
 		this.coopId = data.id;
-		this.validateForm.controls.packid.setValue(data.packid);
-		this.validateForm.controls.batchNo.setValue(data.batchNo);
+		this.validateForm.controls.packid.setValue(data.packid || '');
+		this.validateForm.controls.batchNo.setValue(data.batchNo || '');
 		this.validateForm.controls.launch.setValue(data.launch.id);
 		this.validateForm.controls.target.setValue(data.target.id)
 		this.validateForm.controls.drugsState.setValue(data.drugsState.id)
-		this.validateForm.controls.drugsBagType.setValue(data.drugsBagType.id)
+		this.validateForm.controls.drugsBagType.setValue(data.drugsBagType && data.drugsBagType.id)
 		this.validateForm.controls.creatTime.setValue(data.creatTime);
+		let item = this.deptList1.find(i=>i.id == data.launch.id)
+		if(!item){
+			this.deptList1.push({
+				dept: data.launch.dept,
+				id: data.launch.id,
+			})
+		}
+		let item2 = this.deptList2.find(i=>i.id == data.target.id)
+		if(!item2){
+			this.deptList2.push({
+				dept: data.target.dept,
+				id: data.target.id,
+			})
+		}
 		this.modal = true
 	}
 	

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

@@ -1158,7 +1158,7 @@
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择任务类型！">
                               <div class="radios">
                                 <overlay-scrollbars #osComponentRef10 [ngStyle]="{ height: '100%' }">
-                                  <nz-radio-group formControlName="taskType" nz-row [ngModel]="radioValueZy" (ngModelChange)="radioChangeZy($event, index)">
+                                  <nz-radio-group formControlName="taskType" nz-row [ngModel]="radioValueZy" (ngModelChange)="radioChangeZy($event, index, 'change')">
                                     <div nz-row>
                                       <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[index].value">{{ item1.taskTypeName }}</label>
                                     </div>
@@ -1408,7 +1408,7 @@
                       <input class="addressFocus" nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" />
                       <div class="addressList" *ngIf="isShowAddressList">
                         <ng-container *ngIf="!addressLoading && addressList.length">
-                          <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
+                          <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name, item.id)">{{item.name}}</div>
                         </ng-container>
                         <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
                           <nz-empty></nz-empty>

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

@@ -391,6 +391,7 @@ export class FuwutaiComponent implements OnInit {
   applyStartDept;
 	patientCode:any;
 	taskTypeId:any;
+	patientObj:any;
   // 患者转运表单提交
   submitFormZy(go?): void {
     let newOrderShowFlag = true; //是否可以关闭弹窗
@@ -460,7 +461,9 @@ export class FuwutaiComponent implements OnInit {
           if (go === "&go&") {
             this.applyDept = data["createDept"].id;
             this.applyStartDept = data["createDept"];
-						this.patientCode = data["patientId"];
+						this.patientObj = data["patient"] ? data["patient"] : null;
+						this.patientCode = data["patient"] ? data["patient"].patientCode : null;
+						console.log(99999,this.patientCode)
 						this.taskTypeId = data["taskTypeId"];
             this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
@@ -476,7 +479,8 @@ export class FuwutaiComponent implements OnInit {
 					if (go === "&go&") {
 					  this.applyDept = data["createDept"].id;
 					  this.applyStartDept = data["createDept"];
-						this.patientCode = data["patientId"];
+						this.patientObj = data["patient"] ? data["patient"] : null;
+						this.patientCode = data["patient"] ? data["patient"].patientCode : null;
 						this.taskTypeId = data["taskTypeId"];
 					  this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 					}
@@ -2810,6 +2814,10 @@ export class FuwutaiComponent implements OnInit {
         tlwsa.tlaAcw();
       },0)
     }
+		this.addressDTO = null;
+		this.deptPriorityDTO = null;
+		this.userPriorityDTO = null;
+		this.malPriorityDTO = null;
     this.buildType = buildType;
 		console.log(123,buildType)
     if(this.itsmData.mdv2Switch){
@@ -3143,6 +3151,7 @@ export class FuwutaiComponent implements OnInit {
 				that.zwLoading = false;
 				that.initZwForm();
 				if (data.status == 200) {
+					this.patientCode = null;
 					this.getZwOrders();
 					this.selectProvince = false;
 					this.newOrderShow = false;
@@ -3156,11 +3165,13 @@ export class FuwutaiComponent implements OnInit {
 	
   // 获取患者信息
   searchPatientList(id, searchWords) {
+		this.patientObj = null;
+		this.patientCode = null;
     this.searchPatientListSubject.next([id, searchWords]);
   }
   // 获取患者信息
   isLoadingPatient: boolean = false;
-  getPatientList(id, searchWords, patient?) {
+  getPatientList(id, searchWords, patient?, type:any = '') {
     if(patient){
       this.patientList = [patient];
       return;
@@ -3175,10 +3186,31 @@ export class FuwutaiComponent implements OnInit {
       this.isLoadingPatient = false;
       if (result["state"] == 200) {
         this.patientList = result["data"];
-				if(this.deathTasktypeId != this.taskTypeId){
-					// 患者信息自动带入
-					let item = this.patientList.find(i=> i.id == this.patientCode)
-					this.validateFormZy.controls.patient.setValue(item.patientCode+"");
+				console.log(111,Number(this.deathTasktypeId))
+				console.log(222,this.taskTypeId)
+				console.log(333, type)
+				if(type!='change'){
+					if(this.patientObj){
+						let list = this.patientList.find(i=>i.id == this.patientObj.id)
+						if(!list){
+							this.patientList.push({
+								patientname: this.patientObj.patientName,
+								bednum: this.patientObj.bedNum,
+								residenceNo: this.patientObj.residenceNo,
+								id: this.patientObj.id,
+								patientCode: this.patientObj.patientCode
+							})
+						}
+					}
+					if(this.taskTypeId){
+						if(Number(this.deathTasktypeId) != this.taskTypeId){
+							// 患者信息自动带入
+							let item = this.patientList.find(i=> i.patientCode == this.patientCode)
+							if(item){
+								this.validateFormZy.controls.patient.setValue(item.patientCode+"");
+							}
+						}
+					}
 				}
         // if (this.patientList.length) {
         //   this.patientList = this.patientList.filter((item) => !!item.bednum);
@@ -3365,10 +3397,15 @@ export class FuwutaiComponent implements OnInit {
     if(userObj){
       this.incidentMsg.requesterPhone = userObj.phone;
     }
-		if(userObj.priorityDTO){
+		if(userObj && userObj.priorityDTO){
 			this.userPriorityDTO = userObj.priorityDTO
+		}else{
+			this.userPriorityDTO = null
 		}
 		let orders = [];
+		if(this.addressDTO&&this.addressDTO.orders){
+			orders.push(this.addressDTO.orders)
+		}
 		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
 			orders.push(this.deptPriorityDTO.orders)
 		}
@@ -3381,7 +3418,7 @@ export class FuwutaiComponent implements OnInit {
 		let minNumber = Math.min(...orders)
 		console.log('最小值的orders', orders, minNumber)
 		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber || null
+			this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
 		})
 		if(this.incidentModel.repairIncidentType === 'public'){
 			this.getItsmOrders('')
@@ -3458,8 +3495,13 @@ export class FuwutaiComponent implements OnInit {
             }
 						if(this.incidentCategoryConfig.priorityDTO){
 							this.malPriorityDTO = this.incidentCategoryConfig.priorityDTO
+						}else{
+							this.malPriorityDTO = null
 						}
 						let orders = [];
+						if(this.addressDTO&&this.addressDTO.orders){
+							orders.push(this.addressDTO.orders)
+						}
 						if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
 							orders.push(this.deptPriorityDTO.orders)
 						}
@@ -3472,7 +3514,7 @@ export class FuwutaiComponent implements OnInit {
 						let minNumber = Math.min(...orders)
 						console.log('最小值的orders', orders, minNumber)
 						setTimeout(_=>{
-							this.incidentModel.priorityId = minNumber || null
+							this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
 						})
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
             this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
@@ -3977,26 +4019,6 @@ export class FuwutaiComponent implements OnInit {
   // 配送-选择科室
 	deptPriorityDTO:any;
   changeApply(e) {
-		let item = this.applicationDepartmentList.find(i=>i.id = e)
-		console.log('选中的科室11111',item);
-		if(item.priorityDTO){
-			this.deptPriorityDTO = item.priorityDTO
-		}
-		let orders = [];
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
-			orders.push(this.deptPriorityDTO.orders)
-		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
-			orders.push(this.userPriorityDTO.orders)
-		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
-			orders.push(this.malPriorityDTO.orders)
-		}
-		let minNumber = Math.min(...orders)
-		console.log('最小值的orders', orders, minNumber)
-		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber || null
-		})
     this.changeApplicationDepartment("&same&");
     this.defaultInspectFn();
 
@@ -4010,15 +4032,43 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDepartmentList.find(v => v.id == e);
 
-    if(this.incidentModel.department != e){
-      this.incidentModel.department = e;
-      this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, e);
-    }
+    // if(this.incidentModel.department != e){
+    //   this.incidentModel.department = e;
+    //   this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, e);
+    // }
   }
   // 运维-选择科室
   changeApplyDept(e) {
     console.log(e, this.applicationDeptList);
-
+		let item = this.applicationDeptList.find(i=>i.id == e)
+		console.log('选中的科室11111',item);
+		if(item && item.priorityDTO){
+			this.addressDTO = null;
+			this.userPriorityDTO = null;
+			this.deptPriorityDTO = item.priorityDTO
+		}else{
+			this.addressDTO = null;
+			this.userPriorityDTO = null;
+			this.deptPriorityDTO = null
+		}
+		let orders = [];
+		if(this.addressDTO&&this.addressDTO.orders){
+			orders.push(this.addressDTO.orders)
+		}
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+			orders.push(this.deptPriorityDTO.orders)
+		}
+		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+			orders.push(this.userPriorityDTO.orders)
+		}
+		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+			orders.push(this.malPriorityDTO.orders)
+		}
+		let minNumber = Math.min(...orders)
+		console.log('最小值的orders', orders, minNumber)
+		setTimeout(_=>{
+			this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
+		})
     if(this.incidentModel.department && this.currentTabIndex === '故障报修'){
       this.rightTitle_tab = [
         { id: 2, name: '近期维修' },
@@ -4092,7 +4142,7 @@ export class FuwutaiComponent implements OnInit {
 
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
             this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
-            this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
+            // this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
 
             // 回显维修人/组
             this.showGroupOrUser();
@@ -4146,7 +4196,7 @@ export class FuwutaiComponent implements OnInit {
       if (this.currentTabIndex == "患者转运") {
         //患者转运
         //获取患者信息
-        this.getPatientList(this.applyDept, "");
+        this.getPatientList(this.applyDept, "", "", "");
       }
       if (this.currentRTab === 0) {
         this.getWorkOrders(this.applyDept);
@@ -4163,7 +4213,7 @@ export class FuwutaiComponent implements OnInit {
       if (this.currentTabIndex == "患者转运") {
         //患者转运
         //获取患者信息
-        this.getPatientList(this.applyDept, "");
+        this.getPatientList(this.applyDept, "", "", "");
       }
       if (this.currentRTab === 0) {
         this.getWorkOrders(this.applyDept);
@@ -4571,6 +4621,7 @@ export class FuwutaiComponent implements OnInit {
         this.jry_shixian();
       }
 			this.goType = null;
+			this.patientCode = null;
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
       this.showPromptModal("操作", true, "", "");
@@ -4685,13 +4736,15 @@ export class FuwutaiComponent implements OnInit {
           let arr = this.workTypesArrange;
           this.workTypesFlag = arr.length >= 5;
           // 默认选中故障现象
-          if (arr.length > 0) {
+          if (arr.length > 0 && this.patientCode) {
+						isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[0].key, isInit);
+          }else{
 						if(this.showGovDuty==1){
 							isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 2].key, isInit);
 						}else{
 							isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 1].key, isInit);
 						}
-          }
+					}
         }
       });
       this.getTaskTypeCountRemarkList();
@@ -5105,10 +5158,9 @@ export class FuwutaiComponent implements OnInit {
   tabIndex;
 	isStartFixedType:boolean = false;
 	isEndFixedType:boolean = false;
-  radioChangeZy(value, index) {
+  radioChangeZy(value, index, type='') {
     this.radioValueZyPre = this.radioValueZy;
     this.radioValueZy = value;
-
     this.tabIndex = index;
     //任务类型id
     if (value === "" || value === null) {
@@ -5212,11 +5264,15 @@ export class FuwutaiComponent implements OnInit {
         if (this.endDeptZy && this.radioValueZy == this.deathTasktypeId) {
           //获取患者信息
           this.patientZy = null;
-          this.getPatientList(this.endDeptZy, "");
+					this.patientObj = null;
+					this.taskTypeId = null;
+          this.getPatientList(this.endDeptZy, "", "", type);
         } else if(this.applyDept && this.radioValueZyPre == this.deathTasktypeId) {
           //获取患者信息
           this.patientZy = null;
-          this.getPatientList(this.applyDept, "");
+					this.patientObj = null;
+					this.taskTypeId = null;
+          this.getPatientList(this.applyDept, "", "", type);
         }
       }
     });
@@ -5333,30 +5389,24 @@ export class FuwutaiComponent implements OnInit {
 	goType:any;
   newOrderOk(go?): void {
 		this.goType = go
-    console.log(this.radioValueQt);
     let arr = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
     let objQt = arr.value.find(v => v.id == this.radioValueQt);
     let objZy = arr.value.find(v => v.id == this.radioValueZy);
     if (this.isYyInspect && objQt && objQt.associationTypeValue === 'other') {
       this.clickYYFlag = true;
-			console.log(110)
     } else {
-			console.log(111)
       this.clickYYFlag = false;
     }
     if (this.isYyInspect && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect')) {
       this.clickYYZyFlag = true;
-			console.log(112)
     } else {
       this.clickYYZyFlag = false;
-			console.log(113)
     }
 
     if (
       (!this.yyTime && objQt && objQt.associationTypeValue === 'other' && this.isYyInspect) ||
       (!this.yyTimeZy && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect') && this.isYyInspect)
     ) {
-			console.log(114)
       return;
     }
 
@@ -5365,6 +5415,9 @@ export class FuwutaiComponent implements OnInit {
     } else {
       this.isGoLoading = true;
     }
+		if(this.currentTabIndex!='患者转运'){
+			this.patientCode = null;
+		}
     if (objZy && objZy.associationTypeValue === 'patientTransport') {
       //患者转运
       go === "&go&" ? this.submitFormZy(go) : this.submitFormZy();
@@ -5466,17 +5519,18 @@ export class FuwutaiComponent implements OnInit {
   // 撤回并删除
   recAndDel() {
     let that = this;
-    that.recDelLoading = true;
-    that.mainService.delOrder(that.coopId).subscribe((data) => {
-      that.recDelLoading = false;
-      console.log(data);
-      that.closeRecallOrderModal();
-      if (data.status == 200) {
-        that.showPromptModal("删除", true, "");
-      } else {
-        that.showPromptModal("删除", false, data.msg);
-      }
-    });
+		this.openReasonModal()
+    // that.recDelLoading = true;
+    // that.mainService.delOrder(that.coopId).subscribe((data) => {
+    //   that.recDelLoading = false;
+    //   console.log(data);
+    //   that.closeRecallOrderModal();
+    //   if (data.status == 200) {
+    //     that.showPromptModal("删除", true, "");
+    //   } else {
+    //     that.showPromptModal("删除", false, data.msg);
+    //   }
+    // });
   }
   // 关闭撤回模态框
   closeRecallOrderModal() {
@@ -5535,6 +5589,7 @@ export class FuwutaiComponent implements OnInit {
 	delReason:any;
 	isDelVisible:boolean = false;
 	openReasonModal() {
+		this.closeRecallOrderModal();
 	  this.isDelVisible = true;
 	}
 	// 确认删除
@@ -5561,6 +5616,7 @@ export class FuwutaiComponent implements OnInit {
 	// 关闭模态框
 	delOrderModal() {
 	  this.isDelVisible = false;
+		this.delReason = null;
 	}
 	
   // 新建工单
@@ -5638,6 +5694,12 @@ export class FuwutaiComponent implements OnInit {
 	  this.repeatModal = true;
 	  this.repeatPostData = postData;
 	  this.sourceType = sourceType;
+		if(this.currentTabIndex!='患者转运'){
+			this.patientCode = null;
+		}
+		if(this.currentTabIndex=='患者转运' && go!='&go&' ){
+			this.patientCode = null;
+		}
 		// if(this.goType=='&go&'){
 		// 	this.showRepetitionModal("建单", true, "", "closeGo");
 		// }
@@ -5647,7 +5709,6 @@ export class FuwutaiComponent implements OnInit {
 	  this.btnLoading = false;
 		this.confirmType = false;
 		if(this.goType=='&go&'){
-			console.log('fou222222')
 			this.showNewOrder(1,"&go&");
 			// this.showRepetitionModal("建单", true, "", "closeGo");
 		}
@@ -6624,7 +6685,33 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 选择地址
-  selectAddress(name){
+	addressDTO:any;
+  selectAddress(name, id){
+		let item = this.addressList.find(i=>i.id == id)
+		console.log('选中的地址11111',item);
+		if(item && item.priority){
+			this.addressDTO = item.priority
+		}else{
+			this.addressDTO = null
+		}
+		let orders = [];
+		if(this.addressDTO&&this.addressDTO.orders){
+			orders.push(this.addressDTO.orders)
+		}
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+			orders.push(this.deptPriorityDTO.orders)
+		}
+		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+			orders.push(this.userPriorityDTO.orders)
+		}
+		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+			orders.push(this.malPriorityDTO.orders)
+		}
+		let minNumber = Math.min(...orders)
+		console.log('最小值的orders', orders, minNumber)
+		setTimeout(_=>{
+			this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
+		})
     this.incidentModel.houseNumber = name;
     this.isShowAddressList = false;
   }

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

@@ -596,7 +596,7 @@
                                               <nz-form-control nzErrorTip="请选择起点科室!">
                                                 <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.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -618,7 +618,7 @@
                                               <nz-form-control nzErrorTip="请选择目标科室!">
                                                 <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.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -640,7 +640,7 @@
                                               <nz-form-control nzErrorTip="请选择起点科室!">
                                                 <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.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -655,7 +655,7 @@
                                               <nz-form-control nzErrorTip="请选择目标科室!">
                                                 <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.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -1566,7 +1566,7 @@
                 <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
                   <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.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id"></nz-option>
+                      <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                     </ng-container>
                     <nz-option *ngIf="false" nzDisabled nzCustomContent>
                       <i nz-icon nzType="loading" class="loading-icon"></i>
@@ -1594,7 +1594,7 @@
                 <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
                   <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.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id"></nz-option>
+                      <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                     </ng-container>
                   </nz-select>
                 </nz-form-control>
@@ -1750,7 +1750,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
+                      deptDisplay == 2 ? option.deptalias : option.dept
                     "
                     [nzValue]="option.id"
                   >
@@ -1796,7 +1796,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
+                      deptDisplay == 2 ? option.deptalias : option.dept
                     "
                     [nzValue]="option.id"
                   >
@@ -1841,7 +1841,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
+                      deptDisplay == 2 ? option.deptalias : option.dept
                     "
                     [nzValue]="option.id"
                   >
@@ -1876,7 +1876,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
+                      deptDisplay == 2 ? option.deptalias : option.dept
                     "
                     [nzValue]="option.id"
                   >

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

@@ -1973,6 +1973,8 @@ export class HushijiandanComponent implements OnInit {
     // 返回值的status是203 则是固定科室
     // 返回值的status是204 则是自主填写
     // 返回值的status是205 则是固定科室类型
+		key = key.toUpperCase()
+		console.log('hahhah =======', key)
     if (
       (type == "start" && msg.start.start.departmentStrategy == 202) ||
       (type == "target" && msg.end.end.departmentStrategy == 202)
@@ -1991,8 +1993,20 @@ export class HushijiandanComponent implements OnInit {
 				.postCustom("nurse", "workOrder/buildTrip", postData)
 				.subscribe((result) => {
 					let arr = result.start.start.list;
+					arr.forEach(i=>{
+						if(this.deptDisplay == 2){
+							i.deptalias = i.deptalias + '('+i.inputcode+')'
+						}else{
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
+					
 					if(key!=''){
-						data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						if(this.deptDisplay ==2){
+							data = arr.filter(i=>i.deptalias.indexOf(key) !=-1)
+						}else{
+							data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						}
 						msg.start.start.list = data
 					}else{
 						msg.start.start.list = arr
@@ -2003,8 +2017,20 @@ export class HushijiandanComponent implements OnInit {
 				.postCustom("nurse", "workOrder/buildTrip", postData)
 				.subscribe((result) => {
 					let arr = result.end.end.list;
+					arr.forEach(i=>{
+						if(this.deptDisplay == 2){
+							i.deptalias = i.deptalias + '('+i.inputcode+')'
+						}else{
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
+					
 					if(key!=''){
-						data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						if(this.deptDisplay ==2){
+							data = arr.filter(i=>i.deptalias.indexOf(key) !=-1)
+						}else{
+							data = arr.filter(i=>i.dept.indexOf(key) !=-1)
+						}
 						msg.end.end.list = data
 					}else{
 						msg.end.end.list = arr
@@ -2039,8 +2065,22 @@ export class HushijiandanComponent implements OnInit {
       .getFetchDataList("data", "department", postData)
       .subscribe((data) => {
         if (type == "target") {
+					data.list.forEach(i=>{
+						if(this.deptDisplay == 2){
+							i.deptalias = i.deptalias + '('+i.inputcode+')'
+						}else{
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
           msg.end.end.list = data.list;
         } else if (type == "start") {
+					data.list.forEach(i=>{
+						if(this.deptDisplay == 2){
+							i.deptalias = i.deptalias + '('+i.inputcode+')'
+						}else{
+							i.dept = i.dept + '('+i.inputcode+')'
+						}
+					})
           msg.start.start.list = data.list;
         }
       });
@@ -3547,6 +3587,20 @@ export class HushijiandanComponent implements OnInit {
     this.mainService
       .postCustom("nurse", "workOrder/buildTrip", postData)
       .subscribe((result) => {
+				result.start.start.list.forEach(i=>{
+					if(this.deptDisplay ==2){
+						i.deptalias = i.deptalias + '('+i.inputcode+')'
+					}else{
+						i.dept = i.dept + '('+i.inputcode+')'
+					}
+				})
+				result.end.end.list.forEach(i=>{
+					if(this.deptDisplay ==2){
+						i.deptalias = i.deptalias + '('+i.inputcode+')'
+					}else{
+						i.dept = i.dept + '('+i.inputcode+')'
+					}
+				})
         this.buildMsg = result;
 				if(result.end){
 					if(result.end.end.departmentStrategy==202 ||

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

@@ -31,6 +31,7 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 5, name: '状态', key: "incident_status"},
     { id: 6, name: '维修记录', key: "repair_type"},
     { id: 7, name: '满意度评价', key: "incident_degree"},
+		// { id: 8, name: '告警紧急度', key: "alarm_urgency"},
   ]
 
   // 院区配置

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

@@ -878,7 +878,19 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
   // 显示弹框
   showSearchModal() {
     this.modelName = "详细搜索";
-    this.searchModal = true;
+		let item = this.repairsUserList.find(i=>i.id == this.validateSearchForm.value.repairsUser)
+    if(!item && this.validateSearchForm.value.repairsUser){
+			this.mainService
+			  .getFetchData("data", "user", this.validateSearchForm.value.repairsUser)
+			  .subscribe((result) => {
+			    this.repairsUserList.push({
+			    	id: result.data.id,
+			    	name: result.data.name
+			    })
+			  });
+
+		}
+		this.searchModal = true;
   }
   //关闭新增/编辑弹框
   hideSearchModal() {

src/app/views/inspection-execute/inspection-execute.component.html

@@ -52,6 +52,22 @@
             </nz-option>
           </nz-select>
         </div>
+				<div class="list-template__searchItem">
+				  <span class="label">巡检点</span>：
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+				    (nzOnSearch)="changePollingInp($event)" nzAllowClear nzPlaceHolder="请选择巡检点" [(ngModel)]="searchDto.nodeId">
+				    <ng-container *ngFor="let option of pollingData">
+				      <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				    </ng-container>
+				    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				    </nz-option>
+				  </nz-select>
+				</div>
+				<div class="list-template__searchItem">
+				  <span class="label width-105">截止时间区间：</span>
+				  <nz-range-picker class="formItem" nzShowTime [(ngModel)]="searchDto.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				</div>
       </div>
       <div nz-col nzLg="8" class="list-template__btns">
         <button nz-button *ngIf="coopBtns.del" [disabled]="!checkedDepIds.length" class="btn default" (click)="showDelModal(data,'您确认要删除选中的巡检任务吗？','删除','delList')">批量删除</button>

src/app/views/inspection-execute/inspection-execute.component.less

@@ -1,13 +1,16 @@
 @import "../../../../src/theme.less";
 
 :host {
-  ::ng-deep .ant-calendar-picker {
-    width: 100% !important;
-  }
+  // ::ng-deep .ant-calendar-picker {
+  //   width: 100% !important;
+  // }
   .list-template__top{
     overflow: visible!important;
   }
 }
+.width-105{
+	width: 105px !important;
+}
 .save {
   position: fixed;
   left: 0;

src/app/views/inspection-execute/inspection-execute.component.ts

@@ -7,6 +7,7 @@ import { ToolService } from "../../services/tool.service";
 import { NzMessageService } from 'ng-zorro-antd';
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
+import { format } from 'date-fns';
 @Component({
   selector: "app-inspection-execute",
   templateUrl: "./inspection-execute.component.html",
@@ -42,6 +43,7 @@ export class InspectionExecuteComponent implements OnInit {
   modelName = ""; //模态框名称
 
   changeInpSubject = new Subject(); //防抖
+	changePollingInpSubject = new Subject(); //防抖
   showDropdown:boolean = false;
 
   ngOnInit() {
@@ -53,13 +55,64 @@ export class InspectionExecuteComponent implements OnInit {
         this.getInspectionBatchs(v[0], v[2]);
       }
     });
+		
+		this.changePollingInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getPollingList(v);
+    });
     this.currentHospital = this.tool.getCurrentHospital();
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getList(1);
     this.getIncidentPlans('search', '');
+		this.getPollingList()
     this.getStatus();
   }
-
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    return;
+	  }
+		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	  this.searchDto.dateRange = [this.startDate,this.endDate]
+	}
+	
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.searchDto.dateRange = [dateStart,dateEnd];
+	  }
+	}
+	
+	// 获取巡检点
+	pollingData:any = [];	
+	getPollingList(name?) {
+	  let data = {
+	    idx: 0,
+	    sum: 20,
+	    inspectionNode: {
+	      hosId: this.currentHospital.id,
+				name
+	    },
+	  };
+	  this.mainService
+	    .getFetchDataList("simple/data", "inspectionNode", data)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      if (data.status == 200) {
+	        this.pollingData = data.list;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
   // 初始化增删改按钮
   coopBtns: any = {};
 
@@ -170,6 +223,8 @@ export class InspectionExecuteComponent implements OnInit {
   reset() {
     this.inspectionBatchSearchList = [];
     this.searchDto = {};
+		this.startDate = undefined,
+		this.endDate = undefined,
     this.getList(1);
   }
 
@@ -191,7 +246,10 @@ export class InspectionExecuteComponent implements OnInit {
         batchId: this.searchDto.batchId || undefined,
         status: this.searchDto.statusId ? { id: this.searchDto.statusId } : undefined,
         exception: this.searchDto.exceptionId === undefined ? undefined : this.searchDto.exceptionId,
-      },
+				overTimeStart: this.startDate || undefined,
+				overTimeEnd: this.endDate || undefined,
+				nodeId: this.searchDto.nodeId || undefined,
+			},
     };
     this.mapOfCheckedId = {};
     this.checkedDepIds = [];
@@ -216,7 +274,12 @@ export class InspectionExecuteComponent implements OnInit {
     this.isLoading = true;
     this.changeInpSubject.next([type, model, e]);
   }
-
+	// 搜索巡检点
+	changePollingInp( e) {
+    this.isLoading = true;
+    this.changePollingInpSubject.next(e);
+  }
+	
   // 获取巡检计划
   inspectionPlanSearchList: any = []; //所有所属科室(搜索)
   getIncidentPlans(type, keyword, init = false) {

src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.component.ts

@@ -183,7 +183,7 @@ export class DistributionUserEvaluateStatisticsComponent implements OnInit, Afte
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/export", "userDegreeTransOrder", postData)
+      .postExportCustom("itsm/exportMergeTitle", "userDegreeTransOrder", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;

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

@@ -4,7 +4,7 @@
       <div nz-col nzXl="18" class="list-template__searchBox">
 				<div class="list-template__searchItem">
 				  <span class="label width-105">登记时间区间：</span>
-				  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
 				</div>
 				<nz-select [(ngModel)]="monthValue" nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="changeMonth($event)">
 					<nz-option nzValue="1" nzLabel="本月"></nz-option>

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

@@ -86,6 +86,17 @@ export class QuestionnaireAnswerComponent implements OnInit {
 	  this.dateRange = [this.startDate,this.endDate]
 	}
 	
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.dateRange = [dateStart,dateEnd];
+	  }
+	}
+	
 	monthValue:any;
 	// 快捷选择 1：本月 2：上月
 	changeMonth(e){
@@ -95,12 +106,16 @@ export class QuestionnaireAnswerComponent implements OnInit {
 			this.startDate = format(lastmonthstartdate, 'yyyy-MM-dd HH:mm:ss');
 			this.endDate = format(lastmonthenddate, 'yyyy-MM-dd HH:mm:ss');
 			this.dateRange = [this.startDate,this.endDate]
-		}else{
+		}else if(e==1){
 			let thismonthstartdate = this.dateService.date().thisMonthStartDate;
 			let thismonthenddate = this.dateService.date().thisMonthEndDate;
 			this.startDate = format(thismonthstartdate, 'yyyy-MM-dd HH:mm:ss');
 			this.endDate = format(thismonthenddate, 'yyyy-MM-dd HH:mm:ss');
 			this.dateRange = [this.startDate,this.endDate]
+		}else{
+			this.startDate = null;
+			this.endDate = null;
+			this.dateRange = []
 		}
 	}
 	
@@ -109,7 +124,8 @@ export class QuestionnaireAnswerComponent implements OnInit {
 		this.pageIndex = 1;
 		this.startDate = null;
 		this.endDate = null;
-		this.dateRange = []
+		this.dateRange = [];
+		this.monthValue = null;
 		this.getList(1);
 	}
 	

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

@@ -22,7 +22,7 @@
           </thead>
           <tbody>
             <tr *ngFor="let data of listOfData;let i = index">
-              <td>{{i+1}}</td>
+							<td>{{i+(pageIndex-1) * pageSize + 1}}</td>
               <td>{{data.title}}</td>
               <td>{{data.surveyTarget?data.surveyTarget.name:'无'}}</td>
               <td>{{data.createTime|date:'yyyy-MM-dd HH:mm'}}</td>

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

@@ -121,7 +121,7 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">收取时间：</span>
-          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
 
       </div>
@@ -159,7 +159,7 @@
           <tr class="thead">
             <th nzWidth="4%">序号</th>
             <th>科室信息</th>
-            <th nzWidth="7%">患者姓名</th>
+            <th nzWidth="7%">患者信息</th>
             <th>标本信息</th>
             <th>采集信息</th>
             <th nzWidth="8%">标本类型</th>
@@ -177,7 +177,12 @@
 							<div>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</div>
 							<div>{{ data.checkDept ? data.checkDept.dept : "-" }}</div>
 						</td>
-            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+            <td>
+							<div>{{data.residenceNo}}</div>
+							<div>
+								{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span>
+							</div>
+						</td>
             <td>
 							<div>{{ data.scode || "-" }}</div>
 							<div>{{ data.specimenDesc || "-" }}</div>

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

@@ -770,6 +770,10 @@
           <div class="turnoff">
             <label nz-checkbox [(ngModel)]="carryingCourses[indexs].handoverSwitch">是否必填交接人信息</label>
           </div>
+					<!-- 是否支持多院区 -->
+					<!-- <div class="turnoff" *ngIf="departmentStrategy.idv=='20047__3' || departmentStrategy.idv=='20048__4'">
+					  <label nz-checkbox [(ngModel)]="carryingCourses[indexs].multipleHospital">是否支持多院区</label>
+					</div> -->
           <!-- 是否支持拍照签到 -->
           <div class="turnoff" *ngIf="currentChoice.associationType.value == 'other'&&indexs==0">
             <label nz-checkbox [nzDisabled]="carryingCourses[indexs].actionsSwitch == 1" [(ngModel)]="carryingCourses[indexs].photoSwitch">是否支持拍照签到</label>

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

@@ -2310,8 +2310,8 @@ export class TaskTypeManagementComponent implements OnInit {
     this.dept_types = true;
   }
   //默认科室选择
+	selectValue:boolean = false;
   depa(data, e, doing?): void {
-    console.log(e, "-----------------------1111");
     let arr = e.split("__");
     if (doing === "clear") {
       if(e){
@@ -2324,6 +2324,7 @@ export class TaskTypeManagementComponent implements OnInit {
         data.value = null;
       }
     }
+		console.log(999999, data.idv);
     let value = arr[1];
     if (value) {
       if (value == "2") {

src/app/views/users-management/users-management.component.html

@@ -264,8 +264,8 @@
 </app-dialog-delete>
 
 <!-- 恢复账号 -->
-<app-dialog-delete [delModal]="recoverModal" (hideDelModalEvent)="hideRecoverModal()" [btnLoading]="recoverLoading"
-  (confirmDelEvent)="confirmRecover()" content="您确认恢复此用户吗？" confirmTxt="是" cancelTxt="否">
+<app-dialog-delete [delModal]="recoverModal" [btnLoading]="recoverLoading"
+  (confirmDelEvent)="confirmRecover()" (cancelDelEvent)="hideRecoverModal()" content="您确认恢复此用户吗？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
 
 <!-- 重置密码模态框 -->