增加万能交接类型

src/app/views/blood-products-config/blood-products-config-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { BloodProductsConfigComponent } from './blood-products-config.component';
+
+
+const routes: Routes = [
+  { path: '', component: BloodProductsConfigComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class BloodProductsConfigRoutingModule { }

src/app/views/blood-products-config/blood-products-config.component.html

@@ -0,0 +1,58 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <div class="list" *ngIf="!loading">
+      <!-- 特性配置 -->
+      <div *ngIf="tabModalName=='characteristics'">
+        <!-- 交接方式 -->
+        <div class="display_flex align-items_center">
+          <nz-form-label class="label" nzRequired>交接方式</nz-form-label>
+          <nz-select class="w320px" nzPlaceHolder="请选择交接方式" [(ngModel)]="handoverMode">
+            <nz-option *ngFor="let handoverMode of handoverModes" [nzLabel]="handoverMode.name" [nzValue]="handoverMode.id"></nz-option>
+          </nz-select>
+        </div>
+        <!-- 核对方式 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+          <nz-checkbox-group class="w320px" [(ngModel)]="checkModes"></nz-checkbox-group>
+        </div>
+        <!-- 签到方式 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">签到方式</nz-form-label>
+          <nz-checkbox-group class="w320px" [(ngModel)]="checkInModes"></nz-checkbox-group>
+        </div>
+        <!-- 自动关单 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">自动关单</nz-form-label>
+          <nz-checkbox-group class="w320px" [(ngModel)]="automaticCustomsOrders"></nz-checkbox-group>
+        </div>
+      </div>
+      <!-- 自动建单配置 -->
+      <div *ngIf="tabModalName=='automaticOrderCreation'">
+        <!-- 自动建单 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">自动建单</nz-form-label>
+          <nz-checkbox-group class="w320px" [(ngModel)]="autoCreateOrders"></nz-checkbox-group>
+        </div>
+      </div>
+      <div class="bottom">
+        <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+      </div>
+    </div>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/views/blood-products-config/blood-products-config.component.ts

@@ -0,0 +1,147 @@
+import { Component, OnInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-blood-products-config",
+  templateUrl: "./blood-products-config.component.html",
+  styleUrls: ["./blood-products-config.component.less"],
+})
+export class BloodProductsConfigComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+  // 交接方式
+  handoverMode:any;
+  handoverModes:any[] = [];
+  // 核对方式
+  checkModes:any[] = [];
+  // 签到方式
+  checkInModes:any[] = [];
+  // 自动关单
+  automaticCustomsOrders:any[] = [];
+  // 自动建单
+  autoCreateOrders:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 配置
+  configs:any = {};
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.getHandoverModes();
+    this.getCheckModes();
+    this.getCheckInModes();
+
+  }
+
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+  // 保存
+  submitForm() {
+    if(!this.handoverMode){
+      this.msg.create("warning", "请选择交接方式！");
+      return;
+    }
+    let checkType = this.checkModes.find(v => v.checked);
+    if(!checkType){
+      this.msg.create("warning", "请选择核对方式！");
+      return;
+    }
+    let signTypeIds = this.checkInModes.filter(v => v.checked).map(v => v.value).toString();
+    let closeTypeIds = this.automaticCustomsOrders.filter(v => v.checked).map(v => v.value).toString();
+    let postData = {
+      id: this.configs.id,
+      taskType: this.configs.taskType,
+      hosId: this.hosId,
+      autoCreate: this.autoCreateOrders[0].checked?1:0,
+      handoverType: {id:this.handoverMode},
+      checkType: {id:checkType.value},
+      signTypeIds: signTypeIds || undefined,
+      closeTypeIds: closeTypeIds || undefined,
+    };
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  //获取交接方式
+  getHandoverModes() {
+    this.mainService.getDictionary("list", "ttconfig_handover_type").subscribe((data) => {
+      this.handoverModes = data;
+      this.handoverMode = data[0].id;
+    });
+  }
+  //获取核对方式
+  getCheckModes() {
+    this.mainService.getDictionary("list", "ttconfig_check_type").subscribe((data) => {
+      this.checkModes = data.map(v => ({label:v.name, value: v.id}));
+    });
+  }
+  //获取签到方式
+  getCheckInModes() {
+    this.loading = true;
+    this.mainService.getDictionary("list", "ttconfig_sign_type").subscribe((data) => {
+      this.checkInModes = data.map(v => ({label:v.name, value: v.id}));
+      this.getAutomaticCustomsOrders();
+    });
+  }
+  //获取自动关单
+  getAutomaticCustomsOrders() {
+    this.mainService.getDictionary("list", "ttconfig_close_type").subscribe((data) => {
+      this.automaticCustomsOrders = data.map(v => ({label:v.name, value: v.id}));
+      this.getConfig();
+    });
+  }
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            value: 'blood'
+          }
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+          this.configs = result.list[0];
+          this.handoverMode = this.configs.handoverType?this.configs.handoverType.id:undefined;
+          this.checkModes = this.configs.checkType?[{label:this.configs.checkType.name, value: this.configs.checkType.id, checked: true}]:[];
+          this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
+
+          if(this.configs.signTypeIds){
+            let ids = this.configs.signTypeIds.split(',');
+            this.checkInModes = this.checkInModes.map(v => ({...v, checked: ids.includes(v.value.toString())}));
+          }
+
+          if(this.configs.closeTypeIds){
+            let ids = this.configs.closeTypeIds.split(',');
+            this.automaticCustomsOrders = this.automaticCustomsOrders.map(v => ({...v, checked: ids.includes(v.value.toString())}));
+          }
+        }
+      });
+  }
+}
+

