药品和静配的自动建单

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

@@ -649,11 +649,11 @@
           </nz-select>
           <!-- 静配自动建单 -->
           <div class="turnoff" *ngIf="currentChoice.associationType.value == 'jPBag'&&indexs==0">
-            <label nz-checkbox [(ngModel)]="xxx">根据对接数据自动建单</label>
+            <label nz-checkbox [(ngModel)]="bagOrderSwitch">根据对接数据自动建单</label>
           </div>
           <!-- 药品自动建单 -->
           <div class="turnoff" *ngIf="currentChoice.associationType.value == 'drugsBag'&&indexs==0">
-            <label nz-checkbox [(ngModel)]="yyy">根据对接数据自动建单</label>
+            <label nz-checkbox [(ngModel)]="bagOrderSwitch">根据对接数据自动建单</label>
           </div>
           <div *ngIf="depaShow3">
             <!-- 标本配送才有自动建单，重要！ -->

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

@@ -211,8 +211,7 @@ export class TaskTypeManagementComponent implements OnInit {
   addEndDeptIds: any = []; //自动(手动)建单追加终点科室
   autoAddDeptSwitch: any = false; //自动建单追加终点科室开关
   handAddDeptSwitch: any = false; //手动建单追加终点科室开关
-  xxx: any = false; //根据对接数据自动建单(静配)
-  yyy: any = false; //根据对接数据自动建单(药品)
+  bagOrderSwitch: any = false; //根据对接数据自动建单(静配,药品)
   createRuleConfiguration = []; //自动建单字段
   levelData; //护理级别字段
   specimen_types = false; //标本选择显示隐藏字段
@@ -788,8 +787,8 @@ export class TaskTypeManagementComponent implements OnInit {
       data.carryingCourses[0].autoAddDeptSwitch == 1 ? true : false; //自动建单追加终点科室开关
     this.handAddDeptSwitch =
       data.carryingCourses[0].handAddDeptSwitch == 1 ? true : false; //手动建单追加终点科室开关
-    this.xxx = data.carryingCourses[0].xxx == 1 ? true : false; //根据对接数据自动建单(静配)
-    this.yyy = data.carryingCourses[0].yyy == 1 ? true : false; //根据对接数据自动建单(药品)
+    this.bagOrderSwitch =
+      data.carryingCourses[0].bagOrderSwitch == 1 ? true : false; //根据对接数据自动建单(静配,药品)
     if (data.carryingCourses) {
       if (this.indexs == 2 && this.association.value != "inspect") {
         this.indexs = 1;
@@ -1059,6 +1058,10 @@ export class TaskTypeManagementComponent implements OnInit {
     this.taskData.taskType.remarksSwitch = this.isRemarks === "1" ? 1 : 0; //是否需要备注信息
     this.taskData.taskType.remarksPrompts = this.remarks; //备注信息提示用语
     this.taskData.taskType.customRemarks = this.quickRemarks; //备注快速输入
+    this.taskData.taskType.carryingCourses[0].bagOrderSwitch = this
+      .bagOrderSwitch
+      ? 1
+      : 0; //根据对接数据自动建单(静配,药品)
     if (this.addEndDeptIds.length) {
       this.taskData.taskType.carryingCourses[0].addEndDeptIds =
         this.addEndDeptIds.join(","); //自动(手动)建单追加终点科室
@@ -1070,14 +1073,10 @@ export class TaskTypeManagementComponent implements OnInit {
         .handAddDeptSwitch
         ? 1
         : 0; //手动建单追加终点科室开关
-      this.taskData.taskType.carryingCourses[0].xxx = this.xxx ? 1 : 0; //根据对接数据自动建单(静配)
-      this.taskData.taskType.carryingCourses[0].yyy = this.yyy ? 1 : 0; //根据对接数据自动建单(药品)
     } else {
       this.taskData.taskType.carryingCourses[0].addEndDeptIds = ""; //自动(手动)建单追加终点科室
       this.taskData.taskType.carryingCourses[0].autoAddDeptSwitch = 0; //自动建单追加终点科室开关
       this.taskData.taskType.carryingCourses[0].handAddDeptSwitch = 0; //手动建单追加终点科室开关
-      this.taskData.taskType.carryingCourses[0].xxx = 0; //根据对接数据自动建单(静配)
-      this.taskData.taskType.carryingCourses[0].yyy = 0; //根据对接数据自动建单(药品)
     }
     console.log(this.taskData);
     // return;
@@ -1163,8 +1162,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.addEndDeptIds = []; //自动(手动)建单追加终点科室
     this.autoAddDeptSwitch = false; //自动建单追加终点科室开关
     this.handAddDeptSwitch = false; //手动建单追加终点科室开关
-    this.xxx = false; //根据对接数据自动建单(静配)
-    this.yyy = false; //根据对接数据自动建单(药品)
+    this.bagOrderSwitch = false; //根据对接数据自动建单(静配,药品)
     this.remarks = ""; //提前生效时间，默认20分钟
     this.quickRemarks = ""; //备注快速输入
     this.styleType = false;