Merge branch 'develop' into lmm

src/app/share/detail-patients/detail-patients.component.html

@@ -23,7 +23,8 @@
           <div nz-col nzSpan="8">陪同情况：{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
           <div nz-col nzSpan="8">预约时间：{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
-          <div nz-col nzSpan="8">是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect'">
+            是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
             特殊情况关闭原因：{{orderInfo.specialCloseReason}}
           </div>

src/app/share/order-detail/order-detail.component.html

@@ -392,7 +392,7 @@
               陪同情况：{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
             <div nz-col nzSpan="6" *ngIf="orderInfo.yyjdTime">
               预约时间：{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
-            <div nz-col nzSpan="6">
+            <div nz-col nzSpan="6" *ngIf="orderInfo.taskType.associationType.value=='inspect'">
               是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">

src/app/views/inspect-type-config/inspect-type-config.component.html

@@ -28,7 +28,7 @@
         <button class="btn default" *ngIf="coopBtns.add&&inspectTypeList.length" nzType="primary" nz-button
           (click)="showFloorModal($event,'add')">新增</button>
         <button class="btn default" *ngIf="coopBtns.del&&inspectTypeList.length" nzType="primary" nz-button
-          (click)="showDelFloorModal($event)" [disabled]="allKeyword.length===0">批量删除</button>
+          (click)="showDelFloorModal($event)" [disabled]="selectedFloor.length===0">批量删除</button>
       </div>
     </div>
     <div class="table" *ngIf="!buildingsLoading">