拉取代码

src/app/services/main.service.ts

@@ -858,4 +858,18 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	
+	//病理申请单打印
+	 pathologyPrint(data) {
+	   return this.http.post(host.host + `/pathology/print`, data, {
+	     headers: this.headers,
+	   });
+	 }
+	
+	// 病理查询标本条码
+	pathologyScanCode(data) {
+	  return this.http.post(host.host + `/pathology/scanCode`, data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/services/tool.service.ts

@@ -47,6 +47,10 @@ export class ToolService {
       ? JSON.parse(localStorage.getItem("user")).user.currentHospital
       : JSON.parse(localStorage.getItem("user")).infoPermission.hospitals[0];
   }
+	//获取当前用户id
+	getCurrentUserId() {
+	  return JSON.parse(localStorage.getItem("user")).user.id;
+	}
   //获取当前用户科室
   getCurrentUserDept() {
     return JSON.parse(localStorage.getItem("user")).user.dept;

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

@@ -2,65 +2,63 @@
 	<div class="pathology-content">
 		<div class="title">病理申请单<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
 		</div>
-		<div class="content">
+		<div class="content" *ngIf="!isSpinning">
 			<form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
 				<div class="content-item boder-right">
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="knowledgeClass" [nzSm]="6" [nzXs]="24">是否术中快速</nz-form-label>
+						<nz-form-label nzRequired nzFor="intraoperativeRapidity" [nzSm]="6" [nzXs]="24">是否术中快速</nz-form-label>
 						<nz-form-control nzErrorTip="请选择!" [nzSm]="18" [nzXs]="24">
-							<nz-radio-group formControlName="knowledgeClass">
+							<nz-radio-group formControlName="intraoperativeRapidity">
 								<label nz-radio [nzValue]="1">是</label>
 								<label nz-radio [nzValue]="0">否</label>
 							</nz-radio-group>
 						</nz-form-control>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">申请单编号：</span>1008611</div>
-						<div class="form-title"><span class="font-weight-500">状态：</span>未打印</div>
+						<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">科室名称：</span>科室111</div>
-						<div class="form-title"><span class="font-weight-500">住院号：</span>008622</div>
+						<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">患者信息：</span>张三</div>
-						<div class="form-title"><span class="font-weight-500">年龄：</span>18</div>
+						<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+						<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}</div>
 					</nz-form-item>
 					<nz-form-item>
 						<div class="form-title width-100 font-weight-500">诊断：</div>
 						<div>
-							<div>1.有病</div>
-							<div>2.有病</div>
+							{{detailsData.diagnose||'无'}}
 						</div>
 					</nz-form-item>
 					
 					<nz-form-item>
-						<div class="form-title font-weight-500">病理摘要：</div>
-						<div>患者因“胆囊息肉4月余”于2024-08-05入院。
-						患者4月前我院彩超提示胆囊息肉,大小约1.3*cds  0.7cm,无腹痛腹胀，无恶心呕吐，无发热，无胸闷、无返酸，无呕血、黑便，无腹泻，无尿频、尿急、尿痛。未进一步处理,今患者再次来我院,要求进一步治疗住院，</div>
+						<div class="form-title width-100 font-weight-500">病理摘要：</div>
+						<div>{{detailsData.medicalRecords||'无'}}</div>
 					</nz-form-item>
 					
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="scheme" [nzSm]="24" [nzXs]="24">手术方案</nz-form-label>
+						<nz-form-label nzRequired nzFor="surgicalPlan" [nzSm]="24" [nzXs]="24">手术方案</nz-form-label>
 						<nz-form-control nzErrorTip="请输入手术方案" [nzSm]="24" [nzXs]="24">
-							<textarea rows="3" nz-input formControlName="scheme" placeholder="请输入手术方案"></textarea>
+							<textarea rows="3" nz-input formControlName="surgicalPlan" placeholder="请输入手术方案"></textarea>
 						</nz-form-control>
 					</nz-form-item>
 				</div>
 				
 				<div class="content-item">
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="sees" [nzSm]="6" [nzXs]="24">术中所见</nz-form-label>
+						<nz-form-label nzRequired nzFor="intraoperativeFindings" [nzSm]="6" [nzXs]="24">术中所见</nz-form-label>
 						<nz-form-control nzErrorTip="请输入术中所见" [nzSm]="24" [nzXs]="24">
-							<textarea rows="3" nz-input formControlName="sees" placeholder="请输入术中所见"></textarea>
+							<textarea rows="3" nz-input formControlName="intraoperativeFindings" placeholder="请输入术中所见"></textarea>
 						</nz-form-control>
 					</nz-form-item>
 					
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="specimen" [nzSm]="5" [nzXs]="24">标本类型</nz-form-label>
+						<nz-form-label nzRequired nzFor="specimenGenre" [nzSm]="5" [nzXs]="24">标本类型</nz-form-label>
 						<nz-form-control nzErrorTip="请选择标本类型!" [nzSm]="19" [nzXs]="24">
 							<nz-input-group>
-								<nz-select nzSearch nzShowSearch nzPlaceHolder="请选择标本类型" formControlName="specimen">
+								<nz-select nzSearch nzShowSearch nzPlaceHolder="请选择标本类型" formControlName="specimenGenre">
 									<ng-container *ngFor="let option of specimenData">
 										<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 									</ng-container>
@@ -73,22 +71,22 @@
 					</nz-form-item>
 					
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="number" [nzSm]="5" [nzXs]="24">标本件数</nz-form-label>
+						<nz-form-label nzRequired nzFor="specimenNum" [nzSm]="5" [nzXs]="24">标本件数</nz-form-label>
 						<nz-form-control nzErrorTip="请输入标本件数!" [nzSm]="19" [nzXs]="24">
-							<input nz-input formControlName="number"  placeholder="请输入标本件数" nzSize="default" />
+							<input nz-input formControlName="specimenNum"  placeholder="请输入标本件数" nzSize="default" />
 						</nz-form-control>
 					</nz-form-item>
 					
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="part" [nzSm]="5" [nzXs]="24">采取部位</nz-form-label>
+						<nz-form-label nzRequired nzFor="takePart" [nzSm]="5" [nzXs]="24">采取部位</nz-form-label>
 						<nz-form-control nzErrorTip="请输入采取部位!" [nzSm]="19" [nzXs]="24">
-							<input nz-input formControlName="part"  placeholder="请输入采取部位" nzSize="default" />
+							<input nz-input formControlName="takePart"  placeholder="请输入采取部位" nzSize="default" />
 						</nz-form-control>
 					</nz-form-item>
 					
 					<nz-form-item class="form-title-box">
-						<div class="form-title">取标本位置：A01</div>
-						<div class="form-title">取材医生：王医生</div>
+						<div class="form-title">取标本位置：{{detailsData.surgeryDeptDTO.dept}}</div>
+						<div class="form-title">取材医生：{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
 					</nz-form-item>
 					
 					<nz-form-item class="form-item">
@@ -100,13 +98,21 @@
 					
 					<div class="specimen-list">
 						<div *ngFor="let item of specimenList;let index=index;" class="specimen-item">
-							<div>{{item.name}}</div>
+							<div class="specimen-name" (click)="specimenEdit($event,item,index)">
+							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
+							{{item.sample?item.sample.name:''}}
+							</div>
 							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
 						</div>
 					</div>
 				</div>
 			</form>
 		</div>
+		<div class="mask-style" *ngIf="isSpinning">
+			<nz-spin nzSimple class="spin-style"></nz-spin>
+		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
 		  <button class="btn btn-right" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">打印标本</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
@@ -122,7 +128,7 @@
 		<div class="content">
 			<form nz-form [formGroup]="validateSpecimenForm" class="addForm" (ngSubmit)="submitSpecimen()">
 				<nz-form-item class="form-item">
-					<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">位置来源</nz-form-label>
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">位置来源</nz-form-label>
 					<div class="specimen-list">
 						<div>
 							<div *ngFor="let item of placeList;let index=index;" class="select-item"
@@ -132,35 +138,42 @@
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
-					<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">系统</nz-form-label>
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">系统</nz-form-label>
 					<div class="specimen-list">
-						<div *ngFor="let item of systemList;let index=index;" class="select-box"
+						<div *ngFor="let item of systemList;let index=index;" class="select-item"
 							[ngClass]="{'activeClass': index == systemIndex}" (click)="systemClick($event,item,index)">
-							<div class="select-item">{{item.name}}</div>
+							{{item.name}}
 						</div>
 					</div>
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
-					<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">器官</nz-form-label>
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">器官</nz-form-label>
 					<div class="specimen-list">
-						<div *ngFor="let item of apparatusList;let index=index;" class="select-box"
+						<div *ngFor="let item of apparatusList;let index=index;" class="select-item"
 							[ngClass]="{'activeClass': index == apparatusIndex}" (click)="apparatusClick($event,item,index)">
-							<div class="select-item">{{item.name}}</div>
+							{{item.name}}
 						</div>
 					</div>
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
-					<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">标本名称</nz-form-label>
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">标本名称</nz-form-label>
 					<div class="specimen-list">
-						<div *ngFor="let item of specimenNameList;let index=index;" class="select-box"
+						<div *ngFor="let item of specimenNameList;let index=index;" class="select-item"
 							[ngClass]="{'activeClass': index == specimenNameIndex}" (click)="specimenNameClick($event,item,index)">
-							<div class="select-item">{{item.name}}</div>
+							{{item.name}}
 						</div>
 					</div>
 				</nz-form-item>
 				
+				<nz-form-item class="form-item" *ngIf="specimenNameName=='qita'">
+					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">其他标本名称</nz-form-label>
+					<nz-form-control nzErrorTip="请输入其他标本名称" [nzSm]="21" [nzXs]="24">
+						<input nz-input formControlName="specimenName" placeholder="请输入其他标本名称"/>
+					</nz-form-control>
+				</nz-form-item>
+				
 				<nz-form-item class="form-item">
 					<nz-form-label nzRequired nzFor="remark" [nzSm]="3" [nzXs]="24">备注</nz-form-label>
 					<nz-form-control nzErrorTip="请输入备注" [nzSm]="21" [nzXs]="24">
@@ -170,7 +183,7 @@
 			</form>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen()" [nzLoading]="btnLoading">确定</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen()" [nzLoading]="btnSpLoading">确定</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
 		</div>
 	</div>
@@ -178,8 +191,15 @@
 
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo" (closeModel)="closeModel"></app-prompt-modal>
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
 	
+<app-prompt-modal *ngIf="specimenModalShow" [content]="promptContent" [success]="ifSuccess" [show]="specimenModalShow"
+  [info]="promptInfo" (closeModel)="closeSpecimenModel()"></app-prompt-modal>
+
+ <!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmDel()" content="您确认要删除标本吗？"></app-dialog-delete>
+		
 <!-- 未打印 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="notModal">
 	<div class="modalBody no-width">
@@ -188,10 +208,10 @@
 		<div class="content">
 			<form nz-form [formGroup]="validatePrintForm" class="addForm" (ngSubmit)="submitPrintForm()">
 				<nz-form-item>
-				  <nz-form-label nzRequired [nzSpan]="8" nzFor="time">标本离体时间</nz-form-label>
+				  <nz-form-label nzRequired [nzSpan]="8" nzFor="inVitroTime">标本离体时间</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择标本离体时间!">
 				    <nz-input-group>
-							<nz-date-picker formControlName="time" 
+							<nz-date-picker formControlName="inVitroTime" 
 							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
 							(ngModelChange)="formChangeDate($event)"></nz-date-picker>
 						</nz-input-group>
@@ -200,7 +220,7 @@
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="5" nzFor="jobNumber">工号</nz-form-label>
 					<nz-form-control [nzSpan]="19" nzErrorTip="请输入工号!">
-						<input nz-input (input)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+						<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
@@ -212,8 +232,68 @@
 			</form>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="submitPrintForm()" [nzLoading]="btnLoading">确定</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitPrintForm()" [nzLoading]="printLoading">确定</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideNotModal()">取消</button>
 		</div>
 	</div>
-</div>
+</div>
+
+
+  <!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad">
+			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
+				border-radius: 5px;font-size: 12px;">
+				<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;border-top: 1px solid #aaa;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
+					<div style="width:70%;padding:1px;">{{printData.patientName}}({{printData.patientAge}}岁)</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
+					<div style="width:70%;padding:1px;">{{printData.patientBedNum}}床/{{printData.residenceNo}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
+					<div style="width:70%;padding:1px;">{{printData.patientDept}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">部位</div>
+					<div style="width:70%;padding:1px;">{{printData.takePart}}</div>
+				</div>
+				<div style="display: flex;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
+					<div style="width:70%;padding:1px;">{{printData.specimenNum}}</div>
+				</div>
+			</div>
+			<div style="height: 10px;"></div>
+			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+					<div style="height: 30px;"></div>
+					<div style="border: 1px solid #AAAAAA;border-radius: 5px;">
+						<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="data.barCode" alt="">
+						<div class="monad-sign" style="border-bottom: 1px solid #AAAAAA;padding-left:1px;">
+							<div>{{data.system}}-{{data.organ}}</div>
+							<div>({{index+1}}/{{printData.specimenList.length}}) {{data.partSource}}-{{data.specimenName}}</div>
+						</div>
+						<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
+							<div style="width:70%;padding:1px;">{{data.patientName}}({{data.patientAge}}岁)</div>
+						</div>
+						<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
+							<div style="width:70%;padding:1px;">{{data.patientBedNum}}床/{{data.residenceNo}}</div>
+						</div>
+						<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
+							<div style="width:70%;padding:1px;">{{data.patientDept}}</div>
+						</div>
+						<div style="display: flex;">
+							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">离体时间</div>
+							<div style="width:70%;padding:1px;">{{data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+  </div>

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

@@ -96,6 +96,9 @@
 				.specimen-item{
 					display: flex;
 					margin-bottom: 10px;
+					.specimen-name{
+						cursor: pointer;
+					}
 					.specimen-icon{
 						color: #64BD7B;
 						cursor: pointer;
@@ -107,6 +110,21 @@
 				}
 			}
 		}
+		.mask-style{
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 999;
+			display: flex;
+			background: rgba(0,0,0,0.2);
+			align-items: center;
+			justify-content: center;
+		}
+		.spin-style{
+			z-index:9999;
+		}
 		.bottom-btn{
 			margin-top: 10px;
 			.btn-right{
@@ -167,21 +185,24 @@
 						}
 					}
 				}
-				.select-item{
-					margin-top: 5px;
-					display: flex;
-					flex-wrap: wrap;
-					padding: 3px 8px;
-					border: 1px solid #e5e9ed;
-					border-radius: 5px;
-					margin-right: 10px;
-					cursor: pointer;
-					display: inline-block;
+				.specimen-list{
+					flex: 1;
+					.select-item{
+						margin-top: 5px;
+						display: flex;
+						flex-wrap: wrap;
+						padding: 3px 8px;
+						border: 1px solid #e5e9ed;
+						border-radius: 5px;
+						margin-right: 10px;
+						cursor: pointer;
+						display: inline-block;
+					}
 				}
 				
 				.activeClass{
 					color: #64BD7B;
-					border-color: #64BD7B;
+					border-color: #64BD7B !important;
 				}
 	      
 	    }

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

@@ -3,6 +3,7 @@ import { HttpHeaders, HttpRequest, HttpClient  } from "@angular/common/http";
 import host from "../../../assets/js/http";
 import { NzMessageService } from "ng-zorro-antd";
 import { MainService } from '../../services/main.service';
+import { DomSanitizer } from '@angular/platform-browser';
 import {
   FormBuilder,
   Validators,
@@ -10,6 +11,7 @@ import {
   FormControl,
 } from "@angular/forms";
 import { format, startOfDay, endOfDay, subDays} from "date-fns";
+import { ToolService } from "../../services/tool.service";
 
 @Component({
   selector: 'app-pathology-add',
@@ -19,13 +21,16 @@ import { format, startOfDay, endOfDay, subDays} from "date-fns";
 export class PathologyAddComponent implements OnInit {
 	
 	@Output() pathologyCancel = new EventEmitter();
-	@Input() content: string;
-
+	@Input() surgeryId: string;
+	@Input() patientId: string;
+	
 	constructor(
 		private http: HttpClient,
 		private message: NzMessageService,
 		private mainService: MainService,
 		private fb: FormBuilder,
+		private tool: ToolService,
+		private sanitizer: DomSanitizer
 	) { }
 	
 	btnLoading:boolean = false;
@@ -35,50 +40,14 @@ export class PathologyAddComponent implements OnInit {
 	specimenData:any=[]; //标本类型
 	isDeptLoading:boolean = false;
 	specimenModal:boolean = false; //选择标本状态
-	specimenList:any=[
-		{
-			name:'aaa'
-		},
-		{
-			name:'bbbb'
-		}
-	]; //已选标本
-	placeIndex:any;
-	systemIndex:any;
-	apparatusIndex:any;
-	specimenNameIndex:any;
-	placeList:any=[
-		{
-			name:'通用'
-		},
-		{
-			name:'左侧'
-		},
-		{
-			name:'通用'
-		},
-		{
-			name:'左侧'
-		},
-		{
-			name:'通用'
-		},
-		{
-			name:'左侧'
-		},
-		{
-			name:'通用'
-		},
-		{
-			name:'左侧'
-		},
-		{
-			name:'通用'
-		},
-		{
-			name:'左侧'
-		},
-	]; //位置来源数据
+	isSpinning:boolean = false; //页面加载状态
+	detailsData:any;
+	specimenList:any=[]; //已选标本
+	placeIndex:any = null;
+	systemIndex:any = null;
+	apparatusIndex:any = null;
+	specimenNameIndex:any = null;
+	placeList:any=[]; //位置来源数据
 	systemList:any=[]; //系统数据
 	apparatusList:any=[]; //器官数据
 	specimenNameList:any=[]; //标本名称数据
@@ -86,26 +55,221 @@ export class PathologyAddComponent implements OnInit {
 	ifSuccess: boolean; //操作成功/失败
 	promptInfo: string; //操作结果提示信息
 	promptModalShow: boolean; //操作提示框是否展示
+	specimenModalShow: boolean; //操作提示框是否展示
 	type:any = '未打印';
 	notModal:boolean = false;
+	hosId:any;
   ngOnInit() {
+		this.hosId = this.tool.getCurrentHospital().id;
 		this.initForm()
+		this.fetchDataList()
   }
 	
 	// 初始化新增form表单
 	initForm() {
 		this.validateForm = this.fb.group({
-		  knowledgeClass: [1, [Validators.required]],
-			specimen: [null, [Validators.required]],
-			sees: [null, [Validators.required]],
-			scheme: [null, [Validators.required]],
-			number: [null,[Validators.required]],
-			part: [null, [Validators.required]]
+		  intraoperativeRapidity: [1, [Validators.required]],
+			specimenGenre: [null, [Validators.required]],
+			intraoperativeFindings: [null, [Validators.required]],
+			surgicalPlan: [null, [Validators.required]],
+			specimenNum: [null,[Validators.required]],
+			takePart: [null, [Validators.required]]
+		});
+	}
+	
+	fetchDataList(){
+		let data = {
+		  idx: 0,
+		  sum: 9999,
+		  pathologyForm: {
+		    surgeryId: this.surgeryId || "",
+		    patientId: this.patientId || "",
+		    hosId: this.hosId || "" ,
+		  },
+		};
+		this.isSpinning = true;
+		this.mainService
+		  .getFetchDataList("data", "pathologyForm", data)
+		  .subscribe((data) => {
+		    this.isSpinning = false;
+		    this.detailsData = data.list[0];
+				if(this.detailsData.surgicalPlan){
+					this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
+				}
+				if(this.detailsData.intraoperativeFindings){
+					this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
+				}
+				this.getDicData()
+				this.getSampleData()
+				this.getSourceData()
+				this.getSysData()
+		  });
+	}
+	
+	// 获取标本类型
+	getDicData(){
+		this.mainService.getDictionary("list", "specimen_type").subscribe((res) => {
+			this.specimenData = res.filter(i=>i.extra1 == 'pathologySpecimen')
+			if(this.detailsData.specimenType){
+				this.validateForm.controls.specimenGenre.setValue(this.detailsData.specimenType.id);
+			}
+			if(this.detailsData.specimenNum){
+				this.validateForm.controls.specimenNum.setValue(this.detailsData.specimenNum);
+			}
+			if(this.detailsData.takePart){
+				this.validateForm.controls.takePart.setValue(this.detailsData.takePart);
+			}
 		});
 	}
 	
+	// 获取标本-位置来源
+	getSourceData(){
+		this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
+			this.placeList = res
+		});
+	}
+	
+	// 获取标本-系统
+	getSysData(){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 1,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.systemList = data.list;
+		  });
+
+	}
+	
+	// 获取标本-器官
+	getApparatusData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 2,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+				if(data.list.length>0){
+					this.apparatusList = data.list;
+					if(type=='edit'){
+						setTimeout(_=>{
+							let index3 = this.apparatusList.findIndex(i=>i.id==item.organ.id)
+							this.apparatusIndex = index3
+							this.apparatusId = Number(item.organ.id);
+						},100)
+					}
+				}else{
+					this.message.info('暂无数据')
+				}
+		  });
+	}
+	
+	// 获取标本-标本名称
+	getSpNameData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 3,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.specimenNameList = data.list;
+				this.specimenNameList.push({
+					name:'其他',
+					id:'qita'
+				})
+				if(type=='edit'){
+					if(item.sample){
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, [Validators.required]]
+						});
+						setTimeout(_=>{
+							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
+							this.specimenNameIndex = index4
+							this.specimenNameName = item.sample.name
+							this.specimenNameId = Number(item.sample.id);
+						},100)
+					}else{
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, [Validators.required]],
+							specimenName: [null, [Validators.required]]
+						});
+						this.specimenNameIndex = this.specimenNameList.length-1
+						this.specimenNameName = 'qita'
+						this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+					}
+					setTimeout(_=>{
+						this.validateSpecimenForm.controls.remark.setValue(item.remark);
+						this.specimenModal = true
+					},50)
+				}
+		  });
+	}
+	
+	// 删除标本
+	delModal:boolean = false
+	coopId:any;
 	specimenDel(e,item,index){
-		this.specimenList.splice(index,1)
+		this.delModal = true
+		this.coopId = item.id
+	}
+	
+	// 确定删除
+	confirmDel(){
+		this.mainService
+		  .coopTypeConfig(
+		    "rmvData",
+		    "pathologySpecimen",
+		     [this.coopId]
+		  )
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.delModal = false;
+				this.getSampleData()
+		    if (data.status==200) {
+		      this.showSpecimenModal("删除", true, "");
+		    } else {
+		      this.showSpecimenModal("删除", false, data.data[0].msg);
+		    }
+		  });
+	}
+	// 确定删除
+	hideDelModal() {
+	  this.delModal = false;
+	}
+	
+	// 编辑标本
+	specimenDetailId:any = null;
+	specimenEdit(e,item,index){
+		this.specimenDetailId = item.id
+		let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
+		this.placeIndex = index1
+		this.placeId = Number(item.partSource.id)
+		let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
+		this.systemIndex = index2
+		this.systemId = Number(item.system.id)
+		this.getApparatusData(item.system.id,item,'edit')
+		this.getSpNameData(item.organ.id,item,'edit')
 	}
 	
 	// 选择标本
