护士端手术清洁

src/app/share/dialog-delete/dialog-delete.component.html

@@ -6,6 +6,9 @@
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
       <div class="defeat" [innerHTML]="content | htmlTransform"></div>
       <div class="tips red" *ngIf="tips">（{{tips}}）</div>
+      <div *ngIf="isChecked">
+        <label nz-checkbox [(ngModel)]="isRemandClean" [ngModelOptions]="{ standalone: true }">是否同步建立手术清洁任务工单</label>
+      </div>
     </div>
     <div class="operate">
       <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">{{confirmTxt}}</button>

src/app/share/dialog-delete/dialog-delete.component.ts

@@ -16,8 +16,11 @@ export class DialogDeleteComponent implements OnInit {
   @Input() tips: string = "";
   @Input() confirmTxt: string = "确定";
   @Input() cancelTxt: string = "取消";
+  @Input() isChecked: boolean = false;
   constructor() {}
 
+  isRemandClean:boolean = true;
+
   ngOnInit() {}
   // 隐藏
   hideDelModal(e: string) {
@@ -25,7 +28,7 @@ export class DialogDeleteComponent implements OnInit {
   }
   // 确认删除
   confirmDel() {
-    this.confirmDelEvent.emit();
+    this.confirmDelEvent.emit(this.isChecked ? this.isRemandClean : false);
   }
   cancel(type: string) {
     if (type == "cancel") {

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

@@ -3700,8 +3700,8 @@
 
 <!-- 手术中患者-送回病房 -->
 <app-dialog-delete [delModal]="sendWardModal" (hideDelModalEvent)="hideSendWardModal()" [btnLoading]="sLoading1"
-(confirmDelEvent)="confirmSendWard()" [content]="sendWardInfo"></app-dialog-delete>
+(confirmDelEvent)="confirmSendWard($event)" [content]="sendWardInfo" [isChecked]="true"></app-dialog-delete>
 
 <!-- 手术中患者-送回苏醒区 -->
 <app-dialog-delete [delModal]="sendAwakeningRoomModal" (hideDelModalEvent)="hideSendAwakeningRoomModal()" [btnLoading]="sLoading2"
-(confirmDelEvent)="confirmSendAwakeningRoom()" [content]="sendAwakeningRoomInfo"></app-dialog-delete>
+(confirmDelEvent)="confirmSendAwakeningRoom($event)" [content]="sendAwakeningRoomInfo" [isChecked]="true"></app-dialog-delete>

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

@@ -1525,7 +1525,7 @@ export class HushijiandanComponent implements OnInit {
   }
   // 确认
   sLoading1 = false;
-  confirmSendWard() {
+  confirmSendWard(isRemandClean) {
     console.log(this.sendWardItem);
     this.sLoading1 = true;
     this.mainService
@@ -1534,7 +1534,8 @@ export class HushijiandanComponent implements OnInit {
         surgeryId: this.sendWardItem.id,
         orderId: this.sendWardItem.gdid,
         configId: this.surgeryConfigs.id,
-        remandType: 'clinical'
+        remandType: 'clinical',
+        remandClean: isRemandClean ? 1 : 0,
       })
       .subscribe((result:any) => {
         this.sLoading1 = false;
@@ -1554,7 +1555,7 @@ export class HushijiandanComponent implements OnInit {
     e.stopPropagation();
     this.sendWardModal = true;
     this.sendWardItem = item;
-    this.sendWardInfo = `您确认送回病房吗？`
+    this.sendWardInfo = `您是否确认将<span style="color:red;">${item.patientDTO ? item.patientDTO.patientName : ''}</span>患者送往<span style="color:red;">${item.areaDeptDTO ? (this.deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : ''}</span>科室吗？`
   }
   sendAwakeningRoomModal: boolean = false; //模态框
   sendAwakeningRoomInfo:string = '';
@@ -1564,7 +1565,7 @@ export class HushijiandanComponent implements OnInit {
   }
   // 确认
   sLoading2 = false;
-  confirmSendAwakeningRoom() {
+  confirmSendAwakeningRoom(isRemandClean) {
     console.log(this.sendAwakeningRoomItem);
     this.sLoading2 = true;
     this.mainService
@@ -1573,7 +1574,8 @@ export class HushijiandanComponent implements OnInit {
         surgeryId: this.sendAwakeningRoomItem.id,
         orderId: this.sendAwakeningRoomItem.gdid,
         configId: this.surgeryConfigs.id,
-        remandType: 'recovery'
+        remandType: 'recovery',
+        remandClean: isRemandClean ? 1 : 0,
       })
       .subscribe((result:any) => {
         this.sLoading2 = false;
@@ -1593,7 +1595,7 @@ export class HushijiandanComponent implements OnInit {
     e.stopPropagation();
     this.sendAwakeningRoomModal = true;
     this.sendAwakeningRoomItem = item;
-    this.sendAwakeningRoomInfo = `您确认送回苏醒区吗？`
+    this.sendAwakeningRoomInfo = `您是否确定将<span style="color:red;">${item.patientDTO ? item.patientDTO.patientName : ''}</span>患者送往<span style="color:red;">${this.surgeryConfigs.recoveryDeptDTO ? (this.deptDisplay == 2 ? this.surgeryConfigs.recoveryDeptDTO.deptalias : this.surgeryConfigs.recoveryDeptDTO.dept) : ''}</span>科室吗？`
   }
 
   // 患者信息一键建单

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

@@ -15,8 +15,8 @@
         <div class="display_flex align-items_center mb8">
           <nz-form-label class="label" nzRequired>接手术关联任务类型</nz-form-label>
           <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择接手术关联任务类型" [(ngModel)]="tasktypeId">
-            <ng-container *ngFor="let option of taskTypes">
+            (nzOnSearch)="changeTasktype($event, 1)" nzPlaceHolder="请选择接手术关联任务类型" [(ngModel)]="tasktypeId">
+            <ng-container *ngFor="let option of taskTypes1">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -24,12 +24,25 @@
             </nz-option>
           </nz-select>
         </div>
+        <!-- 苏醒室科室 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label" nzRequired>苏醒室科室</nz-form-label>
+          <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeRecoveryDepts($event)" nzPlaceHolder="请选择接苏醒室科室" [(ngModel)]="recoveryDeptId">
+            <ng-container *ngFor="let option of recoveryDepts">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [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="display_flex align-items_center mb8">
           <nz-form-label class="label">是否开通送回病房</nz-form-label>
           <nz-checkbox-group [(ngModel)]="autoSendWard" (ngModelChange)="changeAutoSendWard($event)"></nz-checkbox-group>
           <nz-select *ngIf="autoSendWard[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择送回病房任务类型" [(ngModel)]="tasktype1Id">
-            <ng-container *ngFor="let option of taskTypes">
+            (nzOnSearch)="changeTasktype($event, 1)" nzPlaceHolder="请选择送回病房任务类型" [(ngModel)]="tasktype1Id">
+            <ng-container *ngFor="let option of taskTypes1">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -41,8 +54,21 @@
           <nz-form-label class="label">是否开通送回苏醒室</nz-form-label>
           <nz-checkbox-group [(ngModel)]="autoSendAwakeningRoom" (ngModelChange)="changeAutoSendAwakeningRoom($event)"></nz-checkbox-group>
           <nz-select *ngIf="autoSendAwakeningRoom[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择送回苏醒室任务类型" [(ngModel)]="tasktype2Id">
-            <ng-container *ngFor="let option of taskTypes">
+            (nzOnSearch)="changeTasktype($event, 1)" nzPlaceHolder="请选择送回苏醒室任务类型" [(ngModel)]="tasktype2Id">
+            <ng-container *ngFor="let option of taskTypes1">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [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="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否开通关联手术清洁建单</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="autoRemandClean" (ngModelChange)="changeAutoRemandClean($event)"></nz-checkbox-group>
+          <nz-select *ngIf="autoRemandClean[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeTasktype($event, 2)" nzPlaceHolder="请选择送回苏醒室任务类型" [(ngModel)]="cleanTypeId">
+            <ng-container *ngFor="let option of taskTypes2">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

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

@@ -19,7 +19,11 @@ export class OperationConfigComponent implements OnInit {
   hosId = this.tool.getCurrentHospital().id; //当前院区
   // 接手术关联任务类型
   tasktypeId:any;
-  taskTypes:any[] = [];
+  taskTypes1:any[] = [];
+  taskTypes2:any[] = [];
+  // 苏醒室科室
+  recoveryDeptId:any;
+  recoveryDepts:any[] = [];
   // 自动建单
   autoCreateOrders:any[] = [
     {label:'是否开启',value: 0}
@@ -32,10 +36,15 @@ export class OperationConfigComponent implements OnInit {
   autoSendAwakeningRoom:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否开通关联手术清洁建单
+  autoRemandClean:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 建单时间
   autoTime:Date | null = null;
   tasktype1Id:any;
   tasktype2Id:any;
+  cleanTypeId:any;
   // 配置
   configs:any = {};
   searchTimerSubject = new Subject();
@@ -45,9 +54,10 @@ export class OperationConfigComponent implements OnInit {
     // todo
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
-      fun.call(this, v[1]);
+      fun.call(this, v[1], v[2], v[3]);
     });
-    this.getTaskTypes('', true);
+    this.getTaskTypes('', true, 1);
+    this.getTaskTypes('', false, 2);
   }
 
   // 切换tab
@@ -72,7 +82,7 @@ export class OperationConfigComponent implements OnInit {
     }
   }
 
-  // 修改是否是否开通送回苏醒室
+  // 修改是否开通送回苏醒室
   changeAutoSendAwakeningRoom(e){
     console.log(e);
     if(!e[0].checked){
@@ -81,12 +91,25 @@ export class OperationConfigComponent implements OnInit {
     }
   }
 
+  // 修改是否开通关联手术清洁建单
+  changeAutoRemandClean(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.cleanTypeId = null;
+    }
+  }
+
   // 保存
   submitForm() {
     if(!this.tasktypeId){
       this.msg.create("warning", "请选择接手术关联任务类型！");
       return;
     }
+    if(!this.recoveryDeptId){
+      this.msg.create("warning", "请选择苏醒室科室！");
+      return;
+    }
     if(this.autoCreateOrders[0].checked && !this.autoTime){
       this.msg.create("warning", "请选择建单时间！");
       return;
@@ -99,9 +122,14 @@ export class OperationConfigComponent implements OnInit {
       this.msg.create("warning", "请选择送回苏醒室任务类型！");
       return;
     }
+    if(this.autoRemandClean[0].checked && !this.cleanTypeId){
+      this.msg.create("warning", "请选择手术清洁任务类型！");
+      return;
+    }
     let editData:any = {
       hosId: this.hosId,
       taskType: this.tasktypeId || undefined,
+      recoveryDeptId: this.recoveryDeptId || undefined,
       ordinaryField: this.surgeryField,
       autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
       createTime: this.autoTime ? format(startOfMinute(this.autoTime), "yyyy-MM-dd HH:mm:ss") : undefined,
@@ -109,6 +137,8 @@ export class OperationConfigComponent implements OnInit {
       clinicalTypeId: this.tasktype1Id || undefined,
       remandRecovery: this.autoSendAwakeningRoom[0].checked ? 1 : 0,
       recoveryTypeId: this.tasktype2Id || undefined,
+      remandClean: this.autoRemandClean[0].checked ? 1 : 0,
+      cleanTypeId: this.cleanTypeId || undefined,
     };
     let postData = Object.assign({}, this.configs, editData);
     console.log(postData);
@@ -125,41 +155,83 @@ export class OperationConfigComponent implements OnInit {
 
   // 用户输入搜索任务类型
   isLoading: boolean = false;
-  changeTasktype(e) {
-    this.searchTimer(this.getTaskTypes, e);
+  changeTasktype(e, type) {
+    this.searchTimer(this.getTaskTypes, e, false, type);
+  }
+
+  changeRecoveryDepts(e) {
+    this.searchTimer(this.getRecoveryDepts, e, false);
   }
 
   // 边输入边搜索节流阀
-  searchTimer(fun, e) {
+  searchTimer(fun, e, isFirst, type?) {
     this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
+    this.searchTimerSubject.next([fun, e, isFirst, type]);
   }
 
   //获取接手术关联任务类型
-  getTaskTypes(e:string = '', isFirst:boolean = false) {
-    this.loading = true;
-    let postData = {
+  // 1 患者其他服务
+  // 2 其他临床服务
+  getTaskTypes(e:string = '', isFirst:boolean = false, type:number = 1) {
+    isFirst && (this.loading = true);
+    let postData:any = {
       idx: 0,
-      sum: 1000,
+      sum: 9999,
       taskType: {
         taskName: e,
         simpleQuery: true,
         hosId: {
           id: this.hosId
-        },
-        associationType: {
-          key: 'association_types',
-          value: 'patientTransport'
         }
       }
     };
+    if(type === 1){
+      postData.taskType.associationType = {
+        key: 'association_types',
+        value: 'patientTransport'
+      }
+    }else if(type === 2){
+      postData.taskType.associationType = {
+        key: 'association_types',
+        value: 'other'
+      }
+    }
     this.isLoading = true;
     this.mainService
       .getFetchDataList("simple/data", "taskType", postData)
       .subscribe((result) => {
         this.isLoading = false;
         if (result.status == 200) {
-          this.taskTypes = result.list || [];
+          if(type === 1){
+            this.taskTypes1 = result.list || [];
+          }else if(type === 2){
+            this.taskTypes2 = result.list || [];
+          }
+          isFirst && this.getRecoveryDepts('', true);
+        }
+      });
+  }
+
+  //获取所有科室
+  getRecoveryDepts(e:string = '', isFirst:boolean = false) {
+    isFirst && (this.loading = true);
+    let postData = {
+      idx: 0,
+      sum: 10,
+      department: {
+        dept: e,
+        hospital: {
+          id: this.hosId
+        },
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.recoveryDepts = result.list || [];
           isFirst && this.getConfig();
         }
       });
@@ -187,12 +259,21 @@ export class OperationConfigComponent implements OnInit {
               if (result.status == 200) {
                 this.configs = result.list[0] || {};
                 this.tasktypeId = this.configs.taskTypeDTO ? this.configs.taskTypeDTO.id : null;
+                this.recoveryDeptId = this.configs.recoveryDeptId || null;
+                if(this.recoveryDeptId && this.configs.recoveryDeptDTO){
+                  let isInRecoveryDepts = this.recoveryDepts.some(v => v.id == this.recoveryDeptId);
+                  if(!isInRecoveryDepts){
+                    this.recoveryDepts.unshift(this.configs.recoveryDeptDTO);
+                  }
+                }
                 this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
                 this.autoTime = this.configs.createTime ? new Date(this.configs.createTime) : null;
                 this.autoSendWard[0].checked = this.configs.remandClinical == 1;
                 this.tasktype1Id = this.configs.clinicalTypeId || null;
                 this.autoSendAwakeningRoom[0].checked = this.configs.remandRecovery == 1;
                 this.tasktype2Id = this.configs.recoveryTypeId || null;
+                this.autoRemandClean[0].checked = this.configs.remandClean == 1;
+                this.cleanTypeId = this.configs.cleanTypeId || null;
               }
             });
         }else{