bugfix

src/app/views/fuwutai/fuwutai.component.ts

@@ -2660,7 +2660,7 @@ export class FuwutaiComponent implements OnInit {
     }
   }
   // 点击tab切换
-  tabClick(key, isInit = false) {
+  tabClick(key, isInit = false, patient?) {
     let preCurrentTabIndex = this.currentTabIndex;
     this.currentTabIndex = key;
     this.radioValueQt = null;
@@ -2670,7 +2670,7 @@ export class FuwutaiComponent implements OnInit {
     this.radioValueZyPre = null;
     this.defaultInspectFn();
     if(this.currentTabIndex === '患者转运'){
-      this.getPatientList(this.applyDept, "");
+      this.getPatientList(this.applyDept, "", patient);
     }
     this.startDeptZy = null;
     this.endDeptZy = null;
@@ -2725,7 +2725,11 @@ export class FuwutaiComponent implements OnInit {
   }
   // 获取患者信息
   isLoadingPatient: boolean = false;
-  getPatientList(id, searchWords) {
+  getPatientList(id, searchWords, patient?) {
+    if(patient){
+      this.patientList = [patient];
+      return;
+    }
     let dataObj = { searchWords, deptId: id };
     this.isLoadingPatient = true;
     this.mainService.getPatientList(dataObj).subscribe((result) => {
@@ -2759,9 +2763,10 @@ export class FuwutaiComponent implements OnInit {
           patient.patientname = patient.patientName;
           patient.department && (this.applicationDepartmentList = [patient.department]);
           patient.department && (this.applyDept = patient.department.id);
-          patient.department && this.tabClick('患者转运');
-          patient.department && (this.patientList = [patient]);
+          patient.department && this.tabClick('患者转运', false, patient);
+          // patient.department && (this.patientList = [patient]);
           patient.department && (this.patientZy = patient.patientCode);
+          console.log(this.patientList)
         }else{
           this.msg.warning('未查询到患者');
         }
@@ -4537,8 +4542,8 @@ export class FuwutaiComponent implements OnInit {
     this.startDeptZy = null;
     this.endDeptZy = null;
     // 患者陪检-则参数增加patientCode
-    console.log(this.workTypesArrange[index].value);
-    let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
+    let currentTab = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
+    let taskType = currentTab.value[index];
     let patientCode;
     if(taskType.associationTypeValue === 'inspect'){
       patientCode = this.patientZy;
@@ -5711,7 +5716,8 @@ export class FuwutaiComponent implements OnInit {
     if(this.tabIndex !== undefined && this.currentTasktype && this.currentTasktype.associationType.value === 'inspect'){
       let index = this.tabIndex;
       let value = this.currentTasktype.id;
-      let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
+      let currentTab = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
+      let taskType = currentTab.value[index];
       let patientCode;
       if(taskType.associationTypeValue === 'inspect'){
         patientCode = this.patientZy;

src/app/views/inspection-plan-config/inspection-plan-config.component.html

@@ -2,7 +2,7 @@
   <div class="tagsAndTemplete">
     <div class="tags">
       <i class="icon_transport transport-24gf-tags"></i>
-      <span *ngFor="let tag of tagList" (click)="clickTag(tag)">{{ tag.name }}</span>
+      <span *ngFor="let tag of tagList" (click)="clickTag(tag)" [ngClass]="{active: tag.id === currentTagId}">{{ tag.name }}</span>
     </div>
     <div class="template">
       <button nz-button class="btn default" (click)="showInspectionTemplate()">引入模板</button>

src/app/views/inspection-plan-config/inspection-plan-config.component.less

@@ -25,6 +25,10 @@
         gap: 16px;
         position: relative;
         overflow: hidden;
+        .active{
+          color: @primary-color;
+          font-weight: bold;
+        }
         .transport-24gf-tags{
           width: 64px;
           height: 86px;

src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -265,7 +265,9 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
   }
 
   // 点击标签
+  currentTagId;
   clickTag(tag){
+    this.currentTagId = tag.id;
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;