Merge branch 'master' into develop

src/app/share/pathology-add/pathology-add.component.html

@@ -71,7 +71,7 @@
 						<nz-form-label nzRequired nzFor="project" [nzSm]="4" [nzXs]="24">检验项目</nz-form-label>
 						<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="20" [nzXs]="24">
 							<nz-input-group>
-								<nz-select nzSearch nzMode="multiple" nzShowSearch nzPlaceHolder="请选择检验项目" formControlName="project">
+								<nz-select nzDisabled nzSearch nzMode="multiple" nzShowSearch nzPlaceHolder="请选择检验项目" formControlName="project">
 									<ng-container *ngFor="let option of projectData">
 										<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 									</ng-container>
@@ -448,7 +448,8 @@
 								<div>性别: {{data.patientGender}}</div>
 							</div>
 							<div style="margin-top:10px;">
-								<div>住院号: {{data.residenceNo}}</div>
+								<div *ngIf="data.residenceNo">住院号: {{data.residenceNo}}</div>
+								<div *ngIf="!data.residenceNo">门诊号: {{data.patientNo}}</div>
 							</div>
 							<div style="margin-top:10px;">
 								<div>科室: {{data.patientDept}}</div>
@@ -494,7 +495,8 @@
 					 </div>
 					 <div style="width: 5%;"></div>
 					 <div style="width: 60%;position: relative;left: -5px;">
-						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
+						<div style="display: flex;flex-wrap: nowrap;" *ngIf="data.residenceNo">住院号: {{data.residenceNo}}</div>
+						<div style="display: flex;flex-wrap: nowrap;" *ngIf="!data.residenceNo">门诊号: {{data.patientNo}}</div>
 						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
 						<div style="margin-top:9px;margin-left: 30px;">性别: {{data.patientGender}}</div>
 					 </div>

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

@@ -235,7 +235,8 @@
 								<div>性别: {{data.patientGender}}</div>
 							</div>
 							<div style="margin-top:10px;">
-								<div>住院号: {{data.residenceNo}}</div>
+								<div *ngIf="data.residenceNo">住院号: {{data.residenceNo}}</div>
+								<div *ngIf="!data.residenceNo">门诊号: {{data.patientNo}}</div>
 							</div>
 							<div style="margin-top:10px;">
 								<div>科室: {{data.patientDept}}</div>
@@ -281,7 +282,8 @@
 					 </div>
 					 <div style="width: 5%;"></div>
 					 <div style="width: 60%;position: relative;left: -5px;">
-						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
+						<div style="display: flex;flex-wrap: nowrap;" *ngIf="data.residenceNo">住院号: {{data.residenceNo}}</div>
+						<div style="display: flex;flex-wrap: nowrap;" *ngIf="!data.residenceNo">门诊号: {{data.patientNo}}</div>
 						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
 						<div style="margin-top:9px;margin-left: 30px;">性别: {{data.patientGender}}</div>
 					 </div>

src/app/views/pathology-sample/pathology-sample.component.html

@@ -44,7 +44,7 @@
 					<div class="list list-df">
 						<div class="code">{{item.applyCode ? item.applyCode : '无'}}</div>
 						<div class="form-title">{{item.status?item.status.name:'无'}}</div>
-						<div class="del-class">
+						<div class="del-class" *ngIf="item.status.value < 7">
 							<i (click)="delItem($event,item)" class="icon_transport transport-lajitong specimen-icon"></i>
 						</div>
 					</div>
@@ -107,7 +107,7 @@
 								<nz-form-label nzRequired nzFor="project" [nzSm]="4" [nzXs]="24">检验项目</nz-form-label>
 								<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="20" [nzXs]="24">
 									<nz-input-group>
-										<nz-select nzSearch nzShowSearch nzPlaceHolder="请选择检验项目" formControlName="project">
+										<nz-select nzDisabled nzSearch nzShowSearch nzPlaceHolder="请选择检验项目" formControlName="project">
 											<ng-container *ngFor="let option of projectData">
 												<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 											</ng-container>
@@ -568,7 +568,8 @@
 							<div>性别: {{data.patientGender}}</div>
 						</div>
 						<div style="margin-top:10px;">
-							<div>门诊号: {{data.patientNo}}</div>
+							<div *ngIf="data.residenceNo">住院号: {{data.residenceNo}}</div>
+							<div *ngIf="!data.residenceNo">门诊号: {{data.patientNo}}</div>
 						</div>
 						<div style="margin-top:10px;">
 							<div>科室: {{data.patientDept}}</div>
@@ -614,7 +615,8 @@
 				 </div>
 				 <div style="width: 5%;"></div>
 				 <div style="width: 60%;position: relative;left: -5px;">
-					<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
+					<div style="display: flex;flex-wrap: nowrap;" *ngIf="data.residenceNo">住院号: {{data.residenceNo}}</div>
+					<div style="display: flex;flex-wrap: nowrap;" *ngIf="!data.residenceNo">门诊号: {{data.patientNo}}</div>
 					<div style="margin-top:9px;">患者: {{data.patientName}}</div>
 					<div style="margin-top:9px;margin-left: 30px;">性别: {{data.patientGender}}</div>
 				 </div>