@@ -113,43 +277,159 @@ export class PathologyAddComponent implements OnInit {
 		this.validateSpecimenForm = this.fb.group({
 		  remark: [null, [Validators.required]]
 		});
+		this.specimenDetailId = null;
+		this.placeIndex = null;
+		this.systemIndex = null;
+		this.apparatusIndex = null;
+		this.specimenNameIndex = null;
+		this.placeId = null;
+		this.systemId = null;
+		this.apparatusId = null;
+		this.specimenNameId = null;
+		this.placeList=[]; //位置来源数据
+		this.systemList=[]; //系统数据
+		this.apparatusList=[]; //器官数据
+		this.specimenNameList=[]; //标本名称数据
+		this.getSourceData()
+		this.getSysData()
 		this.specimenModal = true
 	}
 	
 	// 选择位置来源
+	placeId:any = null;
 	placeClick(e,item,index){
+		this.placeId = item.id
 		this.placeIndex = index
 	}
 	
 	// 选择系统
+	systemId:any = null;
 	systemClick(e,item,index){
+		this.systemId = Number(item.id)
 		this.systemIndex = index
-		this.getApparatus(item)
+		this.apparatusList = [];
+		this.apparatusId = null;
+		this.apparatusIndex = null;
+		this.getApparatusData(item.id,{},'select')
 	}
 	
 	// 选择器官
