Merge branch 'master' into develop

src/app/views/hushijiandan/hushijiandan.component.html

@@ -933,7 +933,7 @@
       <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')"
         *ngIf="currentTasktype.associationType.value === 'patientTransport'&&isYyInspect">预约建单</button>
       <button nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis"
-        *ngIf="!isYyInspect">直接建单</button>
+        *ngIf="(!isYyInspect&&currentTasktype.associationType.value === 'inspect'&&linkCheckLisTrue)||(!isYyInspect&&currentTasktype.associationType.value === 'patientTransport')">直接建单</button>
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">取消</button>
     </div>
   </div>