送回复苏室可选择固定科室或固定科室范围

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.240",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -1,14 +1,25 @@
 <!-- 删除模态框 -->
-<div class="dialog-delete" *ngIf="delModal">
-  <div class="modalBody">
+<div class="dialog-delete" *ngIf="delModal" [ngStyle]="{'z-index': isSelected ? '9' : '9999999'}">
+  <div class="modalBody" [ngStyle]="{'height': isSelected ? 'auto' : '220px'}">
     <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal('x')"></i></div>
     <div class="content">
       <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">
+      <div [hidden]="!isChecked">
         <label nz-checkbox [(ngModel)]="isRemandClean" [ngModelOptions]="{ standalone: true }">是否同步建立手术清洁任务工单</label>
       </div>
+      <div [hidden]="!isSelected" class="mt8 mb8 w100">
+        <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择苏醒室" [(ngModel)]="recoveryRoom">
+          <ng-container *ngFor="let option of isSelectedArr">
+            <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : 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>
     <div class="operate">
       <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">{{confirmTxt}}</button>

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

@@ -1,11 +1,11 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
-
+import { Component, EventEmitter, Input, OnInit, Output, OnChanges, SimpleChanges } from "@angular/core";
+import { NzMessageService } from 'ng-zorro-antd';
 @Component({
   selector: "app-dialog-delete",
   templateUrl: "./dialog-delete.component.html",
   styleUrls: ["./dialog-delete.component.less"],
 })