+	apparatusId:any = null;
 	apparatusClick(e,item,index){
+		this.apparatusId = Number(item.id)
 		this.apparatusIndex = index
-		this.getSpecimenName(item)
+		this.specimenNameList = [];
+		this.specimenNameId = null;
+		this.specimenNameIndex = null;
+		this.getSpNameData(item.id,{},'select')
 	}
 	
 	// 选择标本名称
+	specimenNameId:any = null;
+	specimenNameName:any = null;
 	specimenNameClick(e,item,index){
 		this.specimenNameIndex = index
+		let remark = this.validateSpecimenForm.value.remark
+		if(item.id == 'qita'){
+			this.validateSpecimenForm = this.fb.group({
+			  remark: [remark?remark:null, [Validators.required]],
+				specimenName: [null, [Validators.required]]
+			});
+			this.specimenNameId = 'null'
+			this.specimenNameName = 'qita'
+		}else{
+			this.validateSpecimenForm = this.fb.group({
+			  remark: [remark?remark:null, [Validators.required]],
+			});
+			this.specimenNameId = item.id
+			this.specimenNameName = item.name
+		}
 	}
 	
-	// 获取器官
-	getApparatus(item){
-		
-	}
-	
-	// 获取标本名称
-	getSpecimenName(item){
-		
+	// 保存标本
+	btnSpLoading:boolean = false;
+	submitSpecimen(){
+		if(this.placeIndex==null){
+			this.message.error('请选择位置来源')
+			return
+		}
+		if(this.systemIndex==null){
+			this.message.error('请选择系统')
+			return
+		}
+		if(this.apparatusIndex==null){
+			this.message.error('请选择器官')
+			return
+		}
+		if(this.specimenNameIndex==null){
+			this.message.error('请选择标本名称')
+			return
+		}
+		for (const i in this.validateSpecimenForm.controls) {
+		  this.validateSpecimenForm.controls[i].markAsDirty();
+		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateSpecimenForm.invalid) return;
+		let data = {
+			pathologyFormId:this.detailsData.id,
+			partSource:{
+				id:this.placeId
+			},
+			system:{
+				id:this.systemId
+			},
+			organ:{
+				id:this.apparatusId
+			},
+			sample:{
+				id:this.specimenNameId
+			},
+			hosId:this.hosId,
+			specimenName:null,
+			id:'',
+			remark:this.validateSpecimenForm.value.remark
+		};
+		if(this.specimenNameName == 'qita'){
+			delete data.sample
+			data.specimenName = this.validateSpecimenForm.value.specimenName
+		}else{
+			data.specimenName = this.specimenNameName
+		}
+		let queryType = null
+		if(this.specimenDetailId){
+			queryType = 'updData'
+			data.id = this.specimenDetailId
+		}else{
+			queryType = 'addData'
+			delete data.id
+		}
+		this.btnSpLoading = true;
+		this.mainService
+		  .simplePost(queryType, "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    this.btnSpLoading = false;
+		    if (res.status == 200) {
+		      this.showSpecimenModal("操作", true, "");
+		    } else {
+		      this.showSpecimenModal("操作", false, res.msg);
+		    }
+		  });
 	}
 	
-	submitSpecimen(){
-		this.hideSpecimenModal()
+	// 获取标本列表
+	getSampleData(){
+		let data={
+			idx: 0,
+			sum: 9999,
+			pathologySpecimen:{
+				pathologyFormId:this.detailsData.id
+			}
+		}
+		this.mainService
+		  .getFetchDataList("data", "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    this.specimenList = res.list
+		  });
 	}
 	
 	hideSpecimenModal(){
@@ -167,62 +447,160 @@ export class PathologyAddComponent implements OnInit {
 		
 	}
 	
+	//未打印提交
+	printLoading:boolean = false;
 	submitPrintForm(): void{
-		// for (const i in that.validateForm.controls) {
-		//   that.validateForm.controls[i].markAsDirty();
-		//   that.validateForm.controls[i].updateValueAndValidity();
-		// }
-		// if (that.validateForm.invalid) return;
-		this.hideNotModal()
+		let that = this
+		for (const i in this.validatePrintForm.controls) {
+		  this.validatePrintForm.controls[i].markAsDirty();
+		  this.validatePrintForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validatePrintForm.invalid) return;
+		
+		let data: any = {
+			pathologyForm:{
+				...this.validateForm.value,
+				...this.detailsData,
+				inVitroTime:this.validatePrintForm.value.inVitroTime,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" ,
+				handoverUserId:this.handoverUserId,
+				specimenType:{
+					id:this.validateForm.value.specimenGenre
+				}
+			}
+		};
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO
+		delete data.pathologyForm.specimenGenre
+		this.printLoading = true;
+		this.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+				
+				let arr = res.data;
+		    if(arr.applyBarCode){
+		    	arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+		    }
+		    for(let i of arr.specimenList){
+		    	i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+		    }
+		    that.printLoading = false;
+		    that.printData = arr;
+		    setTimeout(() => {
+		      const printContent = document.getElementById("report");
+		      const WindowPrt = window.open("", "", "width=100,height=1000");
+		    	WindowPrt.document.body.innerHTML = printContent.innerHTML;
+		    	setTimeout(_=>{
+		    		WindowPrt.document.close();
+		    		WindowPrt.focus();
+		    		WindowPrt.print();
+		    		WindowPrt.close();
+		    		that.hideModal();
+		    	},500)
+		    }, 500);
+		  });
 	}
 	
 	// 监听工号数据
+	handoverUserId:any = null;
 	numberChange(e){
-		console.log(555,e)
+		if(e.length < 3) {
+			this.validatePrintForm.controls.name.setValue('');
+			return
+		}
+		let data = {
+		  idx: 0,
+		  sum: 9999,
+		  user: {
+		    account: e || "",
+		    hospital: { id: this.hosId || "" }
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "user", data)
+		  .subscribe((data) => {
+				if(data.list.length>0){
+					this.validatePrintForm.controls.name.setValue(data.list[0].name);
+					this.handoverUserId = data.list[0].id
+				}else{
+					this.validatePrintForm.controls.name.setValue('');
+					this.handoverUserId =null
+				}
+		  });
 	}
 	
+	printData:any;
 	submitForm(): void{
-		if(this.type=='未打印'){
+		var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+		if(this.detailsData.status.name=='未打印'){
 			this.notModal = true
 			this.validatePrintForm = this.fb.group({
-			  time: [null, [Validators.required]],
+			  inVitroTime: [null, [Validators.required]],
 				jobNumber: [null, [Validators.required]],
 				name:[null, [Validators.required]],
 			});
 			let date = new Date();
 			this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-			console.log(444,this.startDate)
-			this.validatePrintForm.controls.time.setValue(this.startDate);
+			this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
 			return
 		}
-		var that = this;
-		// for (const i in that.validateForm.controls) {
-		//   that.validateForm.controls[i].markAsDirty();
-		//   that.validateForm.controls[i].updateValueAndValidity();
-		// }
-		// if (that.validateForm.invalid) return;
-		// let data: any = {
-		// 	startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
-		// 	endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
-		// 	hosId:this.hosId,
-		// 	pharmacy:this.validateForm.value.department,
-		// 	loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
-		// };
-		  
-		// that.btnLoading = true;
-		// that.mainService
-		//   .simplePost("addData", "drugsBatch", data)
-		//   .subscribe((data) => {
-		//     that.btnLoading = false;
-		//     that.hideModal();
-		//     that.initForm();
-		//     if (data.status == 200) {
-		//       that.showPromptModal("操作", true, "");
-		//     } else {
-		//       that.showPromptModal("操作", false, data.msg);
-		//     }
-		//   });
-		this.hideModal()
+
+		let data: any = {
+			pathologyForm:{
+				...this.validateForm.value,
+				...this.detailsData,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" ,
+				specimenType:{
+					id:this.validateForm.value.specimenGenre
+				}
+			}
+		};
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO 
+		delete data.pathologyForm.specimenGenre 
+		that.btnLoading = true;
+		that.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+				let arr = res.data;
+				if(arr.applyBarCode){
+					arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+				}
+				for(let i of arr.specimenList){
+					i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+				}
+				that.btnLoading = false;
+				that.printData = arr;
+		    setTimeout(() => {
+		      const printContent = document.getElementById("report");
+		      const WindowPrt = window.open("", "", "width=100,height=1000");
+					WindowPrt.document.body.innerHTML = printContent.innerHTML;
+					setTimeout(_=>{
+						WindowPrt.document.close();
+						WindowPrt.focus();
+						WindowPrt.print();
+						WindowPrt.close();
+						that.hideModal();
+					},500)
+		    }, 500);
+		  });
+	}
+	
+	// 关闭标本
+	closeSpecimenModel(){
+		this.getSampleData()
+		this.hideSpecimenModal()
 	}
 	
 	closeModel(){
@@ -242,5 +620,15 @@ export class PathologyAddComponent implements OnInit {
 	    this.promptModalShow = true;
 	  }, 100);
 	}
+	
+	showSpecimenModal(con, success, promptInfo?) {
+	  this.specimenModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.specimenModalShow = true;
+	  }, 100);
+	}
 }
 

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

