修复BUG和修改样式

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

@@ -2619,8 +2619,8 @@
 							<td>{{ data.status?data.status.name:'-'}}</td>
 							<td>
 							  <div class="coop">
-							    <span *ngIf="data.status.value==1 || data.status.value==2 
-									|| data.status.value==3 || data.status.value==4 || 
+							    <span *ngIf="data.status.value==1 || data.status.value==2
+									|| data.status.value==3 || data.status.value==4 ||
 									data.status.value==5" (click)="cancellation(data)">作废</span>
 							  </div>
 							</td>
@@ -2641,16 +2641,16 @@
 </div>
 
 <!-- 作废模态框 -->
-<app-dialog-delete [delModal]="cancellationModal" (hideDelModalEvent)="cancelCancellation()" [btnLoading]="cancellationLoading" 
+<app-dialog-delete [delModal]="cancellationModal" (hideDelModalEvent)="cancelCancellation()" [btnLoading]="cancellationLoading"
   (confirmDelEvent)="confirmCancellation()" (cancelDelEvent)="cancelCancellation()" content="是否作废申请单？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
 
 <!-- 新增申请单提示 -->
 <nz-modal [(nzVisible)]="isPathologyVisible" nzTitle="提示" (nzOnCancel)="handlePathologyCancel()" (nzOnOk)="handlePathologyOk()">
-	<p><span class="red" *ngIf="viewData.length>0">{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）</span>患者已有申请单，如需<span class="red">追加新标本</span>可在<span class="red">原有</span>申请单中<span class="red">添加</span>；您确认要添加新的申请单吗？</p>
-	<p>注意：<span class="red">一个申请单出一个报告，请谨慎添加申请单；</span></p>
+	<p style="font-size: 20px;"><span class="red" *ngIf="viewData.length>0">{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）</span>患者已有申请单，如需<span class="red">追加新标本</span>可在<span class="red">原有</span>申请单中<span class="red">添加</span>。</p>
+	<p style="font-size: 20px;">注意：<span class="red">一张纸质申请单对应一条申请单数据，请谨慎添加申请单！</span></p>
 </nz-modal>
-		
+
 <!-- 修改密码 -->
 <nz-modal [(nzVisible)]="isPwdVisible" nzTitle="修改密码" (nzOnCancel)="pwdHandleCancel()" (nzOnOk)="pwdHandleOk()" [nzOkLoading]="pwdIsOkLoading" (nzAfterOpen)="pwdAfterOpen()">
   <div>

src/app/views/pathology-check/pathology-check.component.ts

@@ -234,14 +234,14 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		}
 
   }
-	
+
 	//tab切换
 	tabClick(type){
 		this.activeIndex = type
 		localStorage.setItem("pathologyActiveIndex",type)
 		this.getJsData(1)
 	}
-	
+
 	// 分页
 	noType:any='none';
 	pageChange(){
@@ -571,6 +571,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 				this.scanCodeData = res.data[0]
 				this.dataType = res.dataType
 				if(res.data[0].pathologySpecimenDTOList.length>1){
+          this.muArr = [];
 					for(let i of res.data[0].pathologySpecimenDTOList){
 						if(i.isScan==1){
 							this.muArr.push(i)