手术送回病房和送回急救间

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/services/main.service.ts

@@ -684,4 +684,14 @@ export class MainService {
       }
     );
   }
+  //手动创建手术工单-送回病房
+  createRemandOrder(data) {
+    return this.http.post(
+      host.host + "/transflow/createRemandOrder",
+      data,
+      {
+        headers: this.headers,
+      }
+    );
+  }
 }

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

@@ -638,8 +638,8 @@
                         nzSpan="8"
                         class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
                       >
-                        <button *ngIf="surgeryWKOMsg.patientDTO" [nzLoading]="sLoading1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
-                        <button *ngIf="surgeryWKOMsg.patientDTO" [nzLoading]="sLoading2" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
+                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
+                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
                       </div>
                       <div nz-col nzSpan="16" class="h100p">
                         <div class="txtC h50p borderB">

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

@@ -160,6 +160,7 @@ export class HushijiandanComponent implements OnInit {
     this.getCloseTimeFlag();
     this.currentDept = this.tool.getCurrentUserDept();
     console.log(this.currentDept, this.tabSearchCont);
+    this.currentDept.typeValue == 'surgery' && this.getSurgeryConfig();
     this.getSpecimenButton();
     //防抖
     this.searchTabInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -748,7 +749,6 @@ export class HushijiandanComponent implements OnInit {
     if(this.currentDept.typeValue != 'surgery'){
       return;
     }
-    let that = this;
     let postData = {
       idx: 0,
       sum: 1,
@@ -764,7 +764,7 @@ export class HushijiandanComponent implements OnInit {
       }
     }
     this.surgeryLoading = true;
-    that.mainService
+    this.mainService
       .getFetchDataList("simple/data", "surgery", postData)
       .subscribe((data) => {
         this.surgeryLoading = false;
@@ -772,6 +772,34 @@ export class HushijiandanComponent implements OnInit {
       });
   }
 
+  // 获取手术配置信息
+  surgeryField = null; //手术关联业务
+  surgeryConfigs:any = {};
+  getSurgeryConfig() {
+    this.mainService
+      .getDictionary("list", "ordinary_field")
+      .subscribe((data) => {
+        this.surgeryField = data.find(v => v.value == 'surgery');
+        if(this.surgeryField){
+          let postData = {
+            idx: 0,
+            sum: 10,
+            taskTypeConfig: {
+              hosId: this.currentHospital.id,
+              ordinaryField: this.surgeryField
+            }
+          };
+          this.mainService
+            .getFetchDataList("simple/data", "taskTypeConfig", postData)
+            .subscribe((result) => {
+              if (result.status == 200) {
+                this.surgeryConfigs = result.list[0] || {};
+              }
+            });
+        }
+      });
+  }
+
   // 药品静配提示信息
   drugJpLoading = false;
   getJpDrugsWKOMsg() {
@@ -1498,19 +1526,15 @@ export class HushijiandanComponent implements OnInit {
   // 确认
   sLoading1 = false;
   confirmSendWard() {
-    alert('暂无接口');
-    return;
     console.log(this.sendWardItem);
     this.sLoading1 = true;
     this.mainService
-      .createOrTakeOrder({
+      .createRemandOrder({
         type: 'surgery',
-        id: this.sendWardItem.id,
-        workOrder: {
-          sourceld: 2,
-          createDept: this.loginUser.dept.id,
-          platform: 2
-        }
+        surgeryId: this.sendWardItem.id,
+        orderId: this.sendWardItem.gdid,
+        configId: this.surgeryConfigs.id,
+        remandType: 'clinical'
       })
       .subscribe((result:any) => {
         this.sLoading1 = false;
@@ -1541,19 +1565,15 @@ export class HushijiandanComponent implements OnInit {
   // 确认
   sLoading2 = false;
   confirmSendAwakeningRoom() {
-    alert('暂无接口');
-    return;
     console.log(this.sendAwakeningRoomItem);
     this.sLoading2 = true;
     this.mainService
-      .createOrTakeOrder({
+      .createRemandOrder({
         type: 'surgery',
-        id: this.sendAwakeningRoomItem.id,
-        workOrder: {
-          sourceld: 2,
-          createDept: this.loginUser.dept.id,
-          platform: 2
-        }
+        surgeryId: this.sendAwakeningRoomItem.id,
+        orderId: this.sendAwakeningRoomItem.gdid,
+        configId: this.surgeryConfigs.id,
+        remandType: 'recovery'
       })
       .subscribe((result:any) => {
         this.sLoading2 = false;

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

@@ -12,7 +12,7 @@
       <!-- 特性配置 -->
       <div *ngIf="tabModalName=='characteristics'">
         <!-- 接手术关联任务类型 -->
-        <div class="display_flex align-items_center">
+        <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">
@@ -24,6 +24,32 @@
             </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">
+              <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)]="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">
+              <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>
       <!-- 自动建单配置 -->
       <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -24,8 +24,18 @@ export class OperationConfigComponent implements OnInit {
   autoCreateOrders:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否开通送回病房
+  autoSendWard:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通送回苏醒室
+  autoSendAwakeningRoom:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 建单时间
   autoTime:Date | null = null;
+  tasktype1Id:any;
+  tasktype2Id:any;
   // 配置
   configs:any = {};
   searchTimerSubject = new Subject();
@@ -53,6 +63,24 @@ export class OperationConfigComponent implements OnInit {
     }
   }
 
+  // 修改是否开通送回病房
+  changeAutoSendWard(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.tasktype1Id = null;
+    }
+  }
+
+  // 修改是否是否开通送回苏醒室
+  changeAutoSendAwakeningRoom(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.tasktype2Id = null;
+    }
+  }
+
   // 保存
   submitForm() {
     if(!this.tasktypeId){
@@ -63,12 +91,24 @@ export class OperationConfigComponent implements OnInit {
       this.msg.create("warning", "请选择建单时间！");
       return;
     }
+    if(this.autoSendWard[0].checked && !this.tasktype1Id){
+      this.msg.create("warning", "请选择送回病房任务类型！");
+      return;
+    }
+    if(this.autoSendAwakeningRoom[0].checked && !this.tasktype2Id){
+      this.msg.create("warning", "请选择送回苏醒室任务类型！");
+      return;
+    }
     let editData:any = {
       hosId: this.hosId,
-      autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
       taskType: this.tasktypeId || 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,
-      ordinaryField: this.surgeryField
+      remandClinical: this.autoSendWard[0].checked ? 1 : 0,
+      clinicalTypeId: this.tasktype1Id || undefined,
+      remandRecovery: this.autoSendAwakeningRoom[0].checked ? 1 : 0,
+      recoveryTypeId: this.tasktype2Id || undefined,
     };
     let postData = Object.assign({}, this.configs, editData);
     console.log(postData);
@@ -149,6 +189,10 @@ export class OperationConfigComponent implements OnInit {
                 this.tasktypeId = this.configs.taskTypeDTO ? this.configs.taskTypeDTO.id : null;
                 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;
               }
             });
         }else{