-export class DialogDeleteComponent implements OnInit {
+export class DialogDeleteComponent implements OnInit, OnChanges {
   @Output() hideDelModalEvent = new EventEmitter<any>();
   @Output() confirmDelEvent = new EventEmitter<any>();
   @Output() cancelDelEvent = new EventEmitter<any>();
@@ -17,19 +17,48 @@ export class DialogDeleteComponent implements OnInit {
   @Input() confirmTxt: string = "确定";
   @Input() cancelTxt: string = "取消";
   @Input() isChecked: boolean = false;
-  constructor() {}
+  @Input() isSelected: boolean = false;
+  @Input() isSelectedArr: any[] = [];
+  @Input() deptDisplay: number = 0;
+  constructor(private message: NzMessageService) {}
 
   isRemandClean:boolean = true;
+  isLoading:boolean = false;
+  recoveryRoom:any = null;
 
   ngOnInit() {}
+
+  ngOnChanges(changes: SimpleChanges){
+    if(changes.isSelected && changes.isSelectedArr){
+      if(changes.isSelectedArr.currentValue.length === 1){
+        this.recoveryRoom = changes.isSelectedArr.currentValue[0].id;
+      }
+    }
+  }
+
   // 隐藏
   hideDelModal(e: string) {
     this.hideDelModalEvent.emit(e);
   }
+
   // 确认删除
   confirmDel() {
-    this.confirmDelEvent.emit(this.isChecked ? this.isRemandClean : false);
+    // 如何送回苏醒室开启，并且未选择苏醒室
+    if(this.isSelected && !this.recoveryRoom){
+      this.message.info('请选择苏醒科室！');
+      return;
+    }
+    let data:any = {};
+    if(this.isChecked){
+      data.isRemandClean = this.isRemandClean;
+    }
+    if(this.isSelected){
+      data.recoveryRoom = this.recoveryRoom;
+    }
+    this.confirmDelEvent.emit(data);
   }
+
+  // 取消|否
   cancel(type: string) {
     if (type == "cancel") {
       //取消

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

@@ -3704,4 +3704,4 @@
 
 <!-- 手术中患者-送回苏醒区 -->
 <app-dialog-delete [delModal]="sendAwakeningRoomModal" (hideDelModalEvent)="hideSendAwakeningRoomModal()" [btnLoading]="sLoading2"
-(confirmDelEvent)="confirmSendAwakeningRoom($event)" [content]="sendAwakeningRoomInfo" [isChecked]="surgeryConfigs && surgeryConfigs.remandClean == 1"></app-dialog-delete>
+(confirmDelEvent)="confirmSendAwakeningRoom($event)" [content]="sendAwakeningRoomInfo" [isChecked]="surgeryConfigs && surgeryConfigs.remandClean == 1" [isSelected]="surgeryCarryingCourse && (surgeryCarryingCourse.departmentStrategy.value == 2 || surgeryCarryingCourse.departmentStrategy.value == 3)" [isSelectedArr]="surgeryCarryingCourseDepts" [deptDisplay]="deptDisplay"></app-dialog-delete>

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

@@ -17,7 +17,7 @@ import http from "../../../assets/js/http";
 import { MainService } from "../../services/main.service";
 import { WebsocketNurseService } from "../../services/websocket-nurse.service";
 
-import { NzMessageService } from "ng-zorro-antd/message";
+import { NzMessageService } from "ng-zorro-antd";
 import { NzNotificationService } from "ng-zorro-antd/notification";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
@@ -107,7 +107,6 @@ export class HushijiandanComponent implements OnInit {
     private fb: FormBuilder,
     public router: Router,
     private mainService: MainService,
-    private msg: NzMessageService,
     private notification: NzNotificationService,
     private webs: WebsocketNurseService,
     private tool: ToolService
@@ -687,7 +686,7 @@ export class HushijiandanComponent implements OnInit {
   initLogin() {
     let that = this;
     if (!localStorage.getItem("user")) {
-      that.msg.error("您的登录已失效，请重新登录！", {
+      that.message.error("您的登录已失效，请重新登录！", {
         nzDuration: 3000,
       });
       setTimeout(() => {
@@ -767,14 +766,18 @@ export class HushijiandanComponent implements OnInit {
     this.mainService
       .getFetchDataList("simple/data", "surgery", postData)
       .subscribe((data) => {
+        data.list = Array.isArray(data.list) ? data.list : [];
         this.surgeryLoading = false;
-        this.surgeryWKOMsg = Array.isArray(data.list) ? (data.list[0] ? data.list[0] : {}) : {};
+        this.surgeryWKOMsg = data.list[0] || {};
       });
   }
 
   // 获取手术配置信息
   surgeryField = null; //手术关联业务
   surgeryConfigs:any = {};
+  // 送回苏醒室的运输过程终点科室信息
+  surgeryCarryingCourse:any = null;
+  surgeryCarryingCourseDepts: any[] = [];
   getSurgeryConfig() {
     this.mainService
       .getDictionary("list", "ordinary_field")
@@ -794,6 +797,15 @@ export class HushijiandanComponent implements OnInit {
             .subscribe((result) => {
               if (result.status == 200) {
                 this.surgeryConfigs = result.list[0] || {};
+                // 送回苏醒室开关开启 并且 有对应的任务类型
+                if(this.surgeryConfigs.remandRecovery == 1 && this.surgeryConfigs.recoveryType){
+                  this.surgeryCarryingCourse = this.surgeryConfigs.recoveryType.carryingCourses ? this.surgeryConfigs.recoveryType.carryingCourses.find(v => v.nodeId ? v.nodeId.value == 'finish' : false) : null;
+        
+                  // 运输过程终点科室配置是固定科室或者固定科室范围-苏醒室
+                  if(this.surgeryCarryingCourse && (this.surgeryCarryingCourse.departmentStrategy.value == 2 || this.surgeryCarryingCourse.departmentStrategy.value == 3)){
+                    this.surgeryCarryingCourseDepts = this.surgeryCarryingCourse.departmentDTOS || [];
+                  }
+                }
               }
             });
         }
@@ -1525,7 +1537,7 @@ export class HushijiandanComponent implements OnInit {
   }
   // 确认
   sLoading1 = false;
-  confirmSendWard(isRemandClean) {
+  confirmSendWard(data) {
     console.log(this.sendWardItem);
     this.sLoading1 = true;
     this.mainService
@@ -1535,7 +1547,7 @@ export class HushijiandanComponent implements OnInit {
         orderId: this.sendWardItem.gdid,
         configId: this.surgeryConfigs.id,
         remandType: 'clinical',
-        remandClean: isRemandClean ? 1 : 0,
+        remandClean: data.isRemandClean ? 1 : 0,
       })
       .subscribe((result:any) => {
         this.sLoading1 = false;
@@ -1565,8 +1577,13 @@ export class HushijiandanComponent implements OnInit {
   }
   // 确认
   sLoading2 = false;
-  confirmSendAwakeningRoom(isRemandClean) {
+  confirmSendAwakeningRoom(data) {
     console.log(this.sendAwakeningRoomItem);
+    console.log(this.surgeryConfigs);
+    if(!data.recoveryRoom){
+      this.message.info(`<span class="red">${this.surgeryConfigs.recoveryType.taskName}</span>任务类型-运输过程-终点科室-默认科室配置错误！`);
+      return;
+    }
     this.sLoading2 = true;
     this.mainService
       .createRemandOrder({
@@ -1575,7 +1592,8 @@ export class HushijiandanComponent implements OnInit {
         orderId: this.sendAwakeningRoomItem.gdid,
         configId: this.surgeryConfigs.id,
         remandType: 'recovery',
-        remandClean: isRemandClean ? 1 : 0,
+        remandClean: data.isRemandClean ? 1 : 0,
+        endDept: data.recoveryRoom || undefined,
       })
       .subscribe((result:any) => {
         this.sLoading2 = false;

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

@@ -37,6 +37,7 @@
             </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>
@@ -50,6 +51,7 @@
             </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)]="autoSendAwakeningRoom" (ngModelChange)="changeAutoSendAwakeningRoom($event)"></nz-checkbox-group>
@@ -63,6 +65,7 @@
             </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>

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

@@ -176,7 +176,7 @@ export class OperationConfigComponent implements OnInit {
     isFirst && (this.loading = true);
     let postData:any = {
       idx: 0,
-      sum: 9999,
+      sum: 10,
       taskType: {
         taskName: e,
         simpleQuery: true,
@@ -258,22 +258,58 @@ export class OperationConfigComponent implements OnInit {
               this.loading = false;
               if (result.status == 200) {
                 this.configs = result.list[0] || {};
+
+                // 接手术关联任务类型
                 this.tasktypeId = this.configs.taskTypeDTO ? this.configs.taskTypeDTO.id : null;
+                if(this.tasktypeId && this.configs.taskTypeDTO){
+                  let isInArr = this.taskTypes1.some(v => v.id == this.tasktypeId);
+                  if(!isInArr){
+                    this.taskTypes1.unshift(this.configs.taskTypeDTO);
+                  }
+                }
+
+                // 苏醒室科室
                 this.recoveryDeptId = this.configs.recoveryDeptId || null;
                 if(this.recoveryDeptId && this.configs.recoveryDeptDTO){
-                  let isInRecoveryDepts = this.recoveryDepts.some(v => v.id == this.recoveryDeptId);
-                  if(!isInRecoveryDepts){
+                  let isInArr = this.recoveryDepts.some(v => v.id == this.recoveryDeptId);
+                  if(!isInArr){
                     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;
+                if(this.tasktype1Id && this.configs.clinicalTypeDTO){
+                  let isInArr = this.taskTypes1.some(v => v.id == this.tasktype1Id);
+                  if(!isInArr){
+                    this.taskTypes1.unshift(this.configs.clinicalTypeDTO);
+                  }
+                }
                 this.autoSendAwakeningRoom[0].checked = this.configs.remandRecovery == 1;
+
+                // 送回苏醒室科室
                 this.tasktype2Id = this.configs.recoveryTypeId || null;
+                if(this.tasktype2Id && this.configs.recoveryType){
+                  let isInArr = this.taskTypes1.some(v => v.id == this.tasktype2Id);
+                  if(!isInArr){
+                    this.taskTypes1.unshift(this.configs.recoveryType);
+                  }
+                }
+
                 this.autoRemandClean[0].checked = this.configs.remandClean == 1;
+
+                // 关联手术清洁
                 this.cleanTypeId = this.configs.cleanTypeId || null;
+                if(this.cleanTypeId && this.configs.cleanType){
+                  let isInArr = this.taskTypes2.some(v => v.id == this.cleanTypeId);
+                  if(!isInArr){
+                    this.taskTypes2.unshift(this.configs.cleanType);
+                  }
+                }
               }
             });
         }else{

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

@@ -638,6 +638,7 @@
           <nz-form-label class="label" nzRequired>名称</nz-form-label>
           <input nz-input class="mb8 w100" [(ngModel)]="carryingCourses[indexs].name" placeholder="请选择科室名称" nzSize="" />
           <nz-form-label class="label" nzRequired>默认科室</nz-form-label>
+          <span class="red" *ngIf="(carryingCourses[indexs]?.nodeId?.value == 'finish') && currentChoice?.associationType?.value == 'patientTransport'">（苏醒科室只支持固定科室或固定科室范围）</span>
           <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择默认科室"
             [ngModel]="departmentStrategy.idv" (ngModelChange)="depa(departmentStrategy,$event,'clear')"
             [nzLoading]="yLoading">