Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc into develop

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

@@ -673,12 +673,12 @@ export class TaskTypeManagementComponent implements OnInit {
 
       if (this.allScheduleClass[i].checked) {
         this.scheduleClassChecked.push(this.allScheduleClass[i]);
-        if (data.associationType.value=='specimen') {
+        if (data.associationType.value == "specimen") {
           this.autoClass.push(this.allScheduleClass[i]);
         }
       }
     }
-    if (data.associationType.value=='specimen') {
+    if (data.associationType.value == "specimen") {
       let ids = data.carryingCourses[0].createRuleConfiguration
         ? data.carryingCourses[0].createRuleConfiguration.map(
             (item) => item.classesId
@@ -1555,12 +1555,30 @@ export class TaskTypeManagementComponent implements OnInit {
   getcheckout() {
     var that = this;
     //静配type
-    if (this.association.value == "jPBag") {
-      this.jyfsType = "jPBag_method";
+    if (
+      this.carryingCourses[this.indexs].nodeId.id == 261 &&
+      this.association.value == "jPBag"
+    ) {
+      this.jyfsType = "jPBag_start_method";
+    }
+    if (
+      this.carryingCourses[this.indexs].nodeId.id == 263 &&
+      this.association.value == "jPBag"
+    ) {
+      this.jyfsType = "jPBag_end_method";
     }
     //药品type
-    if (this.association.value == "drugsBag") {
-      this.jyfsType = "drugsBag_method";
+    if (
+      this.carryingCourses[this.indexs].nodeId.id == 261 &&
+      this.association.value == "drugsBag"
+    ) {
+      this.jyfsType = "drugsBag_start_method";
+    }
+    if (
+      this.carryingCourses[this.indexs].nodeId.id == 263 &&
+      this.association.value == "drugsBag"
+    ) {
+      this.jyfsType = "drugsBag_end_method";
     }
     //标本type
     if (