解决冲突

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

@@ -461,6 +461,13 @@ export class ConfigurationCategoryComponent implements OnInit {
     }
   }
 
+  // 删除
+  deleteType; //删除类型
+  removeCategory(type, data) {
+    this.deleteType = type;
+    this.showDelModal(data,'您确认要删除吗？','删除','delCategory');
+  }
+
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
   submitCategoryForm(): void {
@@ -566,6 +573,21 @@ export class ConfigurationCategoryComponent implements OnInit {
             this.showPromptModal(this.tipsMsg2, false, data.msg);
           }
         });
+    } else if (this.confirmDelType === "delCategory") {
+      //删除-故障现象
+      this.mainService
+        .deleteIncidentCategory({categoryId: this.coopData.id})
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this['activeCategory' + this.deleteType] = {};
+            this.categoryConfigList = [];
+            this.showPromptModal(this.tipsMsg2, true, "", this.deleteType);
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
     } else if (this.confirmDelType === "copy") {
       //向下复制-关联
       let postData:any = {
@@ -793,7 +815,7 @@ export class ConfigurationCategoryComponent implements OnInit {
   ifSuccess: boolean; //操作成功/失败
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //操作提示框是否展示
-  showPromptModal(con, success, promptInfo?) {
+  showPromptModal(con, success, promptInfo?, deleteType?) {
     this.promptModalShow = false;
     this.promptContent = con;
     this.ifSuccess = success;
@@ -815,13 +837,17 @@ export class ConfigurationCategoryComponent implements OnInit {
         }
       }
     }else{
-      if(this.coopType !== 0){
-        this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+      if(deleteType){
+        this.getCategoryList(deleteType, deleteType === 1 ? undefined : this['activeCategory' + (deleteType - 1)].id);
       }else{
-        this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
-      }
-      if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
-        this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
+        if(this.coopType !== 0){
+          this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+        }else{
+          this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
+        }
+        if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
+          this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
+        }
       }
     }
   }

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

@@ -5,6 +5,7 @@
       <div class="contentHead">工时大类
 				<div>
 					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
+          <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="editCategoryModal(1)">编辑</button>
 					<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button>
 				</div>
 			</div>
@@ -17,6 +18,7 @@
       <div class="contentHead">工时小类
 				<div>
 					<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
+          <button nz-button class="mar-rig-10 btn" *ngIf="activeCategory2.id && activeCategory1.id" nzType="primary" nzSize="small" (click)="editCategoryModal(2)">编辑</button>
 					<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button>
 				</div>
 			</div>
@@ -32,11 +34,11 @@
 <!-- 新增-->
 <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalCategory">
   <div class="modalBody">
-    <div class="title">新增<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
+    <div class="title">{{add ? '新增' : '编辑'}}<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
     <div class="content">
       <form nz-form [formGroup]="validateCategoryForm" class="addForm">
-				<nz-form-item *ngIf="coopType === 2">
-				  <nz-form-label [nzSpan]="6" nzFor="workName">大类工时名称</nz-form-label>
+				<nz-form-item *ngIf="coopType === 2 && add">
+				  <nz-form-label [nzSpan]="6" nzFor="workName">工时大类名称</nz-form-label>
 				  <nz-form-control [nzSpan]="18">
 				    <nz-input-group>
 							<div>
@@ -45,6 +47,19 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
+        <nz-form-item *ngIf="coopType === 2 && !add">
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="parent">工时大类</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择工时大类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear formControlName="parent" nzPlaceHolder="请选择工时大类">
+              <ng-container *ngFor="let option of categoryList1">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [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 [nzSpan]="5" nzRequired nzFor="workName">工时名称</nz-form-label>

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

@@ -62,7 +62,7 @@ export class ConfigurationManHourComponent implements OnInit {
     this.getScores();
   }
 
-	
+
 	// 监听单位输入
 	workUnitshow:boolean = false;
 	handleInput(event: KeyboardEvent){
@@ -73,7 +73,7 @@ export class ConfigurationManHourComponent implements OnInit {
 			this.workUnitshow = false
 		}
 	}
-	
+
   // 获取积分
   scoreList: any = [];
   getScores() {
@@ -124,12 +124,12 @@ export class ConfigurationManHourComponent implements OnInit {
         break;
     }
   }
-	
+
 	// 取消删除弹框
 	cancelDel(){
 		this.hideDelModal();
 	}
-	
+
 	// 确认删除
 	confirmDel() {
 	  let that = this;
@@ -156,7 +156,7 @@ export class ConfigurationManHourComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 关闭删除模态框
 	hideDelModal() {
 	  this.delModal = false;
@@ -171,7 +171,7 @@ export class ConfigurationManHourComponent implements OnInit {
   categoryLoading1:boolean = false;
   categoryLoading2:boolean = false;
   categoryLoading3:boolean = false;
-  getCategoryList(type:number, parentId = 0) {
+  getCategoryList(type:number, parentId = 0, isEdit = false, isOnly = false) {
     setTimeout(() => {
       this['categoryLoading' + type] = true;
     }, 0)
@@ -181,6 +181,7 @@ export class ConfigurationManHourComponent implements OnInit {
 			workHourManagement: {
 				hosId: this.hosId,
 				treeLevel: type,
+        quoteOther: 0,
 				parent: type === 1 ? null : { id: parentId }
 			}
     };
@@ -189,6 +190,14 @@ export class ConfigurationManHourComponent implements OnInit {
 		  .subscribe((res) => {
 		    this['categoryLoading' + type] = false;
 		    this['categoryList' + type] = res.list || [];
+        console.log(this['activeCategory' + type])
+        if(isEdit){
+          this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this['activeCategory' + type].id);
+        }
+
+        if(isOnly){
+          this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this.validateCategoryForm.value.parent);
+        }
 		  });
   }
 
@@ -204,7 +213,38 @@ export class ConfigurationManHourComponent implements OnInit {
     this.modalCategory = true;
     this.initCategoryForm();
   }
-	
+  isLoading:boolean = false;
+  // 编辑
+  editCategoryModal(type:number) {
+    this.coopType = type;
+    this.modelName = "编辑";
+    this.add = false; //编辑
+    this.modalCategory = true;
+    this.initCategoryForm();
+    if(type == 1){
+      this.requiredChange('parent', false);
+    }else if(type == 2){
+      this.requiredChange('parent', true);
+    }
+    console.log(this['activeCategory' + type])
+    this.validateCategoryForm.controls.parent.setValue(this['activeCategory' + type].parent ? this['activeCategory' + type].parent.id : null);
+    this.validateCategoryForm.controls.workName.setValue(this['activeCategory' + type].workName);
+    this.validateCategoryForm.controls.workUnit.setValue(this['activeCategory' + type].workUnit);
+    this.validateCategoryForm.controls.wage.setValue(this['activeCategory' + type].wage);
+    this.validateCategoryForm.controls.integral.setValue(this['activeCategory' + type].integral ? this['activeCategory' + type].integral.id : null);
+  }
+
+  requiredChange(field: string, required: boolean): void {
+    if (!required) {
+      this.validateCategoryForm.get(field)!.clearValidators();
+      this.validateCategoryForm.get(field)!.markAsPristine();
+    } else {
+      this.validateCategoryForm.get(field)!.setValidators(Validators.required);
+      this.validateCategoryForm.get(field)!.markAsDirty();
+    }
+    this.validateCategoryForm.get(field)!.updateValueAndValidity();
+  }
+
 	// 删除工时
 	delModal: boolean = false; //删除模态框
 	delContent: string = null; //删除模态框
@@ -217,7 +257,7 @@ export class ConfigurationManHourComponent implements OnInit {
 		this.coopType = type;
 		this.delModal = true
 	}
-	
+
   //关闭新增/编辑弹框
   hideCategoryModal() {
     this.modalCategory = false;
@@ -227,6 +267,7 @@ export class ConfigurationManHourComponent implements OnInit {
   validateCategoryForm: FormGroup; //新增/编辑表单
   initCategoryForm() {
     this.validateCategoryForm = this.fb.group({
+      parent: [null],//工时大类
       workName: [null, [Validators.required]],//名称
 			workUnit: [null, [Validators.required]],//单位
 			wage: [null, [Validators.required]],//工价
@@ -252,25 +293,43 @@ export class ConfigurationManHourComponent implements OnInit {
     console.log(this.validateCategoryForm.value);
     this.btnLoading = true;
     // -----------------------------------
-    let postData:any = {
-			...this.validateCategoryForm.value,
-			integral:{
-				id:this.validateCategoryForm.value.integral
-			},
-			hosId: this.hosId,
-			treeLevel: this.coopType,
-			parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
-    };
-			
+    let postData:any;
+    if(this.add){
+      postData = {
+        workHourManagement: {
+          ...this.validateCategoryForm.value,
+          integral:{
+            id:this.validateCategoryForm.value.integral
+          },
+          hosId: this.hosId,
+          treeLevel: this.coopType,
+          parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+        }
+      }
+    }else{
+      postData = {
+        workHourManagement: {
+          ...this['activeCategory' + this.coopType],
+          ...this.validateCategoryForm.value,
+          integral:{
+            id:this.validateCategoryForm.value.integral
+          },
+          hosId: this.hosId,
+          treeLevel: this.coopType,
+          parent: { id: this.validateCategoryForm.value.parent },
+        }
+      }
+    }
+
 		this.mainService
-			.simplePost("addData", "workHourManagement", postData)
+			.coopData(this.add ? "addData" : "updData", "workHourManagement", postData)
 			.subscribe((data) => {
 				this.btnLoading = false;
 				if (data.status == 200) {
 					this.modalCategory = false
-					this.showPromptModal("新增", true, "");
+					this.showPromptModal(this.add ? "新增" : "编辑", true, "");
 				} else {
-					this.showPromptModal("新增", false, data.msg);
+					this.showPromptModal(this.add ? "新增" : "编辑", false, data.msg);
 				}
 			});
     // -----------------------------------
@@ -290,7 +349,7 @@ export class ConfigurationManHourComponent implements OnInit {
     });
     console.log(this.validateConfigForm.controls)
   }
-	
+
 	// 获取当前选中的故障现象索引
 	get currentCategoryIndex(){
 	  if(this.activeCategory3.id){
@@ -303,7 +362,7 @@ export class ConfigurationManHourComponent implements OnInit {
 	    return 1;
 	  }
 	}
-	
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -317,10 +376,24 @@ export class ConfigurationManHourComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    if(this.coopType !== 0){
-      this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+    if(con === '编辑'){
+      if(success){
+        if(this.coopType === 1){
+          this.getCategoryList(1, 0, true);
+        }else if(this.coopType === 2){
+          this.getCategoryList(1, 0, false, true);
+          this.getCategoryList(2, this.validateCategoryForm.value.parent, true);
+        }
+      }
     }else{
-      this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
+      if(this.coopType !== 0){
+        this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+      }else{
+        this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
+      }
+      if(this.activeCategory2.id || this.activeCategory1.id){
+        this.getCategoryList(this.activeCategory2.id || this.activeCategory1.id);
+      }
     }
   }
 }

src/app/services/main.service.ts

@@ -314,10 +314,10 @@ export class MainService {
     });
   }
   //服务台新建工单—调度台建单获取起点科室或者终点科室列表
-  getdeptList(taskTypeId, patientCode = undefined) {
+  getdeptList(taskTypeId, patientCode?, startTime?, endTime?) {
     return this.http.post(
       host.host + "/ser/getdeptList",
-      { taskTypeId, patientCode: patientCode || undefined },
+      { taskTypeId, patientCode: patientCode || undefined, startTime, endTime },
       { headers: this.headers }
     );
   }
@@ -1060,7 +1060,8 @@ export class MainService {
 	  return this.http.post(host.host + `/user/data/findPhoneDept`, data, {
 	    headers: this.headers,
 	  });
-	}	// 获取细胞学标本
+	}
+  // 获取细胞学标本
 	getCellDictionary(data) {
 	  return this.http.post(host.host + `/common/common/getDictionary`,data, {
 	    headers: this.headers,
@@ -1072,5 +1073,10 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	
+  // 删除故障现象
+	deleteIncidentCategory(data) {
+	  return this.http.post(host.host + `/incident/deleteIncidentCategory`, data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/views/assets-consumable/assets-consumable.component.ts

@@ -84,6 +84,7 @@ export class AssetsConsumableComponent implements OnInit {
       sum: this.pageSize,
       consumable: {
         hosId: this.currentHospital.id,
+        quoteOther: 0,
         ...this.searchDto,
       },
     };

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

@@ -1097,24 +1097,38 @@
                           </nz-form-item>
                         </div>
                         <div nz-col [nzSpan]="24" *ngIf="isTaskTypeInspect && radioValueZy">
-                          <!-- 检查 -->
-                          <nz-form-item>
-                            <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck" style="text-align: left;">关联的检查</nz-form-label>
-                            <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
-                              <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
-                                <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
-                                  <div nz-col nzSpan="24">
-                                    <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
-                                    <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
+                          <div class="pos">
+                            <div class="pos-item" style="left: 90px;top: 7px;">
+                              <span style="font-size: 14px">{{inspectToday| date:'yyyy-MM-dd'}}</span>
+                              <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="previousDayNew()">
+                                上一日
+                              </button>
+                              <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="todayNew()">
+                                今天
+                              </button>
+                              <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="nextDayNew()">
+                                下一日
+                              </button>
+                            </div>
+                            <!-- 检查 -->
+                            <nz-form-item>
+                              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck" style="text-align: left;">关联的检查</nz-form-label>
+                              <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
+                                <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
+                                  <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
+                                    <div nz-col nzSpan="24">
+                                      <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                                      <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
+                                    </div>
                                   </div>
+                                </nz-checkbox-wrapper>
+                                <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
+                                  您选择的检查包含了多个科室，请您只包含一个科室。
                                 </div>
-                              </nz-checkbox-wrapper>
-                              <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
-                                您选择的检查包含了多个科室，请您只包含一个科室。
-                              </div>
-                            </nz-form-control>
-                            <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
-                          </nz-form-item>
+                              </nz-form-control>
+                              <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
+                            </nz-form-item>
+                          </div>
                         </div>
                         <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" [ngStyle]="{ display: (deptZyList['startStatus'] != 201 && !isTaskTypeInspect) ? 'block' : 'none'}">
                           <nz-form-item>

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

@@ -116,6 +116,11 @@
       left: 110px;
       z-index: 9;
     }
+    .pos-btn:focus,.pos-btn:hover{
+      color: rgba(0, 0, 0, 0.65)!important;
+      background-color: #fff!important;
+      border-color: #d9d9d9!important;
+    }
     .ant-form-item-label{
       text-align: left;
     }

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

@@ -21,7 +21,7 @@ import { Subject, forkJoin } from "rxjs";
 import { debounceTime, filter, map } from "rxjs/operators";
 import { SourceId } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
-import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format, addHours } from 'date-fns';
+import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format, addHours, startOfDay, endOfDay } from 'date-fns';
 import { UploadFile } from 'ng-zorro-antd';
 import { HttpRequest, HttpClient, HttpResponse } from '@angular/common/http';
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -166,6 +166,7 @@ export class FuwutaiComponent implements OnInit {
   searchHosDepartmentSubject = new Subject();
   searchHosDepartmentQtSubject = new Subject();
   searchPatientListSubject = new Subject();
+  inspectSubject = new Subject();
 
   // 运维相关
   incidentModel:any = {};
@@ -491,8 +492,8 @@ export class FuwutaiComponent implements OnInit {
           yyTime: yyTime1,
           sourceId: SourceId.fuwutai,
           taskType: { id: this.validateFormZy.controls.taskType.value },
-          startDept: { id: this.deptZyList.data.startDept },
-          endDepts: [{ id: this.deptZyList.data.endDept }],
+          startDept: { id: this.applyDept },
+          // endDepts: [{ id: this.deptZyList.data.endDept }],
           createDept: this.applyDept,
           patient: {
             patientCode: this.validateFormZy.controls.patient.value,
@@ -809,6 +810,9 @@ export class FuwutaiComponent implements OnInit {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchApplicationDepartment(v[0], v[1]);
     });
+    this.inspectSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.refreshInspectList();
+    });
     this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       if(v[0] === 'requester'){
         this.searchApplicationRequester(v[1]);
@@ -2555,6 +2559,7 @@ export class FuwutaiComponent implements OnInit {
     this.isYyInspect = false;
     this.clickYYZyFlag = false;
     this.clickYYFlag = false;
+    this.inspectToday = new Date();
 
     if(!isInit && this.hsmsData.hsmsSwitch){
       if(!this.deathTasktypeId){
@@ -2643,6 +2648,17 @@ export class FuwutaiComponent implements OnInit {
       this.websocketLoading = false;
     }
   }
+  // 患者转运默认陪检
+  defaultInspectFn(){
+    if(this.currentTabIndex === '患者转运'){
+      console.log(this.workTypesArrange);
+      let obj = this.workTypesArrange.find(v => v.key == this.currentTabIndex);
+      let arr = obj.value || [];
+      let index = arr.findIndex(v => v.associationTypeValue === 'inspect');
+      let o = arr.find(v => v.associationTypeValue === 'inspect');
+      o && this.radioChangeZy(o.id, index);
+    }
+  }
   // 点击tab切换
   tabClick(key, isInit = false) {
     let preCurrentTabIndex = this.currentTabIndex;
@@ -2652,6 +2668,10 @@ export class FuwutaiComponent implements OnInit {
     this.endDeptQt = null;
     this.radioValueZy = null;
     this.radioValueZyPre = null;
+    this.defaultInspectFn();
+    if(this.currentTabIndex === '患者转运'){
+      this.getPatientList(this.applyDept, "");
+    }
     this.startDeptZy = null;
     this.endDeptZy = null;
     this.patientZy = null;
@@ -3469,6 +3489,7 @@ export class FuwutaiComponent implements OnInit {
   changeApply(e) {
     console.log(e, this.applicationDepartmentList);
     this.changeApplicationDepartment("&same&");
+    this.defaultInspectFn();
 
     if(this.applyDept && this.currentTabIndex !== '故障报修'){
       this.rightTitle_tab = [
@@ -4536,7 +4557,7 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是204 则让前端自己调用科室搜索接口
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     // 返回值的status是206 则是默认患者所在科室，把患者所在科室作为值
-    this.mainService.getdeptList(value, patientCode).subscribe((data:any) => {
+    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;
       // 预约start
       this.currentTasktype = data.taskType;
@@ -4606,23 +4627,25 @@ export class FuwutaiComponent implements OnInit {
         }
       }
     });
-    // 获取携带设备
-    let arrObj = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
-    let arr = arrObj.value;
-    this.goodsNow = arr.filter(
-      (item) => item.id == value
-    )[0].taskType.carryEquipmentIds;
-    if (this.goodsNow) {
-      this.goodsNow = this.goodsNow.map((item) => {
-        return {
-          label: item.name,
-          value: item.id,
-          checked: false,
-        };
-      });
-    } else {
-      this.goodsNow = [];
-    }
+    setTimeout(() => {
+      // 获取携带设备
+      let arrObj = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
+      let arr = arrObj.value;
+      this.goodsNow = arr.filter(
+        (item) => item.id == value
+      )[0].taskType.carryEquipmentIds;
+      if (this.goodsNow) {
+        this.goodsNow = this.goodsNow.map((item) => {
+          return {
+            label: item.name,
+            value: item.id,
+            checked: false,
+          };
+        });
+      } else {
+        this.goodsNow = [];
+      }
+    }, 0)
   }
   radioChangeQt(value) {
     //任务类型id
@@ -5696,7 +5719,7 @@ export class FuwutaiComponent implements OnInit {
         patientCode = undefined;
       }
 
-      this.mainService.getdeptList(value, patientCode).subscribe((data:any) => {
+      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.linkCheckLis = [];
         if(data.data && Array.isArray(data.data.data) && data.data.data.length) {
           let arr = [];
@@ -5739,4 +5762,44 @@ export class FuwutaiComponent implements OnInit {
       this.noteList = result || [];
     });
   }
+
+  // 关联的检查-上一日，下一日，今天
+  inspectToday:Date = new Date();
+  // 上一日
+  previousDayNew(){
+    this.inspectToday = addDays(this.inspectToday, -1);
+    this.inspectSubject.next();
+  }
+
+  // 今天
+  todayNew(){
+    this.inspectToday = new Date();
+    this.inspectSubject.next();
+  }
+
+  // 下一日
+  nextDayNew(){
+    this.inspectToday = addDays(this.inspectToday, 1);
+    this.inspectSubject.next();
+  }
+
+  refreshInspectList(){
+    this.linkCheckLis = [];
+    this.mainService.getdeptList(this.radioValueZy, this.patientZy, format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss')).subscribe((data:any) => {
+      if (data.data && Array.isArray(data.data.data) && data.data.data.length) {
+        let arr = [];
+        data.data.data.forEach((e) => {
+          arr.push({
+            execDeptId: e.execDept.id,
+            yyTime: e.yyTime,
+            priority: e.priority,
+            label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
+            value: e["id"],
+            checked: false,
+          });
+        });
+        this.linkCheckLis = arr;
+      }
+    });
+  }
 }

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

@@ -1270,6 +1270,7 @@
                             <!-- <button (click)="viewBx(data)">查看</button> -->
                             <button class="btn1 mr8 mb8 mt8" (click)="detailBx(data)">查看</button>
                             <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="delBx(data)" *ngIf="data.state && data.state.value == 'accept'">撤销</button>
                           </td>
                         </tr>
                       </tbody>
@@ -1462,25 +1463,39 @@
             </div>
           </ng-container>
           <ng-container *ngIf="!cLoading">
-            <!-- 检查 -->
-            <nz-form-item *ngIf="checkedShowMsg.status == 200">
-              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
-              <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
-                <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
-                  <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
-                    <div nz-col nzSpan="24">
-                      <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
-                      <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
+            <div class="pos" *ngIf="checkedShowMsg.status == 200">
+              <div class="pos-item" style="left: 110px;top: -4px;">
+                <span style="font-size: 18px">{{inspectToday| date:'yyyy-MM-dd'}}</span>
+                <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="previousDayNew()">
+                  上一日
+                </button>
+                <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="todayNew()">
+                  今天
+                </button>
+                <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="nextDayNew()">
+                  下一日
+                </button>
+              </div>
+              <!-- 检查 -->
+              <nz-form-item>
+                <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
+                <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
+                  <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
+                    <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
+                      <div nz-col nzSpan="24">
+                        <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                        <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
+                      </div>
                     </div>
+                  </nz-checkbox-wrapper>
+                  <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
+                    您选择的检查包含了多个科室，请您只包含一个科室。
                   </div>
-                </nz-checkbox-wrapper>
-                <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
-                  您选择的检查包含了多个科室，请您只包含一个科室。
-                </div>
-              </nz-form-control>
-              <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
-            </nz-form-item>
-            <div class="pos" *ngIf="(currentTasktype.associationType.value === 'patientTransport' && appointmentZyBuildFlag == 1) || (currentTasktype.associationType.value === 'inspect' && appointmentBuildFlag == 1)">
+                </nz-form-control>
+                <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
+              </nz-form-item>
+            </div>
+            <div class="pos" *ngIf="(currentTasktype.associationType.value === 'patientTransport' && appointmentZyBuildFlag == '1') || (currentTasktype.associationType.value === 'inspect' && appointmentBuildFlag == '1')">
               <!-- 需要预约检查 -->
               <nz-form-item class="pos-item">
                 <nz-form-control>
@@ -2313,6 +2328,14 @@
   (confirmDelEvent)="confirmDelAdvice()"
   content="您确认要删除此条意见吗？"
 ></app-dialog-delete>
+<!-- 撤销报修 -->
+<app-dialog-delete
+  [delModal]="delBxModal"
+  (hideDelModalEvent)="hideDelBxModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmDelBx()"
+  content="您确认要删除吗？"
+></app-dialog-delete>
 <!-- 关注模态框 -->
 <div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="commonModal">
   <div class="modalBody">
@@ -2589,8 +2612,7 @@
 		</div>
 		<div class="content">
 			<div class="list-template__bottom">
-				<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
-					[nzLoading]="grossLoading">
+				<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false">
 					<thead>
 						<tr class="thead">
 							<th>申请单类型</th>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -87,6 +87,11 @@
       top: -10px;
       z-index: 9;
     }
+    .pos-btn:focus,.pos-btn:hover{
+      color: rgba(0, 0, 0, 0.65)!important;
+      background-color: #fff!important;
+      border-color: #d9d9d9!important;
+    }
   }
 
   .addRemarks {

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

@@ -33,7 +33,7 @@ import {
   startOfDay,
   endOfDay,
   parse,
-	subHours 
+	subHours
 } from "date-fns";
 import { SourceId } from "src/app/type/types";
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -116,6 +116,7 @@ export class HushijiandanComponent implements OnInit {
   searchAccountSubject = new Subject(); //查工号防抖
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
+  inspectSubject = new Subject();
   isYyInspect = false; //需要预约检查
   inspectAndPatientTransportConfig:any = {timeMod: 30};
   constructor(
@@ -202,6 +203,9 @@ export class HushijiandanComponent implements OnInit {
     this.otherSearchChangeSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getDeptTaskType(v);
     });
+    this.inspectSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.refreshInspectList();
+    });
 
     this.getTodayNum();
     this.initLogin();
@@ -336,7 +340,7 @@ export class HushijiandanComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 新增申请单自选类型
 	applicationType:any;
 	isPathologyVisible:any = false;
@@ -348,18 +352,18 @@ export class HushijiandanComponent implements OnInit {
 			this.submitPathlogyForm()
 		}
 	}
-	
+
 	// 取消新增申请单自选类型
 	handlePathologyCancel(){
 		this.applicationType = null
 		this.isPathologyVisible = false
 	}
-	
+
 	// 确定新增申请单自选类型
 	handlePathologyOk(){
 		this.submitPathlogyForm()
 	}
-	
+
 	// 新增申请单自选类型
 	submitPathlogyForm(){
 		if(this.openType=='btn'){
@@ -387,7 +391,7 @@ export class HushijiandanComponent implements OnInit {
 			this.pathologyModal = true
 		});
 	}
-	
+
 	// 手术排程-病理申请单
 	openType:any;
 	scheduleItem:any;
@@ -463,7 +467,7 @@ export class HushijiandanComponent implements OnInit {
 			this.multiDialog = true
 		});
 	}
-	
+
 	// 获取病理申请单最新数据
 	getPathologyData(){
 		if(this.openType=='btn'){
@@ -501,7 +505,7 @@ export class HushijiandanComponent implements OnInit {
 			}
 		})
 	}
-	
+
 	// 申请单号点击
 	itemClick(item){
 		this.detailId = item.id
@@ -519,7 +523,7 @@ export class HushijiandanComponent implements OnInit {
 			}
 		},200)
 	}
-	
+
 	// 申请单作废
 	cancellationLoading:any = false;
 	cancellationModal:any = false;
@@ -527,7 +531,7 @@ export class HushijiandanComponent implements OnInit {
 		this.coopId = data.id
 		this.cancellationModal = true
 	}
-	
+
 	// 确定作废
 	confirmCancellation(){
 		this.cancellationLoading = true;
@@ -543,12 +547,12 @@ export class HushijiandanComponent implements OnInit {
 			}
 		});
 	}
-	
+
 	// 取消作废
 	cancelCancellation(){
 		this.cancellationModal = false
 	}
-	
+
 	hideModal(){
 		this.multiDialog = false
 	}
@@ -965,6 +969,7 @@ export class HushijiandanComponent implements OnInit {
   detailBx(data){
     this.router.navigateByUrl("nurse/detailBx/" + data.id);
   }
+
   // 查看报修信息弹窗
   bxPromptModalShow = false; //弹窗开关
   bData = ""; //查看详情携带所有数据
@@ -2971,6 +2976,7 @@ export class HushijiandanComponent implements OnInit {
   cLoading = false;
   historyCustomRemarks2 = [];
   changeCheckedType(isInit = false) {
+    isInit && (this.inspectToday = new Date());
     this.customRemarks2 = [];
     this.historyCustomRemarks2 = [];
     this.isYyInspect = false;
@@ -2989,11 +2995,7 @@ export class HushijiandanComponent implements OnInit {
       }
     }
     // 获取患者其他服务，护士端是否预约建单
-    let appointmentZyBuildFlag = this.checkTypeLis.filter(
-      (item) =>
-        item.id == this.patientForm.controls.checkedType.value &&
-        item.associationType.value == "patientTransport"
-    );
+    let appointmentZyBuildFlag = this.checkTypeLis.filter((item) => item.id == this.patientForm.controls.checkedType.value && item.associationType.value == "patientTransport");
     if (appointmentZyBuildFlag.length) {
       this.appointmentZyBuildFlag =
         appointmentZyBuildFlag[0].appointmentOtherSwitch == 1 ? "1" : "0";
@@ -3020,9 +3022,12 @@ export class HushijiandanComponent implements OnInit {
     // 判断这个任务类型是否允许加急 start
     // 判断这个任务类型是否允许加急 end
     let that = this;
+    let isInpect = this.checkTypeLis.some((item) => item.id == this.patientForm.controls.checkedType.value && item.associationType.value == "inspect");
     let postData = {
       taskTypeId: that.patientForm.controls.checkedType.value,
       patientCode: that.patientMsg.patientCode,
+      startTime: isInpect ? format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: isInpect ? format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined,
     };
     this.cLoading = true;
     that.mainService
@@ -3954,7 +3959,7 @@ export class HushijiandanComponent implements OnInit {
         that.adviceListLength = data.totalNum || 0;
       });
   }
-	
+
 	startDate:any = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
 	endDate:any = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
 	scheduleTime: any = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
@@ -3967,7 +3972,7 @@ export class HushijiandanComponent implements OnInit {
 			this.endDate = null
 		}
 	}
-	
+
   // 手术排程信息表格数据
   surgeryList: any = [];
   surgeryPageIndex: number = 1; //表格当前页码
@@ -4334,6 +4339,31 @@ export class HushijiandanComponent implements OnInit {
   hideDelAdviceModal() {
     this.delAdviceModal = false;
   }
+  // 报修撤销模态框
+  delBxModal: boolean = false;
+  delBxData: any; //删除的data
+  delBx(data) {
+    this.delBxData = data;
+    this.delBxModal = true;
+  }
+  confirmDelBx() {
+    this.btnLoading = true;
+    this.mainService
+      .flowPost("incident/task/cancel", { incident: this.delBxData })
+      .subscribe((result) => {
+        if(result.state == 200){
+          this.delBxModal = false;
+          this.showPromptModal("撤销", true, "");
+          this.getBxlb(true);
+        }else{
+          this.delBxModal = false;
+          this.showPromptModal("撤销", false, result.msg);
+        }
+      });
+  }
+  hideDelBxModal() {
+    this.delBxModal = false;
+  }
   // 报修提示框
   reqModal: boolean = false;
   extraData:any = {};
@@ -5098,4 +5128,60 @@ export class HushijiandanComponent implements OnInit {
       this.noteList = result || [];
     });
   }
+
+  // 关联的检查-上一日，下一日，今天
+  inspectToday:Date = new Date();
+  // 上一日
+  previousDayNew(){
+    this.inspectToday = addDays(this.inspectToday, -1);
+    this.inspectSubject.next();
+  }
+
+  // 今天
+  todayNew(){
+    this.inspectToday = new Date();
+    this.inspectSubject.next();
+  }
+
+  // 下一日
+  nextDayNew(){
+    this.inspectToday = addDays(this.inspectToday, 1);
+    this.inspectSubject.next();
+  }
+
+  refreshInspectList(){
+    let postData = {
+      taskTypeId: this.patientForm.controls.checkedType.value,
+      patientCode: this.patientMsg.patientCode,
+      startTime: format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss'),
+      endTime: format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss'),
+    };
+    this.linkCheckLis = [];
+    this.mainService
+      .postCustom("nurse", "workOrder/buildTrip", postData)
+      .subscribe((data) => {
+        // 工单备注配置 end
+        if (data.status == 200 && data.data && data.data.length) {
+          let arr = [];
+          data.data.forEach((e) => {
+            arr.push({
+              execDeptId: e.execDept.id,
+              yyTime: e.yyTime,
+              priority: e.priority,
+              label:
+                (e.yyTime || "") +
+                " " +
+                (this.deptDisplay == 2
+                  ? e.execDept.deptalias
+                  : e.execDept.dept) +
+                " 进行 " +
+                (e.inspectName || "检查"),
+              value: e["id"],
+              checked: false,
+            });
+          });
+          this.linkCheckLis = arr;
+        }
+      });
+  }
 }

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

@@ -157,7 +157,7 @@
         <nz-form-item>
           <nz-form-label [nzSpan]="5" nzFor="levelCategory">故障现象</nz-form-label>
           <nz-form-control [nzSpan]="19" nzErrorTip="请输入故障现象!">
-            <nz-tree-select [nzNodes]="incidentCategoryList" nzPlaceHolder="请选择故障现象" formControlName="levelCategory"></nz-tree-select>
+            <nz-tree-select [nzDropdownStyle]="{ height: '400px'}" [nzNodes]="incidentCategoryList" nzPlaceHolder="请选择故障现象" formControlName="levelCategory"></nz-tree-select>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>

src/app/views/realtime-broadcast/realtime-broadcast.component.ts

@@ -233,7 +233,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
           if(this.config.showOvertime == 1){
             this.incidentList['2handler'].name = '待处理（不含延期处理）';
             this.incidentList['3overtime'] = {
-              name: '延期处理',
+              name: '挂起',
               list: [],
             }
             this.getIncidentList('1pending');
@@ -291,7 +291,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
       list: [],
     },
     // '3overtime': {
-    //   name: '延期处理',
+    //   name: '挂起',
     //   list: [],
     // }
   }