@@ -0,0 +1,167 @@
+<div class="pathology-box display_flex align-items_center justify-content_flex-center">
+	<div class="pathology-content" *ngIf="!isSpinning">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+		<div class="content">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<div class="form-title width-150"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+					<div class="form-title width-200"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title width-150"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<div class="form-title width-200"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
+				</div>
+
+				<div class="form-list">
+					<div class="form-title font-weight-500">诊断：</div>
+					<div class="indent">
+						{{detailsData.diagnose||'无'}}
+					</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">病理摘要：</div>
+					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">手术方案：</div>
+					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">术中所见：</div>
+					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
+				</div>
+
+				<div class="form-title-box">
+					<div class="form-title width-150"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+					<div class="form-title width-200"><span class="font-weight-500">标本件数：</span>{{detailsData.specimenNum||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">采取部位：</span>{{detailsData.takePart||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">标本：</div>
+					<div class="form-title-box">
+						<div class="form-title" *ngFor="let item of specimenList">
+							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
+							{{item.sample?item.sample.name:''}}
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+			<div class="content-item-right">
+				<div class="step-title">病理闭环</div>
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;">{{item.operationType.name}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" *ngIf="detailsData.status.value==6 || 
+			detailsData.status.value==7 || detailsData.status.value==8 || 
+			detailsData.status.value==9 || detailsData.status.value==10"nz-button nzType="primary" (click)="closeDetailMoadl()">确定</button>
+			
+			<button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
+			detailsData.status.value==3 || detailsData.status.value==4 || 
+			detailsData.status.value==5" nz-button nzType="primary" (click)="submitPrint()" [nzLoading]="btnLoading">补打</button>
+			
+			<!-- <button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
+			detailsData.status.value==3 || detailsData.status.value==4 || 
+			detailsData.status.value==5" nz-button nzType="primary" 
+			(click)="immobilization()">标本固定</button> -->
+			
+			<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
+		</div>
+	</div>
+	
+	<div class="mask-style" *ngIf="isSpinning">
+		<nz-spin nzSimple class="spin-style"></nz-spin>
+	</div>
+</div>
+
+<!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad">
+			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
+				border-radius: 5px;font-size: 12px;">
+				<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;border-top: 1px solid #aaa;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
+					<div style="width:70%;padding:1px;">{{printData.patientName}}({{printData.patientAge}}岁)</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
+					<div style="width:70%;padding:1px;">{{printData.patientBedNum}}床/{{printData.residenceNo}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
+					<div style="width:70%;padding:1px;">{{printData.patientDept}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">部位</div>
+					<div style="width:70%;padding:1px;">{{printData.takePart}}</div>
+				</div>
+				<div style="display: flex;">
+					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
+					<div style="width:70%;padding:1px;">{{printData.specimenNum}}</div>
+				</div>
+			</div>
+			 <div style="height: 10px;"></div>
+			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+				 <div style="height: 30px;"></div>
+				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
+					 <img style="width: 100%;height: 90px;border-radius: 5px;" [src]="data.barCode" alt="">
+					 <div class="monad-sign" style="border-bottom: 1px solid #AAAAAA; padding-left:1px;">
+					 	<div>{{data.system}}-{{data.organ}}</div>
+					 	<div>({{index+1}}/{{printData.specimenList.length}}) {{data.partSource}}-{{data.specimenName}}</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
+					 	<div style="width:70%;padding:1px;">{{data.patientName}}({{data.patientAge}}岁)</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
+					 	<div style="width:70%;padding:1px;">{{data.patientBedNum}}床/{{data.residenceNo}}</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
+					 	<div style="width:70%;padding:1px;">{{data.patientDept}}</div>
+					 </div>
+					 <div style="display: flex;">
+					 	<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">离体时间</div>
+					 	<div style="width:70%;padding:1px;">{{data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+					 </div>
+				 </div>
+				</div>
+			</div>
+		</div>
+  </div>

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

@@ -0,0 +1,155 @@
+.pathology-box {
+  position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 99;
+	.pathology-content{
+		width: 80%;
+		background: #fff;
+		border-radius: 5px;
+		padding: 10px 20px;
+		color: #000;
+		.title {
+		  width: 100%;
+		  text-align: center;
+		  font-size: 18px;
+		  position: relative;
+		
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		.content{
+			width: 100%;
+			background: #f9fafb;
+			border: 1px solid #e5e9ed;
+			border-radius: 5px;
+			overflow: hidden;
+			margin-top: 12px;
+			display: flex;
+			// .addForm{
+				// display: flex;
+				.font-weight-500{
+					color: #000;
+					font-weight: 500;
+				}
+				.ant-select{
+					width: 100%;
+				}
+				.content-item{
+					height: auto;
+					max-height: 460px;
+					overflow-y: auto;
+					width: 75%;
+					padding: 15px;
+					.form-title-box{
+						display: flex;
+						margin-bottom: 10px;
+						.form-title{
+							color: #333;
+							margin-right: 40px;
+						}
+						.width-150{
+							width: 150px;
+						}
+						.width-200{
+							width: 200px;
+						}
+					}
+					.center{
+						text-align: center;
+						padding: 10px 0;
+					}
+					.disp-fl{
+						display: flex;
+						align-items: center;
+						.width-120{
+							width: 85px;
+						}
+						.ant-input{
+							width: 300px;
+						}
+					}
+					.form-list{
+						margin-bottom: 10px;
+						.indent{
+							text-indent: 2ch;
+							color: #333;
+						}
+					}
+					.ant-form-item {
+					  margin-bottom: 14px;
+						display: flex;
+						flex-wrap: wrap;
+					  .ant-form-item-label {
+					    text-align: left;
+							font-weight: 500;
+					  }
+						.ant-form-item-control-wrapper{
+							.ant-form-item-control{
+								width: 400px;
+							}
+						}
+					}
+					.add-icon-class{
+						border: 1px solid #e5e9ed;
+						border-radius: 3px;
+						width: 26px;
+						height: 26px;
+						line-height: 26px;
+						text-align: center;
+						position: relative;
+						top: 7px;
+						cursor: pointer;
+						.form-icon{
+							
+						}
+					}
+				}
+				.content-item-right{
+					width: 25%;
+					height: auto;
+					max-height: 460px;
+					overflow-y: auto;
+					padding: 15px;
+					.step-title{
+						font-size: 16px;
+						font-weight: 500;
+						margin-bottom: 10px;
+					}
+				}
+				.boder-right{
+					border-right: 1px solid #e5e9ed;
+				}
+				.specimen-item{
+					display: flex;
+					margin-bottom: 10px;
+					.specimen-icon{
+						color: #64BD7B;
+						cursor: pointer;
+						font-size: 20px;
+						position: relative;
+						top: -4px;
+						left: 2px;
+					}
+				}
+			// }
+		}
+		.bottom-btn{
+			margin-top: 10px;
+			.btn-right{
+				margin-right: 10px;
+			}
+		}
+	}
+	
+}

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

@@ -0,0 +1,672 @@
+import { Component, ElementRef, Output, Input, OnInit, EventEmitter } from '@angular/core';
+import { HttpHeaders, HttpRequest, HttpClient  } from "@angular/common/http";
+import host from "../../../assets/js/http";
+import { NzMessageService } from "ng-zorro-antd";
+import { MainService } from '../../services/main.service';
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+import { format, startOfDay, endOfDay, subDays} from "date-fns";
+import { ToolService } from "../../services/tool.service";
+import { DomSanitizer } from '@angular/platform-browser';
+
+@Component({
+  selector: 'app-pathology-detail',
+  templateUrl: './pathology-detail.component.html',
+  styleUrls: ['./pathology-detail.component.less']
+})
+export class PathologyDetailComponent implements OnInit {
+	
+	@Output() pathologyCancel = new EventEmitter();
+	@Input() surgeryId: string;
+	@Input() patientId: string;
+	
+	constructor(
+		private http: HttpClient,
+		private message: NzMessageService,
+		private mainService: MainService,
+		private fb: FormBuilder,
+		private tool: ToolService,
+		private sanitizer: DomSanitizer
+	) { }
+	
+	specimenLookData:any=[
+		{
+			name:'通用-头颈部-口腔-黏膜活检',
+		},
+		{
+			name:'通用-头颈部-口腔-黏膜活检',
+		},
+		{
+			name:'通用-头颈部-口腔-黏膜活检',
+		},
+		{
+			name:'通用-头颈部-口腔-黏膜活检',
+		}
+	]
+	stepLength:any = 0;
+	btnLoading:boolean = false;
+	validateForm: FormGroup; //新增/编辑表单
+	validateSpecimenForm: FormGroup; //选择标本表单
+	validatePrintForm: FormGroup;
+	specimenData:any=[]; //标本类型
+	isDeptLoading:boolean = false;
+	specimenModal:boolean = false; //选择标本状态
+	isSpinning:boolean = false; //页面加载状态
+	detailsData:any;
+	specimenList:any=[]; //已选标本
+	placeIndex:any = null;
+	systemIndex:any = null;
+	apparatusIndex:any = null;
+	specimenNameIndex:any = null;
+	placeList:any=[]; //位置来源数据
+	systemList:any=[]; //系统数据
+	apparatusList:any=[]; //器官数据
+	specimenNameList:any=[]; //标本名称数据
+	promptContent: string; //操作提示框提示信息
+	ifSuccess: boolean; //操作成功/失败
+	promptInfo: string; //操作结果提示信息
+	promptModalShow: boolean; //操作提示框是否展示
+	specimenModalShow: boolean; //操作提示框是否展示
+	type:any = '未打印';
+	notModal:boolean = false;
+	hosId:any;
+	pathologyLogs:any //日志
+  ngOnInit() {
+		this.hosId = this.tool.getCurrentHospital().id;
+		// this.initForm()
+		this.fetchDataList()
+  }
+	
+	// 补打
+	submitPrint(){
+		let that = this
+		let data: any = {
+			pathologyForm:{
+				...this.detailsData,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" 
+			}
+		};
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO
+		delete data.pathologyForm.specimenGenre
+		this.printLoading = true;
+		this.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+		    let arr = res.data;
+		    if(arr.applyBarCode){
+		    	arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+		    }
+		    for(let i of arr.specimenList){
+		    	i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+		    }
+		    that.printLoading = false;
+		    that.printData = arr;
+		    setTimeout(() => {
+		      const printContent = document.getElementById("report");
+		      const WindowPrt = window.open("", "", "width=100,height=1000");
+		    	WindowPrt.document.body.innerHTML = printContent.innerHTML;
+		    	setTimeout(_=>{
+		    		WindowPrt.document.close();
+		    		WindowPrt.focus();
+		    		WindowPrt.print();
+		    		WindowPrt.close();
+		    		that.hideModal();
+		    	},500)
+		    }, 500);
+		  });
+	}
+	
+	// 返回
+	closeDetailMoadl(){
+		this.pathologyCancel.emit()
+	}
+	
+	// 初始化新增form表单
+	initForm() {
+		this.validateForm = this.fb.group({
+		  intraoperativeRapidity: [1, [Validators.required]],
+			specimenGenre: [null, [Validators.required]],
+			intraoperativeFindings: [null, [Validators.required]],
+			surgicalPlan: [null, [Validators.required]],
+			specimenNum: [null,[Validators.required]],
+			takePart: [null, [Validators.required]]
+		});
+	}
+	
+	// 获取详情
+	fetchDataList(){
+		let data = {
+		  idx: 0,
+		  sum: 9999,
+		  pathologyForm: {
+		    surgeryId: this.surgeryId || "",
+		    patientId: this.patientId || "",
+		    hosId: this.hosId || "" ,
+		  },
+		};
+		this.isSpinning = true;
+		this.mainService
+		  .getFetchDataList("data", "pathologyForm", data)
+		  .subscribe((data) => {
+		    this.isSpinning = false;
+		    this.detailsData = data.list[0];
+				this.pathologyLogs = data.list[0].formLogDTOS
+				this.stepLength = this.pathologyLogs.length
+				// if(this.detailsData.surgicalPlan){
+				// 	this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
+				// }
+				// if(this.detailsData.intraoperativeFindings){
+				// 	this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
+				// }
+				this.getSampleData()
+		  });
+	}
+	
+	// 获取标本类型
+	getDicData(){
+		this.mainService.getDictionary("list", "pathology_specimen_type").subscribe((res) => {
+			this.specimenData = res
+		});
+	}
+	
+	// 获取标本-位置来源
+	getSourceData(){
+		this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
+			this.placeList = res
+		});
+	}
+	
+	// 获取标本-系统
+	getSysData(){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 1,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.systemList = data.list;
+		  });
+
+	}
+	
+	// 获取标本-器官
+	getApparatusData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 2,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+				if(data.list.length>0){
+					this.apparatusList = data.list;
+					if(type=='edit'){
+						setTimeout(_=>{
+							let index3 = this.apparatusList.findIndex(i=>i.id==item.organ.id)
+							this.apparatusIndex = index3
+							this.apparatusId = Number(item.organ.id);
+						},100)
+					}
+				}else{
+					this.message.info('暂无数据')
+				}
+		  });
+	}
+	
+	// 获取标本-标本名称
+	getSpNameData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 3,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.specimenNameList = data.list;
+				this.specimenNameList.push({
+					name:'其他',
+					id:'qita'
+				})
+				if(type=='edit'){
+					if(item.sample){
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, [Validators.required]]
+						});
+						setTimeout(_=>{
+							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
+							this.specimenNameIndex = index4
+							this.specimenNameName = item.sample.name
+							this.specimenNameId = Number(item.sample.id);
+						},100)
+					}else{
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, [Validators.required]],
+							specimenName: [null, [Validators.required]]
+						});
+						this.specimenNameIndex = this.specimenNameList.length-1
+						this.specimenNameName = 'qita'
+						this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+					}
+					setTimeout(_=>{
+						this.validateSpecimenForm.controls.remark.setValue(item.remark);
+						this.specimenModal = true
+					},50)
+				}
+		  });
+	}
+	
+	// 删除标本
+	delModal:boolean = false
+	coopId:any;
+	specimenDel(e,item,index){
+		this.delModal = true
+		this.coopId = item.id
+	}
+	
+	// 确定删除
+	confirmDel(){
+		this.mainService
+		  .coopTypeConfig(
+		    "rmvData",
+		    "pathologySpecimen",
+		     [this.coopId]
+		  )
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.delModal = false;
+				this.getSampleData()
+		    if (data.status==200) {
+		      this.showSpecimenModal("删除", true, "");
+		    } else {
+		      this.showSpecimenModal("删除", false, data.data[0].msg);
+		    }
+		  });
+	}
+	// 确定删除
+	hideDelModal() {
+	  this.delModal = false;
+	}
+	
+	// 编辑标本
+	specimenDetailId:any = null;
+	specimenEdit(e,item,index){
+		this.specimenDetailId = item.id
+		let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
+		this.placeIndex = index1
+		this.placeId = Number(item.partSource.id)
+		let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
+		this.systemIndex = index2
+		this.systemId = Number(item.system.id)
+		this.getApparatusData(item.system.id,item,'edit')
+		this.getSpNameData(item.organ.id,item,'edit')
+	}
+	
+	// 选择标本
+	openSpecimen(){
+		this.validateSpecimenForm = this.fb.group({
+		  remark: [null, [Validators.required]]
+		});
+		this.specimenDetailId = null;
+		this.placeIndex = null;
+		this.systemIndex = null;
+		this.apparatusIndex = null;
+		this.specimenNameIndex = null;
+		this.placeId = null;
+		this.systemId = null;
+		this.apparatusId = null;
+		this.specimenNameId = null;
+		this.placeList=[]; //位置来源数据
+		this.systemList=[]; //系统数据
+		this.apparatusList=[]; //器官数据
+		this.specimenNameList=[]; //标本名称数据
+		this.getSourceData()
+		this.getSysData()
+		this.specimenModal = true
+	}
+	
+	// 选择位置来源
+	placeId:any = null;
+	placeClick(e,item,index){
+		this.placeId = item.id
+		this.placeIndex = index
+	}
+	
+	// 选择系统
+	systemId:any = null;
+	systemClick(e,item,index){
+		this.systemId = Number(item.id)
+		this.systemIndex = index
+		this.apparatusList = [];
+		this.apparatusId = null;
+		this.apparatusIndex = null;
+		this.getApparatusData(item.id,{},'select')
+	}
+	
+	// 选择器官
+	apparatusId:any = null;
+	apparatusClick(e,item,index){
+		this.apparatusId = Number(item.id)
+		this.apparatusIndex = index
+		this.specimenNameList = [];
+		this.specimenNameId = null;
+		this.specimenNameIndex = null;
+		this.getSpNameData(item.id,{},'select')
+	}
+	
+	// 选择标本名称
+	specimenNameId:any = null;
+	specimenNameName:any = null;
+	specimenNameClick(e,item,index){
+		this.specimenNameIndex = index
+		let remark = this.validateSpecimenForm.value.remark
+		if(item.id == 'qita'){
+			this.validateSpecimenForm = this.fb.group({
+			  remark: [remark?remark:null, [Validators.required]],
+				specimenName: [null, [Validators.required]]
+			});
+			this.specimenNameId = 'null'
+			this.specimenNameName = 'qita'
+		}else{
+			this.validateSpecimenForm = this.fb.group({
+			  remark: [remark?remark:null, [Validators.required]],
+			});
+			this.specimenNameId = item.id
+			this.specimenNameName = item.name
+		}
+	}
+	
+	// 保存标本
+	btnSpLoading:boolean = false;
+	submitSpecimen(){
+		if(this.placeIndex==null){
+			this.message.error('请选择位置来源')
+			return
+		}
+		if(this.systemIndex==null){
+			this.message.error('请选择系统')
+			return
+		}
+		if(this.apparatusIndex==null){
+			this.message.error('请选择器官')
+			return
+		}
+		if(this.specimenNameIndex==null){
+			this.message.error('请选择标本名称')
+			return
+		}
+		for (const i in this.validateSpecimenForm.controls) {
+		  this.validateSpecimenForm.controls[i].markAsDirty();
+		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateSpecimenForm.invalid) return;
+		let data = {
+			pathologyFormId:this.detailsData.id,
+			partSource:{
+				id:this.placeId
+			},
+			system:{
+				id:this.systemId
+			},
+			organ:{
+				id:this.apparatusId
+			},
+			sample:{
+				id:this.specimenNameId
+			},
+			hosId:this.hosId,
+			specimenName:null,
+			id:'',
+			remark:this.validateSpecimenForm.value.remark
+		};
+		if(this.specimenNameName == 'qita'){
+			delete data.sample
+			data.specimenName = this.validateSpecimenForm.value.specimenName
+		}else{
+			data.specimenName = this.specimenNameName
+		}
+		let queryType = null
+		if(this.specimenDetailId){
+			queryType = 'updData'
+			data.id = this.specimenDetailId
+		}else{
+			queryType = 'addData'
+			delete data.id
+		}
+		this.btnSpLoading = true;
+		this.mainService
+		  .simplePost(queryType, "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    this.btnSpLoading = false;
+		    if (res.status == 200) {
+		      this.showSpecimenModal("操作", true, "");
+		    } else {
+		      this.showSpecimenModal("操作", false, res.msg);
+		    }
+		  });
+	}
+	
+	// 获取标本列表
+	getSampleData(){
+		let data={
+			idx: 0,
+			sum: 9999,
+			pathologySpecimen:{
+				pathologyFormId:this.detailsData.id
+			}
+		}
+		this.mainService
+		  .getFetchDataList("data", "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    this.specimenList = res.list
+		  });
+	}
+	
+	hideSpecimenModal(){
+		this.specimenModal = false
+	}
+	
+	hideNotModal(){
+		this.notModal = false
+	}
+	
+	// 日期选择
+	startDate: string; //时间开始
+	formChangeDate(result?): void {
+	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		
+	}
+	
+	//未打印提交
+	printLoading:boolean = false;
+	submitPrintForm(): void{
+		for (const i in this.validatePrintForm.controls) {
+		  this.validatePrintForm.controls[i].markAsDirty();
+		  this.validatePrintForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validatePrintForm.invalid) return;
+		
+		let data: any = {
+			pathologyForm:{
+				...this.validateForm.value,
+				...this.detailsData,
+				inVitroTime:this.validatePrintForm.value.inVitroTime,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" ,
+				handoverUserId:this.handoverUserId,
+				specimenType:{
+					id:this.validateForm.value.specimenGenre
+				}
+			}
+		};
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO
+		delete data.pathologyForm.specimenGenre
+		this.printLoading = true;
+		this.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+				console.log(5555,res)
+				this.hideModal()
+		    this.printData = res.data;
+				this.printLoading = false;
+		    setTimeout(() => {
+		      const printContent = document.getElementById("report");
+		      const WindowPrt = window.open("", "", "width=100,height=1000");
+		      WindowPrt.document.write(printContent.innerHTML);
+		      WindowPrt.document.close();
+		      WindowPrt.focus();
+		      WindowPrt.print();
+		      WindowPrt.close();
+		    }, 500);
+		  });
+	}
+	
+	// 监听工号数据
+	handoverUserId:any = null;
+	numberChange(e){
+		if(e.length < 3) {
+			this.validatePrintForm.controls.name.setValue('');
+			return
+		}
+		let data = {
+		  idx: 0,
+		  sum: 9999,
+		  user: {
+		    account: e || "",
+		    hospital: { id: this.hosId || "" }
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "user", data)
+		  .subscribe((data) => {
+				if(data.list.length>0){
+					this.validatePrintForm.controls.name.setValue(data.list[0].name);
+					this.handoverUserId = data.list[0].id
+				}else{
+					this.validatePrintForm.controls.name.setValue('');
+					this.handoverUserId =null
+				}
+		  });
+	}
+	
+	printData:any;
+	submitForm(): void{
+		var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+		if(this.detailsData.status.name=='未打印'){
+			this.notModal = true
+			this.validatePrintForm = this.fb.group({
+			  inVitroTime: [null, [Validators.required]],
+				jobNumber: [null, [Validators.required]],
+				name:[null, [Validators.required]],
+			});
+			let date = new Date();
+			this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
+			this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
+			return
+		}
+
+		let data: any = {
+			pathologyForm:{
+				...this.validateForm.value,
+				...this.detailsData,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" ,
+				specimenType:{
+					id:this.validateForm.value.specimenGenre
+				}
+			}
+		};
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO 
+		delete data.pathologyForm.specimenGenre 
+		that.btnLoading = true;
+		that.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+				this.hideModal()
+				let arr = res.data;
+		    that.printData = arr;
+				that.btnLoading = false;
+		    setTimeout(() => {
+		      const printContent = document.getElementById("report");
+		      const WindowPrt = window.open("", "", "width=100,height=1000");
+		      WindowPrt.document.write(printContent.innerHTML);
+		      WindowPrt.document.close();
+		      WindowPrt.focus();
+		      WindowPrt.print();
+		      WindowPrt.close();
+					
+		    }, 500);
+		  });
+	}
+	
+	// 关闭标本
+	closeSpecimenModel(){
+		this.getSampleData()
+		this.hideSpecimenModal()
+	}
+	
+	closeModel(){
+		this.hideModal()
+	}
+	hideModal(){
+		this.pathologyCancel.emit()
+	}
+	
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
+	
+	showSpecimenModal(con, success, promptInfo?) {
+	  this.specimenModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.specimenModalShow = true;
+	  }, 100);
+	}
+}
+