src/app/views/blood-products-config/blood-products-config.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BloodProductsConfigRoutingModule } from './blood-products-config-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { BloodProductsConfigComponent } from './blood-products-config.component';
+
+
+@NgModule({
+  declarations: [BloodProductsConfigComponent],
+  imports: [
+    CommonModule,
+    BloodProductsConfigRoutingModule,
+    ShareModule
+  ]
+})
+export class BloodProductsConfigModule { }

src/app/views/main/main-routing.module.ts

@@ -92,6 +92,14 @@ const routes: Routes = [
           ),
       },
       {
+        // 血制品页面控制
+        path: "bloodProductsConfig",
+        loadChildren: () =>
+          import("../blood-products-config/blood-products-config.module").then(
+            (m) => m.BloodProductsConfigModule
+          ),
+      },
+      {
         // 工作分配方案列表
         path: "workAssignment",
         loadChildren: () =>

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

@@ -56,6 +56,13 @@
           (ngModelChange)="asso(association)" [nzDisabled]="!add">
           <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
         </nz-select>
+        <ng-container *ngIf="association.id == 20044">
+          <nz-form-label class="label" nzRequired>关联业务</nz-form-label>
+          <!-- 关联业务禁止修改 -->
+          <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联业务" [(ngModel)]="relatedBusiness.id" [nzDisabled]="!add">
+            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allRelatedBusiness"></nz-option>
+          </nz-select>
+        </ng-container>
         <nz-form-label *ngIf="association['id'] == 256" class="label" nzRequired>空单默认科室</nz-form-label>
         <nz-select *ngIf="association['id'] == 256" class="mb8 w100" [ngClass]="{remandTypeId:!defaultNullDeptId}"
           [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeSearchDeptList($event)"
@@ -686,12 +693,13 @@
               </nz-option>
             </nz-select>
           </div>
-
-          <nz-form-label class="label" nzRequired>检验方式</nz-form-label>
-          <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择检验方式" [(ngModel)]="checkoutMethod.id"
-            [nzLoading]="yLoading">
-            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of checkoutData"></nz-option>
-          </nz-select>
+          <ng-container *ngIf="currentChoice.associationType.value != 'ordinary'">
+            <nz-form-label class="label" nzRequired>检验方式</nz-form-label>
+            <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择检验方式" [(ngModel)]="checkoutMethod.id"
+              [nzLoading]="yLoading">
+              <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of checkoutData"></nz-option>
+            </nz-select>
+          </ng-container>
           <!-- 是否必填交接人信息 -->
           <div class="turnoff">
             <label nz-checkbox [(ngModel)]="carryingCourses[indexs].handoverSwitch">是否必填交接人信息</label>

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

@@ -75,6 +75,7 @@ export class TaskTypeManagementComponent implements OnInit {
   //基础信息请求参数
   hosId; //当前院区
   allAssociation: Array<any>; //关联类型
+  allRelatedBusiness: Array<any>; //关联业务
   allTaskType = []; //任务类型列表
   allTaskTypeShow; //任务类型列表选择标识
   allGoods: Array<any>; //携带设备
@@ -85,6 +86,10 @@ export class TaskTypeManagementComponent implements OnInit {
     id: "",
     value: "",
   }; //关联类型
+  relatedBusiness: any = {
+    id: "",
+    value: "",
+  }; //关联业务
   simultaneousNumber; //同时接单数
   carryEquipmentIds; //携带设备
   allowUrgent = "1"; //是否加急
@@ -287,6 +292,7 @@ export class TaskTypeManagementComponent implements OnInit {
 
     this.getAllHospital(); // 获取所有院区
     this.getAllAssociation(); // 获取所有关联类型
+    this.getAllRelatedBusiness(); // 获取所有关联业务
     this.getAllGoods(); //获取携带设备
     this.getAllScheduleClass(); //获取班次列表
     this.getAllTaskType(); //任务类型列表
@@ -409,6 +415,14 @@ export class TaskTypeManagementComponent implements OnInit {
         that.allAssociation = data;
       });
   }
+  // 获取所有关联业务
+  getAllRelatedBusiness() {
+    this.mainService
+      .getDictionary("list", "ordinary_field")
+      .subscribe((data) => {
+        this.allRelatedBusiness = data;
+      });
+  }
   //任务类型列表
   getAllTaskType() {
     let list = {
@@ -555,6 +569,10 @@ export class TaskTypeManagementComponent implements OnInit {
   }
   //类型选择
   asso(data): void {
+    this.relatedBusiness = {
+      id:'',
+      value:''
+    }
     if (data.id == 260 || data.id == 255) {
       this.carryShow = true;
     } else {
@@ -619,6 +637,10 @@ export class TaskTypeManagementComponent implements OnInit {
     this.taskName = data.taskName;
     this.association.id = data.associationType.id + "";
     this.association.value = data.associationType.value;
+    if(data.ordinaryField){
+      this.relatedBusiness.id = data.ordinaryField.id + "";
+      this.relatedBusiness.value = data.ordinaryField.value;
+    }
     if (data.deptIds) {
       this.deptIds = data.deptIds;
     } else {
@@ -906,7 +928,7 @@ export class TaskTypeManagementComponent implements OnInit {
         );
         return;
       }
-      if (this.checkoutMethod.id) {
+      if (this.checkoutMethod.id || this.taskData.taskType.associationType.value == 'ordinary') {
       } else {
         that.showPromptModal(
           that.add ? "新增" : "编辑",
@@ -999,6 +1021,19 @@ export class TaskTypeManagementComponent implements OnInit {
         dept: arr[1],
       };
     }
+    // 万能交接服务
+    if (this.association.id == 20044) {
+      console.log(this.relatedBusiness, this.allRelatedBusiness);
+      if(this.relatedBusiness.id){
+        let relatedBusiness = this.allRelatedBusiness.find(v => v.id == this.relatedBusiness.id);
+        this.taskData.taskType["ordinaryField"] = relatedBusiness;
+      }else{
+        this.showPromptModal(this.add ? "新增" : "编辑", false, "请选择关联业务");
+        return;
+      }
+    }else{
+      delete this.taskData.taskType["ordinaryField"];
+    }
     this.taskData.taskType["specialCloseButton"] = this.specialCloseButton;
     if (this.departmentStrategy.idv) {
       this.taskData.taskType.carryingCourses[this.indexs].departmentStrategy = {
@@ -1181,7 +1216,6 @@ export class TaskTypeManagementComponent implements OnInit {
     this.departmentStrategy.idv = null;
     this.departmentIds = "";
     this.departmentTypeIds = "";
-    this.allAssociation; //关联类型
     this.taskName = ""; //任务名称
     this.association.id = null; //关联类型
     this.getAllGoods(); //获取携带设备
@@ -1621,6 +1655,10 @@ export class TaskTypeManagementComponent implements OnInit {
     if (this.association.value == "patientTransport") {
       this.mrksType = "department_strategy_other";
     }
+    //万能交接服务
+    if (this.association.value == "ordinary") {
+      this.mrksType = "ordinary_strategy";
+    }
 
     return that.mainService.getDictionary("list", this.mrksType);
   }

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.13');
+    console.info('v2.4.14');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)