Merge branch 'master' into develop

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

@@ -2653,14 +2653,15 @@ export class FuwutaiComponent implements OnInit {
     if(this.currentTabIndex === '患者转运'){
       console.log(this.workTypesArrange);
       let obj = this.workTypesArrange.find(v => v.key == this.currentTabIndex);
+      let tabIndex = this.workTypesArrange.findIndex(v => v.key == this.currentTabIndex);
       let arr = obj.value || [];
       let index = arr.findIndex(v => v.associationTypeValue === 'inspect');
       let o = arr.find(v => v.associationTypeValue === 'inspect');
-      o && this.radioChangeZy(o.id, index);
+      o && this.radioChangeZy(o.id, tabIndex);
     }
   }
   // 点击tab切换
-  tabClick(key, isInit = false) {
+  tabClick(key, isInit = false, patient?) {
     let preCurrentTabIndex = this.currentTabIndex;
     this.currentTabIndex = key;
     this.radioValueQt = null;
@@ -2670,7 +2671,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 +2726,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 +2764,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('未查询到患者');
         }

src/app/views/inspection-configuration-item/inspection-configuration-item.component.ts

@@ -258,7 +258,8 @@ export class InspectionConfigurationItemComponent implements OnInit, AfterViewIn
     this.validateForm.controls.defaultValueNumber.setValue(null);
     switch(value){
       case 1:
-        this.requiredChange(['required', 'checkType', 'defaultValueNumber', 'valuex', 'valueGap']);
+        // this.requiredChange(['required', 'checkType', 'defaultValueNumber', 'valuex', 'valueGap']);
+        this.requiredChange(['required', 'checkType', 'defaultValueNumber']);
         break;
       case 0:
         this.requiredChange(['required', 'checkType', 'defaultValueNumber', 'valueLow', 'valueUp']);

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;