src/app/share/share.module.ts

@@ -55,6 +55,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
 import { InspectionExecuteDetailComponent } from './inspection-execute-detail/inspection-execute-detail.component';
 import { wangEditorComponent } from './wang-editor/wang-editor.component';
 import { PathologyAddComponent } from './pathology-add/pathology-add.component';
+import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
 
 @NgModule({
   declarations: [
@@ -86,6 +87,7 @@ import { PathologyAddComponent } from './pathology-add/pathology-add.component';
     InspectionExecuteDetailComponent,
 		wangEditorComponent,
 		PathologyAddComponent,
+		PathologyDetailComponent,
     DateTransformPipe,
     DataToNamePipe,
     DialogDeleteComponent,
@@ -150,6 +152,7 @@ import { PathologyAddComponent } from './pathology-add/pathology-add.component';
     InspectionExecuteDetailComponent,
 		wangEditorComponent,
 		PathologyAddComponent,
+		PathologyDetailComponent,
     CommonModule,
     NgZorroAntdModule,
     FormsModule,

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

@@ -3956,4 +3956,7 @@
 
 <!-- 病理申请单 -->
 
-<app-pathology-add *ngIf="pathologyModal" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
+<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryWKOMsg.id" [patientId]="surgeryWKOMsg.patientDTO.id" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
+
+<!-- 病理详情 -->
+<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryWKOMsg.id" [patientId]="surgeryWKOMsg.patientDTO.id" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -165,6 +165,7 @@ export class HushijiandanComponent implements OnInit {
   orderListTimeConst = 60; //工单列表自动刷新秒数
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
 	pathologyModal:boolean = false; //病理申请单
+	pathologyDetailModal:boolean = false; //病理详情
   // 初始化权限按钮
   coopBtns: any = {};
 
@@ -308,7 +309,28 @@ export class HushijiandanComponent implements OnInit {
 	
 	// 病理申请单
 	pathologyAdd(e){
-		this.pathologyModal = true
+	let data = {
+		idx: 0,
+		sum: 9999,
+		pathologyForm: {
+			surgeryId: this.surgeryWKOMsg.id || "",
+			patientId: this.surgeryWKOMsg.patientDTO.id || "",
+			hosId: this.currentHospital.id || "" ,
+		},
+	};
+	this.mainService
+		.getFetchDataList("data", "pathologyForm", data)
+		.subscribe((data) => {
+			if(data.list[0].status.value==1){
+				this.pathologyModal = true
+			}else{
+				this.pathologyDetailModal = true
+			}
+		});
+	}
+	
+	pathologyDetailCancel(){
+		this.pathologyDetailModal = false
 	}
 	
 	pathologyCancel(){

src/app/views/specimen-room-view/specimen-room-view.component.html

@@ -57,7 +57,7 @@
             placeholder="请输入关键字"
             [(ngModel)]="printPharmacySearchKey"
           />
-          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('delegation')">
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('surgeryDept')">
             <i nz-icon nzType="search"></i>
             <span>搜索</span>
           </div>
@@ -70,23 +70,23 @@
           <div
             class="pharmacy-main__selection noPointer"
             *ngFor="let item of printPharmacyList"
-						(click)="viewDetail(item)"
+						(click)="viewDetail(item,1)"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
                 <span title="住院号" class="weight">
-									<span class="sign-red">速冻</span>
-									{{item.code || '无'}}
+									<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+									{{item.applyCode || '无'}}
 								</span>
-                <span title="姓名" class="weight">{{item.name || '无'}}</span>
+                <span title="姓名" class="weight">{{item.patientDTO.patientName || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span title="部位">部位：{{item.bw || '无'}}</span>
-                <span title="标本数">标本数：{{item.bbs || '无'}}</span>
+                <span title="部位">部位：{{item.takePart || '无'}}</span>
+                <span title="标本数">标本数：{{item.specimenNum || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span title="手术间">手术间：{{item.ssj || '无'}}</span>
-                <span title="离体时间">离体时间：{{item.time || '无'}}</span>
+                <span title="手术间">手术间：{{item.surgeryDeptDTO.dept || '无'}}</span>
+                <span title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
               </div>
             </div>
           </div>
@@ -146,7 +146,7 @@
             placeholder="请输入关键字"
             [(ngModel)]="waitPharmacySearchKey"
           />
-          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('take')">
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('specimenDept')">
             <i nz-icon nzType="search"></i>
             <span>搜索</span>
           </div>
@@ -157,14 +157,25 @@
       <overlay-scrollbars #osComponentRef2 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading2" style="height: 100%">
           <div
-            (click)="showOrderList(item)"
             class="pharmacy-main__selection"
             *ngFor="let item of waitPharmacyList; let i = index"
+						(click)="viewDetail(item,2)"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span title="执行人姓名">{{item.userName || '无'}}</span>
-                <span title="工单数量">{{item.orderNum || '无'}}</span>
+                <span title="住院号" class="weight">
+            			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+            			{{item.applyCode || '无'}}
+            		</span>
+                <span title="姓名" class="weight">{{item.patientDTO.patientName || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="部位">部位：{{item.takePart || '无'}}</span>
+                <span title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+								<span title="固定时间">固定时间：{{item.fixationTime?(item.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
               </div>
             </div>
           </div>
@@ -224,7 +235,7 @@
             placeholder="请输入关键字"
             [(ngModel)]="pharmacySearchKey"
           />
-          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('trans')">
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('leavedDept')">
             <i nz-icon nzType="search"></i>
             <span>搜索</span>
           </div>
@@ -235,15 +246,30 @@
       <overlay-scrollbars #osComponentRef3 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading3" style="height: 100%">
           <div
-            (click)="showSpeList(item)"
             class="pharmacy-main__selection"
             *ngFor="let item of pharmacyList; let i = index"
+						(click)="viewDetail(item,3)"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span title="检验科室名称" class="moreContent left">{{item.check_dept || '无'}}</span>
-                <span title="配送标本数量">{{item.count || '无'}}</span>
+                <span title="住院号" class="weight">
+            			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+            			{{item.applyCode || '无'}}
+            		</span>
+                <span title="姓名" class="weight">{{item.patientDTO.patientName || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="部位">部位：{{item.takePart || '无'}}</span>
+                <span title="标本数">标本数：{{item.specimenNum || '无'}}</span>
               </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+            		<span title="固定时间">固定时间：{{item.fixationTime?(item.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+              </div>
+							<div class="pharmacy-main__selectionItem">
+							  <span title="配送人">配送人：{{item.deliveryUserDTO?item.deliveryUserDTO.name:'无'}}</span>
+								<span title="离科时间">离科时间：{{item.leaveDeptTime?(item.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+							</div>
             </div>
           </div>
           <div
@@ -384,11 +410,8 @@
 					<nz-input-group>
 						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择标本间" formControlName="specimen">
 							<ng-container *ngFor="let option of specimenData">
-								<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+								<nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
 							</ng-container>
-							<nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
-								<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-							</nz-option>
 						</nz-select>
 					</nz-input-group>
 				</nz-form-control>
@@ -400,11 +423,8 @@
 					<nz-input-group>
 						<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择请选择手术间" formControlName="operation">
 							<ng-container *ngFor="let option of operationData">
-								<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+								<nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
 							</ng-container>
-							<nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
-								<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-							</nz-option>
 						</nz-select>
 					</nz-input-group>
 				</nz-form-control>
@@ -436,72 +456,66 @@
 		<div class="content">
 			<div class="content-item boder-right">
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>是</div>
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{codeData.intraoperativeRapidity==1?'是':'否'}}</div>
 				</div>
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">申请单编号：</span>1008611</div>
-					<div class="form-title"><span class="font-weight-500">状态：</span>未打印</div>
+					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{codeData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{codeData.status.name}}</div>
 				</div>
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">科室名称：</span>科室111</div>
-					<div class="form-title"><span class="font-weight-500">住院号：</span>008622</div>
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{codeData.patientDTO.department.dept}}</div>
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{codeData.patientDTO.patientCode}}</div>
 				</div>
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">患者信息：</span>张三</div>
-					<div class="form-title"><span class="font-weight-500">年龄：</span>18</div>
+					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{codeData.patientDTO.patientName}} ({{codeData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{codeData.patientDTO.age||'-'}}岁</div>
 				</div>
 				<div class="form-list">
 					<div class="form-title font-weight-500">诊断：</div>
-					<div>
-						<div>1.有病</div>
-						<div>2.有病</div>
+					<div class="indent">
+						{{codeData.diagnose||'无'}}
 					</div>
 				</div>
 				
 				<div class="form-list">
 					<div class="form-title font-weight-500">病理摘要：</div>
-					<div>患者因“胆囊息肉4月余”于2024-08-05入院。
-					患者4月前我院彩超提示胆囊息肉,大小约1.3*cds  0.7cm,无腹痛腹胀，无恶心呕吐，无发热，无胸闷、无返酸，无呕血、黑便，无腹泻，无尿频、尿急、尿痛。未进一步处理,今患者再次来我院,要求进一步治疗住院，</div>
+					<div class="indent">{{codeData.medicalRecords||'无'}}</div>
 				</div>
 				<div class="form-list">
 					<div class="form-title font-weight-500">手术方案：</div>
-					<div>患者因“胆囊息肉4月余”于2024-08-05入院。
-					患者4月前我院彩超提示胆囊息肉,大小约1.3*cds  0.7cm,无腹痛腹胀，无恶心呕吐，无发热，无胸闷、无返酸，无呕血、黑便，无腹泻，无尿频、尿急、尿痛。未进一步处理,今患者再次来我院,要求进一步治疗住院，</div>
+					<div class="indent">{{codeData.surgicalPlan||'无'}}</div>
 				</div>
 				<div class="form-list">
 					<div class="form-title font-weight-500">术中所见：</div>
-					<div>患者因“胆囊息肉4月余”于2024-08-05入院。
-					患者4月前我院彩超提示胆囊息肉,大小约1.3*cds  0.7cm,无腹痛腹胀，无恶心呕吐，无发热，无胸闷、无返酸，无呕血、黑便，无腹泻，无尿频、尿急、尿痛。未进一步处理,今患者再次来我院,要求进一步治疗住院，</div>
+					<div class="indent">{{codeData.intraoperativeFindings||'无'}}</div>
 				</div>
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">标本类型：</span>张三</div>
-					<div class="form-title"><span class="font-weight-500">标本件数：</span>18</div>
-					<div class="form-title"><span class="font-weight-500">采取部位：</span>张三</div>
+					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{codeData.specimenType.name||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本件数：</span>{{codeData.specimenNum||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">采取部位：</span>{{codeData.takePart||'无'}}</div>
 				</div>
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">取标本位置：</span>张三</div>
-					<div class="form-title"><span class="font-weight-500">取材医生：</span>18</div>
+					<div class="form-title"><span class="font-weight-500">取标本位置：</span>{{codeData.surgeryDeptDTO?codeData.surgeryDeptDTO.dept:''}}</div>
+					<div class="form-title"><span class="font-weight-500">取材医生：</span>{{codeData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
 				</div>
-				<div class="form-list">
+	<!-- 			<div class="form-list">
 					<div class="form-title font-weight-500">标本：</div>
 					<div>标本1</div>
 					<div>标本2</div>
-				</div>
+				</div> -->
 			</div>
 			
 			<div class="content-item">
-				<div class="center">提示：申请单含2只标本，已扫1只，请继续扫描标本。</div>
+				<div class="center">提示：申请单含<span class="red">{{codeData.specimenNum}}</span>只标本，已扫<span class="red">{{codeData.pathologySpecimenDTOList.length}}</span>只<span *ngIf="codeData.pathologySpecimenDTOList.length < codeData.specimenNum">，请继续扫描标本。</span></div>
 				<div class="disp-fl">
 					<div class="width-120">标本条码：</div>
-					<!-- <nz-input-group autofocus> -->
-						<input nz-input id="specimen" [(ngModel)]="specimenCode" />
-					<!-- </nz-input-group> -->
+					<input nz-input id="specimen" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
 				</div>
 				<div class="list-template">
 				  <div class="list-template__content">
 						<div class="list-template__bottom" style="padding: 0 !important;">
-							<nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
-								[nzLoading]="loading1">
+							<nz-table class="list-template__nzTable" [nzData]="codeData.pathologySpecimenDTOList" nzSize="middle" [nzShowPagination]="false"
+								[nzLoading]="tableLoading">
 								<thead>
 									<tr class="thead">
 										<th nzWidth="10%">序号</th>
@@ -510,10 +524,15 @@
 									</tr>
 								</thead>
 								<tbody>
-									<tr *ngFor="let data of listOfData let index = index">
+									<tr *ngFor="let data of codeData.pathologySpecimenDTOList let index = index">
 										<td>{{index+1}}</td>
-										<td>{{ data.code}}</td>
-										<td>{{ data.name}}</td>
+										<td>{{ data.specimenCode}}</td>
+										<td>
+											{{data.partSource?data.partSource.name:''}} <span *ngIf="data.system">-</span>
+											{{data.system?data.system.name:''}} <span *ngIf="data.organ">-</span>
+											{{data.organ?data.organ.name:''}} <span *ngIf="data.sample">-</span>
+											{{data.sample?data.sample.name:''}}
+										</td>
 									</tr>
 								</tbody>
 							</nz-table>
@@ -523,7 +542,7 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button>
+			<button class="btn btn-right" [disabled]="codeData.specimenNum != codeData.pathologySpecimenDTOList.length" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
 		</div>
 	</div>
@@ -531,20 +550,20 @@
 
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo" (closeModel)="closeModel"></app-prompt-modal>
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
 	
-<!-- 标本核验 -->
+<!-- 标本固定信息 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="verificationMoadl">
 	<div class="modalBody no-width">
-		<div class="title">标本核验<i class="icon_transport transport-guanbi" (click)="hideVerificationModal()"></i>
+		<div class="title">标本固定信息<i class="icon_transport transport-guanbi" (click)="hideVerificationModal()"></i>
 		</div>
 		<div class="content">
 			<form nz-form [formGroup]="validateVerificationForm" class="addForm" (ngSubmit)="submitVerificationForm()">
 				<nz-form-item>
-				  <nz-form-label nzRequired [nzSpan]="6" nzFor="time">固定时间</nz-form-label>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
 				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择固定时间!">
 				    <nz-input-group>
-							<nz-date-picker formControlName="time" 
+							<nz-date-picker formControlName="fixationTime" 
 							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
 							(ngModelChange)="formChangeDate($event)"></nz-date-picker>
 						</nz-input-group>
@@ -553,7 +572,7 @@
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="jobNumber">工号</nz-form-label>
 					<nz-form-control [nzSpan]="18" nzErrorTip="请输入工号!">
-						<input nz-input (input)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+						<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
@@ -568,11 +587,8 @@
 				    <nz-input-group>
 							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择固体液类型" formControlName="fixative">
 							  <ng-container *ngFor="let option of fixativeData">
-							    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 							  </ng-container>
-							  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
-							    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-							  </nz-option>
 							</nz-select>
 						</nz-input-group>
 				  </nz-form-control>
@@ -580,8 +596,106 @@
 			</form>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="submitVerificationForm()" [nzLoading]="btnLoading">确定</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitVerificationForm()" [nzLoading]="btnInfoLoading">确定</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideVerificationModal()">取消</button>
 		</div>
 	</div>
+</div>
+
+<!-- 标本查看详情-->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="detailMoadl">
+	<div class="pathology-content">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+		<div class="content">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<div class="form-title width-150"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+					<div class="form-title width-200"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title width-150"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<div class="form-title width-200"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
+				</div>
+
+				<div class="form-list">
+					<div class="form-title font-weight-500">诊断：</div>
+					<div class="indent">
+						{{detailsData.diagnose||'无'}}
+					</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">病理摘要：</div>
+					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">手术方案：</div>
+					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">术中所见：</div>
+					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
+				</div>
+
+				<div class="form-title-box">
+					<div class="form-title width-150"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+					<div class="form-title width-200"><span class="font-weight-500">标本件数：</span>{{detailsData.specimenNum||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">采取部位：</span>{{detailsData.takePart||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">标本：</div>
+					<div class="form-title specimen-list">
+						<div *ngFor="let item of specimenList" class="specimen-item-class">
+							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
+							{{item.sample?item.sample.name:''}}
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+			<div class="content-item-right">
+				<div class="step-title">病理闭环</div>
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;">{{item.operationType.name}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
+		</div>
+	</div>
+</div>
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
 </div>

src/app/views/specimen-room-view/specimen-room-view.component.less

@@ -273,7 +273,7 @@
           display: flex;
           cursor: pointer;
           &.noPointer{
-            cursor: default;
+            cursor: pointer;
           }
           &.pharmacy-main__selection--more {
             color: @primary-color;
@@ -657,8 +657,8 @@
 					height: auto;
 					max-height: 460px;
 					overflow-y: auto;
-					flex: 1;
-					padding: 0 15px;
+					width: 75%;
+					padding: 15px;
 					.form-title-box{
 						display: flex;
 						margin-bottom: 10px;
@@ -666,6 +666,12 @@
 							color: #333;
 							margin-right: 40px;
 						}
+						.width-150{
+							width: 150px;
+						}
+						.width-200{
+							width: 200px;
+						}
 					}
 					.center{
 						text-align: center;
@@ -683,6 +689,18 @@
 					}
 					.form-list{
 						margin-bottom: 10px;
+						.specimen-list{
+							display: flex;
+							flex-wrap: wrap;
+							.specimen-item-class{
+								margin-right: 40px;
+								color:#333;
+							}
+						}
+						.indent{
+							text-indent: 2ch;
+							color: #333;
+						}
 					}
 					.ant-form-item {
 					  margin-bottom: 14px;
@@ -713,6 +731,18 @@
 						}
 					}
 				}
+				.content-item-right{
+					width: 25%;
+					height: auto;
+					max-height: 460px;
+					overflow-y: auto;
+					padding: 10px;
+					.step-title{
+						font-size: 16px;
+						font-weight: 500;
+						margin-bottom: 10px;
+					}
+				}
 				.boder-right{
 					border-right: 1px solid #e5e9ed;
 				}
@@ -738,4 +768,20 @@
 		}
 	}
 	
+}
+
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
 }

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -4,6 +4,10 @@ import { Router } from "@angular/router";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { startOfDay, format, endOfDay } from "date-fns";
 import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from "ng-zorro-antd";
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+
 import {
   FormBuilder,
   Validators,
@@ -47,44 +51,27 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	public router: Router, 
 	public tool: ToolService,
 	private fb: FormBuilder,
+	private message: NzMessageService,
 	) {}
   // 今日药单量
   todayTotal: undefined;
   // 今日已完成
   todayComplete: undefined;
-  //待配药数据
-  // 待配药
-  printPharmacyList = [
-		{
-			code:'222',
-			name:'张珊',
-			bw:'肺部',
-			bbs:'8',
-			ssj:'手术间5',
-			time:'08-15 10:00'
-		},
-		{
-			code:'222',
-			name:'张珊',
-			bw:'肺部',
-			bbs:'8',
-			ssj:'手术间5',
-			time:'08-15 10:00'
-		},
-	]; //数据列表
+  //手术间数据
+  printPharmacyList = []; //数据列表
   printPharmacyIdx = 0; //页码
   printPharmacyTotal = 0; //总数
   printPharmacyFlag = false; //是否查看更多
   printPharmacySearchKey = ""; //搜索的内容
   printPharmacyLoad = false; //按钮的loading
-  // 配药中列表
+  // 标本间列表
   waitPharmacyList = [];
   waitPharmacyIdx = 0;
   waitPharmacyTotal = 0;
   waitPharmacyFlag = false;
   waitPharmacySearchKey = "";
   waitPharmacyLoad = false;
-  // 核对中列表
+  // 今日离科列表
   pharmacyList = [];
   pharmacyIdx = 0;
   pharmacyTotal = 0;
@@ -126,32 +113,33 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOfData:any=[
-		{
-			code:'222',
-			name:'张珊',
-		},
-	]; 
+	listOfData:any=[]; 
 	fixativeData:any = []; //固体液类型
+	hosId:any;
+	userId:any;
+	detailsData:any;
+	isSpinning:boolean = false; //全屏加载状态
+	codeData:any; //标本条码数据
+	btnInfoLoading :boolean = false; //标本加固加载
+	changeInpSubject = new Subject(); //防抖
   ngOnDestroy() {
     clearTimeout(this.timer);
     clearTimeout(this.logTimer);
   }
 
   ngOnInit() {
+		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.tableLoading = true
+		  this.searchSpecimenData(v[0])
+		});
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.userId = this.tool.getCurrentUserId()
     this.runTime();
     // 统计
     this.total();
-		
-		this.setSpecimen()
+		this.getDept()
     // 切换科室
     // this.changeKs();
-    // 手术间列表
-    // this.getPharmacyList(this.printPharmacyIdx, 'delegation', this.printPharmacySearchKey);
-    // // 标本间列表
-    // this.getPharmacyList(this.waitPharmacyIdx, 'take', this.waitPharmacySearchKey);
-    // // 今日离科标本列表
-    // this.getPharmacyList(this.pharmacyIdx, 'trans', this.pharmacySearchKey);
 
     this.initRole();
     // 自动刷新倒计时 start
@@ -167,33 +155,129 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     }, 500);
   }
 	
-	// 标本搜索
+	// 标本条码搜索
 	searchSpecimen(){
-		this.fixationModal = true
-		setTimeout(_=>{
-			document.getElementById('specimen').focus();
-		},200)
+		if(!this.barCode){
+			this.message.error('请输入标本条码')
+			return
+		}
+		let data={
+			barcode:this.barCode
+		}
+		this.isSpinning = true
+		clearInterval(this.logTimer);
+		this.mainService.pathologyScanCode(data)
+		.subscribe((res:any) => {
+			this.isSpinning = false
+			if(res.status==200){
+				this.codeData = res.data[0]
+				this.fixationModal = true
+				setTimeout(_=>{
+					document.getElementById('specimen').focus();
+				},200)
+			}else{
+				this.message.error(res.msg)
+			}
+		})
 	}
 	
 	// 确定接受固定标本
 	startDate:any;
 	submitFixationForm(){
 		this.validateVerificationForm = this.fb.group({
-		  time: [null, [Validators.required]],
+		  fixationTime: [null, [Validators.required]],
 			jobNumber: [null, [Validators.required]],
 			name:[null, [Validators.required]],
-			immobilization:[null, [Validators.required]],
+			fixative:[null, [Validators.required]],
 		});
 		let date = new Date();
 		this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-		this.validateVerificationForm.controls.time.setValue(this.startDate);
-		this.verificationMoadl = true
-		// this.fixationModal = false
+		this.validateVerificationForm.controls.fixationTime.setValue(this.startDate);
+		this.btnLoading = true
+		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
+			this.fixativeData = res
+			this.btnLoading = false
+			this.verificationMoadl = true
+		});
 	}
 	
 	// 关闭接受固定标本
 	hideSpecimenModal(){
-		this.fixationModal = false
+		this.autoUpdate()
+		this.barCode = null;
+		this.specimenCode = null;
+		this.fixationModal = false;
+	}
+	
+	// 获取标本详情
+	getSampleData(item){
+		this.mainService.getFetchData("data", "pathologyForm", item.id)
+		.subscribe((data) => {
+			this.isSpinning = false
+			this.detailsData = data.data
+		  this.specimenList = data.data.pathologySpecimenDTOList||[]
+			this.pathologyLogs = data.data.formLogDTOS
+			this.stepLength = this.pathologyLogs.length
+		  this.detailMoadl = true
+		});
+	}
+	
+	// 获取科室
+	getDept(){
+		this.setSpecimen()
+		var that = this;
+		that.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			let item1 = res2.find(i=>i.name=='手术室科室')
+			let item2 = res2.find(i=>i.name=='标本间科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: that.hosId || "" },
+			    type: { id: item1.id || "" },
+			  },
+			};
+			let data2 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: that.hosId || "" },
+			    type: { id: item2.id || "" },
+			  },
+			};
+			that.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+			    that.operationData = res.list;
+			  });
+				
+			that.mainService
+			  .getFetchDataList("data", "department", data2)
+			  .subscribe((res) => {
+					that.specimenData = res.list
+					this.getDeptDetail()
+			  });
+		});
+	}
+	
+	// 获取关联科室详情
+	getDeptDetail(){
+		this.mainService
+		  .transfusionPrint("user", this.userId)
+		  .subscribe((res) => {
+				let data = res.data;
+				if(data.surgeryDepts){
+					let deptArr = []
+					for(let i of data.surgeryDepts){
+						deptArr.push(i.id)
+					}
+					this.validateForm.controls.operation.setValue(deptArr);
+				}
+				this.validateForm.controls.specimen.setValue(data.dept.id);
+				if(data.autoCreateOrder){
+					this.validateForm.controls.generate.setValue(data.autoCreateOrder);
+				}
+		  });
 	}
 	
 	// 获取是否关联标本间
@@ -201,37 +285,173 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.validateForm = this.fb.group({
 		  specimen: [null, [Validators.required]],
 			operation: [null, [Validators.required]],
-			generate:[null, [Validators.required]],
+			generate:[1, [Validators.required]],
 		});
 		this.relevanceModal = true
 	}
 	
+	// 确定关联科室
+	btnLoading:boolean = false;
 	submitForm(){
-		// for (const i in that.validateForm.controls) {
-		//   that.validateForm.controls[i].markAsDirty();
-		//   that.validateForm.controls[i].updateValueAndValidity();
-		// }
-		// if (that.validateForm.invalid) return;
-		this.relevanceModal = false
+		for (const i in this.validateForm.controls) {
+		  this.validateForm.controls[i].markAsDirty();
+		  this.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateForm.invalid) return;
+		let deptArr = this.validateForm.value.operation.join(',')
+		let data = {
+		  user: {
+		    autoCreateOrder: this.validateForm.value.generate,
+				dept:{
+					id:this.validateForm.value.specimen
+				},
+				surgeryDeptIds:deptArr,
+				id:this.userId
+		  },
+		};
+		this.btnLoading = true
+		this.mainService
+		  .coopData("updData", "user", data)
+		  .subscribe((data) => {
+				// 手术间列表
+				this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
+				// 标本间列表
+				this.getPharmacyList(this.waitPharmacyIdx, 'specimenDept', this.waitPharmacySearchKey);
+				// 今日离科标本列表
+				this.getPharmacyList(this.pharmacyIdx, 'leavedDept', this.pharmacySearchKey);
+				this.btnLoading = false
+				this.relevanceModal = false
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
 	}
 	
 	// 输入工号查询姓名
+	handoverUserId:any = null;
 	numberChange(e){
-		
+		if(e.length < 3) {
+			this.validateVerificationForm.controls.name.setValue('');
+			return
+		}
+		let data = {
+			idx: 0,
+			sum: 9999,
+			user: {
+				account: e || "",
+				hospital: { id: this.hosId || "" }
+			},
+		};
+		this.mainService
+			.getFetchDataList("data", "user", data)
+			.subscribe((data) => {
+				if(data.list.length>0){
+					this.validateVerificationForm.controls.name.setValue(data.list[0].name);
+					this.handoverUserId = data.list[0].id
+				}else{
+					this.validateVerificationForm.controls.name.setValue('');
+					this.handoverUserId =null
+				}
+			});
 	}
 	
 	// 提交固定标本接收
 	submitVerificationForm(){
-		// for (const i in that.validateForm.controls) {
-		//   that.validateForm.controls[i].markAsDirty();
-		//   that.validateForm.controls[i].updateValueAndValidity();
-		// }
-		// if (that.validateForm.invalid) return;
-		this.hideVerificationModal()
+		for (const i in this.validateVerificationForm.controls) {
+		  this.validateVerificationForm.controls[i].markAsDirty();
+		  this.validateVerificationForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateVerificationForm.invalid) return;
+		
+		let data: any = {
+			id:this.codeData.id,
+			specimenDeptId:this.validateForm.value.specimen,
+			specimenFixingLiquid:{
+				id:this.validateVerificationForm.value.fixative
+			},
+			fixationTime:this.validateVerificationForm.value.fixationTime,
+			hosId: this.hosId || "" ,
+			handoverUserId:this.handoverUserId
+		};
+		this.btnInfoLoading = true;
+		this.mainService
+		.simplePost("addData", "pathologyForm", data)
+		.subscribe((res) => {
+			this.autoUpdate(false)
+			this.btnInfoLoading = false;
+			this.barCode = null;
+			// 手术间列表
+			this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
+			// 标本间列表
+			this.getPharmacyList(this.waitPharmacyIdx, 'specimenDept', this.waitPharmacySearchKey);
+			// 今日离科标本列表
+			this.getPharmacyList(this.pharmacyIdx, 'leavedDept', this.pharmacySearchKey);
+			if (res.status == 200) {
+				this.showPromptModal("操作", true, "");
+			} else {
+				this.showPromptModal("操作", false, res.msg);
+			}
+		});
+	}
+	
+	closeModel(){
+		this.verificationMoadl = false
+		this.fixationModal = false
 	}
+	
+	// 关闭固定接受标本
 	hideVerificationModal(){
 		this.verificationMoadl = false
 	}
+	
+	// 监听接受固定标本条码
+	tableLoading:boolean = false;
+	codeChange(e){
+		this.changeInpSubject.next([e]);
+	}
+	
+	searchSpecimenData(e){
+		this.mainService.pathologyScanCode({
+			barcode:e,
+			pathologyFormId:this.codeData.id
+		})
+		.subscribe((res:any) => {
+			this.autoUpdate(false)
+			this.tableLoading = false
+			this.specimenCode = null
+			if(res.status==200){
+				this.codeData = res.data[0]
+			}else{
+				this.message.error(res.msg)
+			}
+		})
+	}
+	
+	// 查看详情
+	detailMoadl:boolean = false;
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	viewDetail(item,type){
+		this.isSpinning = true
+		this.getSampleData(item)
+		clearInterval(this.logTimer);
+		if(type==1){
+			
+		}else if(type==2){
+			
+		}else{
+			
+		}
+	}
+	
+	closeDetailMoadl(){
+		this.detailMoadl = false
+		this.autoUpdate(false);
+	}
+	
   // 统计
   total() {
     let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
@@ -255,10 +475,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     console.log(item);
     this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
   }
-	// 查看详情
-	viewDetail(item){
-		
-	}
 	
   // 查看流程信息弹窗
   logPromptModalShow = false; //弹窗开关
@@ -312,15 +528,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       if (this.logTime === 0) {
         this.logTime = this.logTimeConst;
         // 代收急查标本（标本信息）列表
-        // this.getPharmacyList(0, 'delegation', this.printPharmacySearchKey);
-        // // 已收取（工单信息）列表
-        // this.getPharmacyList(0, 'take', this.waitPharmacySearchKey);
-        // // 中转标本（标本统计信息）列表
-        // this.getPharmacyList(0, 'trans', this.pharmacySearchKey);
-        // // 中转配送中（工单信息）列表
-        // this.getPharmacyList(0, 'trans_send', this.distributionSearchKey);
-        // // 异常标本（标本信息）列表
-        // this.getPharmacyList(0, 'error', this.completedSearchKey);
+        this.getPharmacyList(0, 'surgeryDept', this.printPharmacySearchKey);
+        // 已收取（工单信息）列表
+        this.getPharmacyList(0, 'specimenDept', this.waitPharmacySearchKey);
+        // 中转标本（标本统计信息）列表
+        this.getPharmacyList(0, 'leavedDept', this.pharmacySearchKey);
+
       }
     }, 1000);
   }
@@ -335,144 +548,97 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   getPharmacyList(idx, type, searchKey) {
     let hosId = JSON.parse(localStorage.getItem("user")).user.currentHospital.id;
     switch (type) {
-      case 'delegation':
+      case 'surgeryDept':
         this.loading1 = true;
         break;
-      case 'take':
+      case 'specimenDept':
         this.loading2 = true;
         break;
-      case 'trans':
+      case 'leavedDept':
         this.loading3 = true;
         break;
-      case 'trans_send':
-        this.loading4 = true;
-        break;
-      case 'error':
-        this.loading5 = true;
-        break;
     }
     let postData = {
-      viewType: type,
-      keyWord: searchKey,
-      hosId,
+			idx: 0,
+			sum: 9999,
+			pathologyForm:{
+				detailsType: type,
+				keyWords:searchKey,
+				hosId,
+			}
     };
     this.mainService
-      .specimenView2(postData)
+      .getFetchDataList("data", "pathologyForm", postData)
       .subscribe((result) => {
         switch (type) {
-          case 'delegation':
+          case 'surgeryDept':
             this.loading1 = false;
             break;
-          case 'take':
+          case 'specimenDept':
             this.loading2 = false;
             break;
-          case 'trans':
+          case 'leavedDept':
             this.loading3 = false;
             break;
-          case 'trans_send':
-            this.loading4 = false;
-            break;
-          case 'error':
-            this.loading5 = false;
-            break;
         }
-        if (result["state"] == 200) {
+        if (result["status"] == 200) {
           switch (type) {
-            case 'delegation':
+            case 'surgeryDept':
               // 总数
               this.printPharmacyTotal = result.totalNum;
               // 隐藏按钮的loading
               this.printPharmacyLoad = false;
               // 查看更多，是否显示
-              if (result["data"].length < 10) {
+              if (result["list"].length < 10) {
                 this.printPharmacyFlag = false;
-              } else if (result["data"].length === 0 && idx === 0) {
+              } else if (result["list"].length === 0 && idx === 0) {
                 this.printPharmacyFlag = false;
               } else {
                 this.printPharmacyFlag = true;
               }
               // 列表数据合并
               if (idx === 0) {
-                this.printPharmacyList = result["data"];
+                this.printPharmacyList = result["list"];
               } else {
                 this.printPharmacyList = [
                   ...this.printPharmacyList,
-                  ...result["data"],
+                  ...result["list"],
                 ];
               }
               break;
-            case 'take':
+            case 'specimenDept':
               this.waitPharmacyTotal = result.totalNum;
               this.waitPharmacyLoad = false;
-              if (result["data"].length < 10) {
+              if (result["list"].length < 10) {
                 this.waitPharmacyFlag = false;
-              } else if (result["data"].length === 0 && idx === 0) {
+              } else if (result["list"].length === 0 && idx === 0) {
                 this.waitPharmacyFlag = false;
               } else {
                 this.waitPharmacyFlag = true;
               }
               if (idx === 0) {
-                this.waitPharmacyList = result["data"];
+                this.waitPharmacyList = result["list"];
               } else {
                 this.waitPharmacyList = [
                   ...this.waitPharmacyList,
-                  ...result["data"],
+                  ...result["list"],
                 ];
               }
               break;
-            case 'trans':
+            case 'leavedDept':
               this.pharmacyTotal = result.totalNum;
               this.pharmacyLoad = false;
-              if (result["data"].length < 10) {
+              if (result["list"].length < 10) {
                 this.pharmacyFlag = false;
-              } else if (result["data"].length === 0 && idx === 0) {
+              } else if (result["list"].length === 0 && idx === 0) {
                 this.pharmacyFlag = false;
               } else {
                 this.pharmacyFlag = true;
               }
               if (idx === 0) {
-                this.pharmacyList = result["data"];
+                this.pharmacyList = result["list"];
               } else {
-                this.pharmacyList = [...this.pharmacyList, ...result["data"]];
-              }
-              break;
-            case 'trans_send':
-              this.distributionTotal = result.totalNum;
-              this.distributionLoad = false;
-              if (result["data"].length < 10) {
-                this.distributionFlag = false;
-              } else if (result["data"].length === 0 && idx === 0) {
-                this.distributionFlag = false;
-              } else {
-                this.distributionFlag = true;
-              }
-              // 处理数据
-              result["data"].forEach(v=>{
-                v.deptList = v.deptList?v.deptList.join('，'):'';
-              })
-              if (idx === 0) {
-                this.distributionList = result["data"];
-              } else {
-                this.distributionList = [
-                  ...this.distributionList,
-                  ...result["data"],
-                ];
-              }
-              break;
-            case 'error':
-              this.completedTotal = result.totalNum;
-              this.completedLoad = false;
-              if (result["data"].length < 10) {
-                this.completedFlag = false;
-              } else if (result["data"].length === 0 && idx === 0) {
-                this.completedFlag = false;
-              } else {
-                this.completedFlag = true;
-              }
-              if (idx === 0) {
-                this.completedList = result["data"];
-              } else {
-                this.completedList = [...this.completedList, ...result["data"]];
+                this.pharmacyList = [...this.pharmacyList, ...result["list"]];
               }
               break;
           }
@@ -482,7 +648,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   // 加载更多
   loadMore(type) {
     switch (type) {
-      case 'delegation':
+      case 'surgeryDept':
         this.printPharmacyIdx++;
         this.printPharmacyLoad = true;
         this.getPharmacyList(
@@ -491,7 +657,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
           this.printPharmacySearchKey
         );
         break;
-      case 'take':
+      case 'specimenDept':
         this.waitPharmacyIdx++;
         this.waitPharmacyLoad = true;
         this.getPharmacyList(
@@ -500,31 +666,17 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
           this.waitPharmacySearchKey
         );
         break;
-      case 'trans':
+      case 'leavedDept':
         this.pharmacyIdx++;
         this.pharmacyLoad = true;
         this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
         break;
-      case 'trans_send':
-        this.distributionIdx++;
-        this.distributionLoad = true;
-        this.getPharmacyList(
-          this.distributionIdx,
-          type,
-          this.distributionSearchKey
-        );
-        break;
-      case 'error':
-        this.completedIdx++;
-        this.completedLoad = true;
-        this.getPharmacyList(this.completedIdx, type, this.completedSearchKey);
-        break;
     }
   }
   // 搜索关键词
   searchKeyHandle(type) {
     switch (type) {
-      case 'delegation':
+      case 'surgeryDept':
         this.printPharmacyIdx = 0; //页码重置
         this.printPharmacyList = []; //列表重置
         this.getPharmacyList(
@@ -533,7 +685,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
           this.printPharmacySearchKey
         );
         break;
-      case 'take':
+      case 'specimenDept':
         this.waitPharmacyIdx = 0; //页码重置
         this.waitPharmacyList = []; //列表重置
         this.getPharmacyList(
@@ -542,25 +694,11 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
           this.waitPharmacySearchKey
         );
         break;
-      case 'trans':
+      case 'leavedDept':
         this.pharmacyIdx = 0; //页码重置
         this.pharmacyList = []; //列表重置
         this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
         break;
-      case 'trans_send':
-        this.distributionIdx = 0; //页码重置
-        this.distributionList = []; //列表重置
-        this.getPharmacyList(
-          this.distributionIdx,
-          type,
-          this.distributionSearchKey
-        );
-        break;
-      case 'error':
-        this.completedIdx = 0; //页码重置
-        this.completedList = []; //列表重置
-        this.getPharmacyList(this.completedIdx, type, this.completedSearchKey);
-        break;
     }
   }
   // 退出
@@ -673,5 +811,20 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
+	
+	promptModalShow:boolean = false;
+	promptContent:any = null;
+	ifSuccess:any = null;
+	promptInfo:any = null;
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
 }