Merge branch 'master' into develop

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

@@ -9,6 +9,7 @@
 						<div class="form-title" *ngIf="detailsData.pathologyFormType==null">申请单类型：无</div>
 						<div class="form-title" *ngIf="detailsData.pathologyFormType==1">申请单类型：术中快速病理检查申请单</div>
 						<div class="form-title" *ngIf="detailsData.pathologyFormType==0">申请单类型：病理检查申请单</div>
+						<div class="form-title" *ngIf="detailsData.pathologyFormType==2">申请单类型：病理细胞学申请单</div>
 						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
@@ -195,7 +196,7 @@
 					</div>
 				</nz-form-item>
 				
-				<nz-form-item class="form-item">
+	<!-- 			<nz-form-item class="form-item">
 					<nz-form-label [nzSm]="4" [nzXs]="24">快捷键入</nz-form-label>
 					<div class="specimen-list">
 						<div *ngFor="let item of fastList;let index=index;" class="select-item"
@@ -203,16 +204,16 @@
 							{{item.name}}
 						</div>
 					</div>
-				</nz-form-item>
+				</nz-form-item> -->
 				
 				<nz-form-item class="form-item">
 					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">标本名称</nz-form-label>
 					<div class="specimen-tip" [ngClass]="{'isSpecumen':placeName}">{{placeName?placeName:''}}</div>
 					<nz-form-control nzErrorTip="请输入标本名称" [(nzSm)]="nzSmNum" [nzXs]="24">
-						<input nz-input maxlength="15" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
+						<input nz-input maxlength="20" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
 					</nz-form-control>
-					<div class="empty-box" [ngClass]="{'beSpecumenEmpty':placeName, 'noSpecumenEmpty':placeName==''}">
-						<span class="name">{{specimenNameLength}}/15</span>
+					<div class="empty-box" [ngClass]="{'beSpecumenEmpty':placeName, 'noSpecumenEmpty':!placeName}">
+						<span class="name">{{specimenNameLength}}/20</span>
 						<span class="empty" (click)="emptData($event)">清空</span>
 					</div>
 				</nz-form-item>
@@ -273,7 +274,7 @@
 						</nz-input-group>
 					</nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization">
+				<nz-form-item *ngIf="ifImmobilization && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
 				  <nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择固定时间!">
 				    <nz-input-group style="display: flex;gap: 10px">
@@ -286,7 +287,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization">
+				<nz-form-item *ngIf="ifImmobilization && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固定液类型</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固定液类型!">
 				    <nz-input-group>
@@ -305,7 +306,7 @@
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
-				  <nz-form-label nzRequired [nzSpan]="5" nzFor="name">姓名</nz-form-label>
+				  <nz-form-label nzRequired [nzSpan]="5">姓名</nz-form-label>
 					<nz-form-control [nzSpan]="19" nzErrorTip="请输入姓名!">
 						<input nz-input disabled formControlName="name" placeholder="请输入姓名" nzSize="default" />
 					</nz-form-control>
@@ -436,6 +437,7 @@
 							 <div>标本号:{{data.specimenCode}}</div>
 						 </div>
 						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+							 <!-- <span style="font-weight: bold;">速</span> -->
 							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 						 </div>
 					 </div>
@@ -455,7 +457,7 @@
 								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 							</div>
 							<div style="margin-top:10px;">
-								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+								<div style="width: 98%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 							</div>
 						 </div>
 						 <div style="width: 30%;">
@@ -481,26 +483,29 @@
 			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 					<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
-					 <div style="width: 46%;">
-						 <div style="display: flex;justify-content: center;">
+					 <div style="width: 35%;">
+						 <div style="display: flex;">
 							 <div style="width: 50px;height: 50px;">
 							 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
 							 </div>
-							 <div style="width: 12px;">申请单</div>
+							 <!-- <div style="width: 12px;">申请单</div> -->
 						 </div>
 						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 4%;"></div>
-					 <div style="width: 49%;">
+					 <div style="width: 5%;"></div>
+					 <div style="width: 60%;position: relative;left: -5px;">
 						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
 						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
-						<div style="margin-top:9px;margin-left: 25px;">性别: {{data.patientGender}}</div>
+						<div style="margin-top:9px;margin-left: 30px;">性别: {{data.patientGender}}</div>
 					 </div>
 					</div>
-					<div style="margin-top:10px;padding-left: 7px;">
-						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+					<div style="margin-top:3px;padding-left: 7px;">
+						<div style="width: 98%;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+					</div>
+					<div style="margin-top:3px;padding-left: 7px;">
+						<div style="width: 98%;">日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 					</div>
-				 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+				 <div style="height: 18px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
 		</div>

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

@@ -269,11 +269,11 @@
 						}
 					}
 					.beSpecumenEmpty{
-						right: 6px;
+						right: 10px;
 						top: 8px;
 					}
 					.noSpecumenEmpty{
-						right: 6px;
+						right: 10px;
 						top: 8px;
 					}
 				}
@@ -307,5 +307,13 @@
 	  }
 		.no-width{
 			width: 33% !important;
+			.ant-select{
+				width: 100% !important;
+			}
+			.ant-input-disabled{
+				color: rgba(0, 0, 0, 0.65) !important;
+				background: #fff !important;
+				border: none !important;
+			}
 		}
 	}

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

@@ -517,8 +517,8 @@ export class PathologyAddComponent implements OnInit {
 			this.specimenNameId = item.id
 			this.specimenNameName = item.name
 			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
-				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>14){
-					this.message.error('字符长度不能超过15个')
+				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>19){
+					this.message.error('字符长度不能超过20个')
 					return
 				}
 			}
@@ -542,8 +542,8 @@ export class PathologyAddComponent implements OnInit {
 	fastClick(e,item,index){
 		this.fastIndex = index
 			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
-				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>14){
-					this.message.error('字符长度不能超过15个')
+				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>19){
+					this.message.error('字符长度不能超过20个')
 					return
 				}
 			}
@@ -586,8 +586,8 @@ export class PathologyAddComponent implements OnInit {
 		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateSpecimenForm.invalid) return;
-		if(this.validateSpecimenForm.value.specimenName.length>15){
-			this.message.error('字符长度不能超过15个')
+		if(this.validateSpecimenForm.value.specimenName.length>19){
+			this.message.error('字符长度不能超过20个')
 			return
 		}
 		if(type==2){
@@ -705,7 +705,7 @@ export class PathologyAddComponent implements OnInit {
 	// 监听输入字数
 	specimenNameLength:any=0;
 	specimenInput(e){
-		if(e.length>15){
+		if(e.length>20){
 			return
 		}
 		this.specimenNameLength = e.length
@@ -766,9 +766,13 @@ export class PathologyAddComponent implements OnInit {
 		this.fixationData = format(result, 'yyyy-MM-dd');
 		console.log(this.fixationData)
 	}
-	fixationTimeSelect:any;
+	fixationTimeSelect:any = null;
 	fixationTimeChange(result){
-		this.fixationTimeSelect = format(result, 'HH:mm');
+		if(result){
+			this.fixationTimeSelect = format(result, 'HH:mm');
+		}else{
+			this.fixationTimeSelect = null
+		}
 		console.log(this.fixationData + ' ' + this.fixationTimeSelect)
 	}
 	
@@ -779,9 +783,13 @@ export class PathologyAddComponent implements OnInit {
 		this.inVitroData = format(result, 'yyyy-MM-dd');
 		console.log(this.inVitroData)
 	}
-	inVitroTimeSelect:any;
+	inVitroTimeSelect:any = null;
 	inVitroTimeChange(result){
-		this.inVitroTimeSelect = format(result, 'HH:mm');
+		if(result){
+			this.inVitroTimeSelect = format(result, 'HH:mm');
+		}else{
+			this.inVitroTimeSelect = null;
+		}
 		console.log(this.inVitroData + ' ' + this.inVitroTimeSelect)
 	}
 	
@@ -789,6 +797,14 @@ export class PathologyAddComponent implements OnInit {
 	printLoading:boolean = false;
 	submitPrintForm(): void{
 		let that = this
+		if(this.ifImmobilization && this.detailsData.pathologyFormType==0 && (!this.fixationTimeSelect || this.fixationTimeSelect == null)){
+			this.message.error('请选择固定时间')
+			return
+		}
+		if(!this.inVitroTimeSelect || this.inVitroTimeSelect == null){
+			this.message.error('请选择离体时间')
+			return
+		}
 		for (const i in this.validatePrintForm.controls) {
 		  this.validatePrintForm.controls[i].markAsDirty();
 		  this.validatePrintForm.controls[i].updateValueAndValidity();
@@ -828,7 +844,7 @@ export class PathologyAddComponent implements OnInit {
 			delete data.operation
 			delete data.pathologySpecimenIds
 		}
-		if(this.ifImmobilization){
+		if(this.ifImmobilization && this.detailsData.pathologyFormType==0){
 			data.pathologyForm.fixationTime = this.fixationData + ' ' + this.fixationTimeSelect +':00'
 			data.pathologyForm.specimenFixingLiquid.id = this.validatePrintForm.value.fixative
 		}else{
@@ -969,7 +985,7 @@ export class PathologyAddComponent implements OnInit {
 				let date = new Date();
 				
 				let inVitroDate = format(date, "yyyy-MM-dd")
-				if(this.ifImmobilization){
+				if(this.ifImmobilization && this.detailsData.pathologyFormType==0){
 					this.validatePrintForm = this.fb.group({
 						inVitroTimes: [null, [Validators.required]],
 						inVitroDate: [null, [Validators.required]],
@@ -985,7 +1001,7 @@ export class PathologyAddComponent implements OnInit {
 					this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
 					// this.validatePrintForm.controls.fixationTimes.setValue(date);
 					this.fixationData = inVitroDate;
-					this.fixationTimeSelect = format(date, 'HH:mm');
+					this.fixationTimeSelect = null;
 				}else{
 					this.validatePrintForm = this.fb.group({
 						inVitroTimes: [null, [Validators.required]],
@@ -1030,7 +1046,7 @@ export class PathologyAddComponent implements OnInit {
 					let date = new Date();
 					
 					let inVitroDate = format(date, "yyyy-MM-dd")
-					if(this.ifImmobilization){
+					if(this.ifImmobilization && this.detailsData.pathologyFormType==0){
 						this.validatePrintForm = this.fb.group({
 							inVitroTimes: [null, [Validators.required]],
 							inVitroDate: [null, [Validators.required]],
@@ -1045,7 +1061,7 @@ export class PathologyAddComponent implements OnInit {
 						this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
 						// this.validatePrintForm.controls.fixationTimes.setValue(date);
 						this.fixationData = inVitroDate;
-						this.fixationTimeSelect = format(date, 'HH:mm');
+						this.fixationTimeSelect = null;
 					}else{
 						this.validatePrintForm = this.fb.group({
 							inVitroTimes: [null, [Validators.required]],
@@ -1101,7 +1117,7 @@ export class PathologyAddComponent implements OnInit {
 					let date = new Date();
 					
 					let inVitroDate = format(date, "yyyy-MM-dd")
-					if(this.ifImmobilization){
+					if(this.ifImmobilization && this.detailsData.pathologyFormType==0){
 						this.validatePrintForm = this.fb.group({
 							inVitroTimes: [null, [Validators.required]],
 							inVitroDate: [null, [Validators.required]],
@@ -1116,7 +1132,7 @@ export class PathologyAddComponent implements OnInit {
 						this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
 						// this.validatePrintForm.controls.fixationTimes.setValue(date);
 						this.fixationData = inVitroDate;
-						this.fixationTimeSelect = format(date, 'HH:mm');
+						this.fixationTimeSelect = null;
 					}else{
 						this.validatePrintForm = this.fb.group({
 							inVitroTimes: [null, [Validators.required]],

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

@@ -5,7 +5,7 @@
 			<div class="content">
 				<div class="content-item boder-right">
 					<nz-form-item class="form-title-box">
-						<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单':'病理检查申请单'}}</div>
+						<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单' : detailsData.pathologyFormType==2 ? '病理细胞学申请单' : '病理检查申请单'}}</div>
 						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
@@ -243,7 +243,7 @@
 								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 							</div>
 							<div style="margin-top:10px;">
-								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+								<div style="width: 98%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 							</div>
 						 </div>
 						 <div style="width: 30%;">
@@ -269,26 +269,29 @@
 			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 					<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
-					 <div style="width: 46%;">
-						 <div style="display: flex;justify-content: center;">
+					 <div style="width: 35%;">
+						 <div style="display: flex;">
 							 <div style="width: 50px;height: 50px;">
 							 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
 							 </div>
-							 <div style="width: 12px;">申请单</div>
+							 <!-- <div style="width: 12px;">申请单</div> -->
 						 </div>
 						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 4%;"></div>
-					 <div style="width: 49%;">
+					 <div style="width: 5%;"></div>
+					 <div style="width: 60%;position: relative;left: -5px;">
 						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
 						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
-						<div style="margin-top:9px;margin-left: 25px;">性别: {{data.patientGender}}</div>
+						<div style="margin-top:9px;margin-left: 30px;">性别: {{data.patientGender}}</div>
 					 </div>
 					</div>
-					<div style="margin-top:10px;padding-left: 7px;">
-						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+					<div style="margin-top:3px;padding-left: 7px;">
+						<div style="width: 98%;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 					</div>
-				 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+					<div style="margin-top:3px;padding-left: 7px;">
+						<div style="width: 98%;">日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+					</div>
+				 <div style="height: 18px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
 		</div>

src/app/views/batch-distribution/batch-distribution-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { BatchDistributionComponent } from './batch-distribution.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: BatchDistributionComponent,
+    // children: [
+    //   {
+    //     // 查看详情
+    //     path: 'officeDetail/:id',
+    //     loadChildren: () => import('../office-detail/office-detail.module').then(m => m.OfficeDetailModule),
+    //   }
+    // ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class BatchDistributionRoutingModule { }

src/app/views/batch-distribution/batch-distribution.component.html

@@ -0,0 +1,255 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='20' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">批次号：</span>
+          <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">创建时间：</span>
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd HH:mm:ss"
+					(ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+      </div>
+      <div nz-col nzLg="4" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+						<th>批次号</th>
+            <th>创建时间</th>
+						<th>核对人</th>
+						<th>配送人</th>
+						<th>申请单数</th>
+            <th>标本数</th>
+            <th nzWidth="120px">操作</th>
+          </tr>
+        </thead>
+        <tbody v-if="listOfData && listOfData.length>0">
+          <tr *ngFor="let data of listOfData">
+            <td>{{ data.batchNo || '-' }}</td>
+            <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.checkUserDTO?data.checkUserDTO.name:'' }}</td>
+						<td>{{ data.deliverUserDTO?data.deliverUserDTO.name:'' }}</td>
+						<td>{{ data.pathologyFormNum||'0' }}</td>
+						<td>{{ data.specimenNum||'0' }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.look" (click)="viewSingle(data)">查看申请单</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 查看申请单 -->
+  <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">申请单列表<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <overlay-scrollbars #osComponentRef1 class="content">
+        <div class="list-template__bottom">
+        	<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+        		[nzLoading]="grossLoading">
+        		<thead>
+        			<tr class="thead">
+        				<th>申请单类型</th>
+        				<th>申请单号</th>
+								<th>申请科室</th>
+								<th>操作科室</th>
+								<th>患者信息</th>
+        				<th nzWidth="20%">检验项目</th>
+								<th>部位</th>
+        				<th>标本数</th>
+        				<th nzWidth="100px">操作</th>
+        			</tr>
+        		</thead>
+        		<tbody>
+        			<tr *ngFor="let data of viewData">
+        				<td *ngIf="data.pathologyFormType==1" class="red">术中快速</td>
+        				<td *ngIf="data.pathologyFormType==0">普通病理</td>
+        				<td *ngIf="data.pathologyFormType==2">病理细胞学</td>
+        				<td style="text-decoration: underline;cursor: pointer;" (click)="itemClick(data)">{{ data.applyCode}}</td>
+        				<td>{{ data.patientDTO? data.patientDTO.department.dept:'-'}}</td>
+								<td>{{ data.surgeryDeptDTO? data.surgeryDeptDTO.dept:'-'}}</td>
+        				<td>{{ data.patientDTO.patientName}} ({{data.patientDTO.bedNum}}床)</td>
+								<td>{{ data.arr ? data.arr.join('、') : '无' }}</td>
+								<td>{{ data.takePart}}</td>
+								<td>{{ data.specimenNum}}</td>
+        				<td>
+        				  <div class="coop">
+        				    <span (click)="itemClick(data)">查看</span>
+        				  </div>
+        				</td>
+        			</tr>
+        		</tbody>
+        	</nz-table>
+        </div>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+      </div>
+    </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">
+				<nz-form-item class="form-title-box">
+					<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单' : detailsData.pathologyFormType==2 ? '病理细胞学申请单' : '病理检查申请单'}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title over-class"><span class="font-weight-500">申请科室：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<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-title-box">
+					<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>
+					<div class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender?detailsData.patientDTO.gender.name:'-'}}</div>
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+				</nz-form-item>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</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"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+					<!-- <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" (click)="specimenView(item)">
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
+						</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;" *ngIf="item.doctorDTO"> {{item.operationType?item.operationType.name:''}} {{item.doctorDTO?item.doctorDTO.name:''}} {{item.nurseDTO?item.nurseDTO.name:''}} </div>
+									<div style="color: #49B856;" *ngIf="!item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div *ngIf="item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.doctorDTO?item.doctorDTO.name:''}} {{item.nurseDTO?item.nurseDTO.name:''}}</div>
+									<div *ngIf="!item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?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>
+		</div>
+	</div>
+</div>
+
+<!-- 查看标本 -->
+<div class="look">
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenViewDialog">
+		<div class="modalBody modalBody-ga">
+			<div class="title">查看标本<i class="icon_transport transport-guanbi" (click)="closeSpecimenModal()"></i>
+			</div>
+			<overlay-scrollbars #osComponentRef1 class="content">
+				<div class="list-template__bottom">
+					<nz-table class="list-template__nzTable" [nzData]="specimenData" nzSize="middle" [nzShowPagination]="false"
+						[nzLoading]="loading1">
+						<thead>
+							<tr class="thead">
+								<th>标本名称</th>
+								<th>编码</th>
+								<th>备注</th>
+								<th>离体时间</th>
+								<th>离体操作人</th>
+								<th>固定时间</th>
+								<th>固定操作人</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr *ngFor="let data of specimenData">
+								<td>{{ data.specimenName }}</td>
+								<td>{{ data.specimenCode }}</td>
+								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
+								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
+							</tr>
+						</tbody>
+					</nz-table>
+				</div>
+			</overlay-scrollbars>
+			<div class="display_flex justify-content_flex-center">
+				<button class="btn" nz-button nzType="primary" (click)="closeSpecimenModal()">知道了</button>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+

src/app/views/batch-distribution/batch-distribution.component.less

@@ -0,0 +1,668 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+	
+	/* 修改垂直滚动条 */
+	::-webkit-scrollbar {
+		width: 4px; /* 修改宽度 */
+		border-radius: 2px;
+	}
+	 
+	/* 修改滚动条轨道背景色 */
+	::-webkit-scrollbar-track {
+		background-color: #f1f1f1;
+	}
+	 
+	/* 修改滚动条滑块颜色 */
+	::-webkit-scrollbar-thumb {
+		background-color: #888;
+	}
+	 
+	/* 修改滚动条滑块悬停时的颜色 */
+	::-webkit-scrollbar-thumb:hover {
+		background-color: #555;
+	}
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .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%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 80%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
+.pathology-box {
+  position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 99;
+	.width-80{
+		width: 80% !important;
+	}
+	.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;
+			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: 78%;
+					padding: 15px;
+					.form-title-box{
+						display: flex;
+						margin-bottom: 10px;
+						.form-title{
+							color: #333;
+							margin-right: 40px;
+						}
+						.mar-ri-20{
+							margin-right: 20px !important;
+						}
+						.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;
+						}
+					}
+					.error-fix{
+						margin-top: 10px;
+						color: red;
+						text-align: center;
+					}
+					.form-list{
+						margin-bottom: 10px;
+						.specimen-list{
+							display: flex;
+							flex-wrap: wrap;
+							.specimen-item-class{
+								text-decoration: underline;
+								cursor: pointer;
+								margin-right: 40px;
+								color:#333;
+							}
+						}
+						.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: 10px;
+					.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;
+			}
+		}
+	}
+	
+}
+
+.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;
+}
+
+.look{
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 999;
+		.modalBody-ga{
+			width: 80% !important;
+			.list-template__searchBox{
+				margin-top: 10px;
+			}
+			.ant-select{
+				width: 20%;
+			}
+		}
+	  .modalBody {
+	    width: 350px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    .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%;
+	      height: 117px;
+	      background: #f9fafb;
+	      border: 1px solid #e5e9ed;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	
+	      div {
+	        text-align: center;
+	        margin: 0;
+	
+	        &.icon {
+	          margin-top: 17px;
+	
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 18px;
+	        }
+	
+	        &:nth-child(3) {
+	          font-size: 14px;
+	          color: #666;
+	        }
+	      }
+	    }
+	
+	    button {
+	      margin-top: 10px;
+	
+	      &.btn {
+	        margin-left: 8px;
+	      }
+	    }
+	  }
+	
+	  // 新增
+	  &.add {
+	    .modalBody {
+	      width: 420px;
+	      height: auto;
+	
+	      .content {
+	        width: 100%;
+	        height: auto;
+	        padding: 19px 14px 0 14px;
+	        max-height: 500px;
+	        overflow-y: auto;
+					
+					.ant-select{
+						width: 100%;
+					}
+					.ant-calendar-picker{
+						width: 100% !important;
+					}
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					  .list-template__pagination {
+					    height: 56px;
+					    display: flex;
+					    align-items: center;
+					    position: absolute;
+					    right: 8px;
+					  }
+					}
+					
+	        .addForm {
+	          .ant-form-item {
+	            margin-bottom: 14px;
+	
+	            .ant-form-item-label {
+	              line-height: 14px;
+	              text-align: left;
+	            }
+	          }
+	        }
+	
+	        .editForm {
+	          .ant-form-item {
+	            margin-bottom: 14px;
+	
+	            .ant-form-item-label {
+	              line-height: 0;
+	              text-align: left;
+	            }
+	          }
+	        }
+	      }
+	
+	      button {
+	        &:nth-child(1) {
+	          margin-right: 20px;
+	        }
+	      }
+	    }
+	  }
+	}
+}

src/app/views/batch-distribution/batch-distribution.component.ts

@@ -0,0 +1,238 @@
+import { Component, OnInit, ViewChild} from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay } from "date-fns";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import host from "../../../assets/js/http";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-batch-distribution",
+  templateUrl: "./batch-distribution.component.html",
+  styleUrls: ["./batch-distribution.component.less"],
+})
+export class BatchDistributionComponent implements OnInit{
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+
+  ngOnInit() {
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.getList()
+  }
+	isSpinning:any = false;
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: ""; //所属科室
+	hosId: number;
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	viewData: any = []; //科室单查看数据
+  // 打开父级科室下拉框baba
+  isLoading = false;
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.batchNumber = "";
+		this.dateRange = [];
+		this.startDate = "";
+		this.endDate = "";
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      pathologyDeliveryBatch: {
+				batchNo:this.batchNumber,
+        startTime: this.startDate,
+				endTime: this.endDate,
+				hosId: this.hosId
+      },
+    };
+		if(this.batchNumber){
+			data.pathologyDeliveryBatch.batchNo = this.batchNumber
+		}else{
+			delete data.pathologyDeliveryBatch.batchNo
+		}
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "pathologyDeliveryBatch", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+
+	// 日期选择
+	startDate: any = null; //发起时间开始
+	endDate: any = null; //发起时间结束
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = "";
+	  }else{
+			this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+			this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+		}
+	}
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+
+  // 查看
+  viewSingle(item) {
+    let query = {
+    	idx: 0,
+    	sum: 9999,
+    	pathologyForm: {
+    		batchId: item.id,
+    		order:'createTime desc'
+    	},
+    };
+    this.loading1 = true
+    this.mainService
+    .getFetchDataList("data", "pathologyForm", query)
+    .subscribe((data) => {
+    	this.loading1 = false
+    	this.viewData = data.list
+    	for(let i of this.viewData){
+    		if(i.pathologyInspectDTOS){
+    			i.arr = []
+    			for(let x of i.pathologyInspectDTOS){
+    				i.arr.push(x.inspectProject.name)
+    			}
+    		}
+    	}
+    	this.modal = true
+    });
+  }
+	
+	detailMoadl:boolean = false;
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	closeDetailMoadl(){
+		this.detailMoadl = false
+	}
+	
+	// 申请单号点击
+	detailItem:any = null;
+	pathologyDetailModal:any = false;
+	grossLoading:any = false;
+	itemClick(item){
+		this.detailItem = item
+		this.grossLoading = true
+		this.getSampleData(item)
+	}
+	
+	// 获取标本详情
+	project:any = [];
+	detailsData:any = null;
+	getSampleData(item){
+		this.mainService.getFetchData("data", "pathologyForm", item.id)
+		.subscribe((data) => {
+			this.grossLoading = false
+			this.detailsData = data.data
+		  this.specimenList = data.data.pathologySpecimenDTOList||[]
+			this.pathologyLogs = data.data.formLogDTOS
+			this.stepLength = this.pathologyLogs.length
+			if(this.detailsData.pathologyInspectDTOS){
+				this.project = this.detailsData.pathologyInspectDTOS.map(i=>{
+					return i.inspectProject.name
+				})
+				this.project = this.project.join('、')
+			}
+		  this.detailMoadl = true
+		});
+	}
+	
+	// 关闭查看标本
+	closeSpecimenModal(){
+		this.specimenViewDialog = false
+	}
+	
+	// 查看标本
+	specimenViewDialog:any = false;
+	specimenData:any = [];
+	specimenItem:any;
+	specimenView(item){
+		this.specimenData = []
+		this.specimenViewDialog = true
+		this.specimenItem = item;
+		this.specimenData.push(item)
+	}
+	
+	hideModal(){
+		this.modal = false
+	}
+	
+	pathologyDetailCancel(){
+		this.pathologyDetailModal = false
+	}
+}

src/app/views/batch-distribution/batch-distribution.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BatchDistributionRoutingModule } from './batch-distribution-routing.module';
+import { BatchDistributionComponent } from './batch-distribution.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    BatchDistributionComponent,
+  ],
+  imports: [
+    CommonModule,
+    BatchDistributionRoutingModule,
+    ShareModule
+  ]
+})
+export class BatchDistributionModule { }

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

@@ -2585,12 +2585,9 @@
 <!-- 多个申请单 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="multiDialog">
 	<div class="modalBody modalBody-ga">
-		<div class="title">多条申请单提示<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+		<div class="new-title"><span class="title-weight">{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）</span>患者申请单列表<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
 		</div>
 		<div class="content">
-			<div class="weight" *ngIf="viewData.length>0">
-				提示：查询到{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）患者有多条申请单，请选择对应申请单
-			</div>
 			<div class="list-template__bottom">
 				<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
 					[nzLoading]="grossLoading">
@@ -2598,19 +2595,19 @@
 						<tr class="thead">
 							<th>申请单类型</th>
 							<th>申请单号</th>
-							<th nzWidth="15%">检验项目</th>
+							<th nzWidth="20%">检验项目</th>
 							<th>标本类型</th>
 							<th>申请时间</th>
 							<th>申请科室</th>
 							<th>状态</th>
-							<th>操作</th>
+							<th>作废</th>
 						</tr>
 					</thead>
 					<tbody>
 						<tr *ngFor="let data of viewData">
-							<td *ngIf="data.pathologyFormType==1">术中快速病理检查申请单</td>
-							<td *ngIf="data.pathologyFormType==0">病理检查申请单</td>
-							<td *ngIf="data.pathologyFormType==null">无</td>
+							<td *ngIf="data.pathologyFormType==1" class="red">术中快速</td>
+							<td *ngIf="data.pathologyFormType==0">普通病理</td>
+							<td *ngIf="data.pathologyFormType==2">病理细胞学</td>
 							<td style="text-decoration: underline;cursor: pointer;" (click)="itemClick(data)">{{ data.applyCode}}</td>
 							<td>{{ data.arr ? data.arr.join('、') : '无' }}</td>
 							<td>{{ data.specimenType?data.specimenType.name:'无'}}</td>
@@ -2618,10 +2615,10 @@
 							<td>{{ data.patientDTO.department? data.patientDTO.department.dept:'-'}}</td>
 							<td>{{ data.status?data.status.name:'-'}}</td>
 							<td>
-							  <div class="coop">
-							    <span *ngIf="data.status.value==1 || data.status.value==2
+							  <div class="coop-btn">
+									<button class="btn" *ngIf="data.status.value==1 || data.status.value==2
 									|| data.status.value==3 || data.status.value==4 ||
-									data.status.value==5" (click)="cancellation(data)">作废</span>
+									data.status.value==5" (click)="cancellation(data)" nz-button nzType="primary">作废</button>
 							  </div>
 							</td>
 						</tr>
@@ -2631,7 +2628,7 @@
 		</div>
 		<div class="display_flex justify-content_flex-center mar-20 btns">
 			<button class="btn" style="margin-right: 0;" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(0)">新增普通病理</button>
-			<button class="btn" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(1)">新增术中快速病理</button>
+			<button class="btn" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(1)">新增术中快速</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">知道了</button>
 		</div>
 	</div>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -230,6 +230,15 @@
 		.list-template__searchBox{
 			margin-top: 10px;
 		}
+		.list-template__bottom{
+			padding-bottom:20px !important;
+		}
+		.list-template__bottom{
+			.list-template__nzTable{
+				height: 510px !important;
+				overflow-y: auto !important;
+			}
+		}
 		.ant-select{
 			width: 20%;
 		}
@@ -244,7 +253,6 @@
     .title {
       width: 100%;
       text-align: center;
-      font-size: 18px;
       position: relative;
 
       i {
@@ -257,7 +265,27 @@
         padding: 0 5px;
       }
     }
-
+		
+		.new-title {
+		  width: 100%;
+		  text-align: center;
+		  position: relative;
+			font-size: 14px;
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		
+		.title-weight{
+			font-weight: bold;
+			font-size: 15px;
+		}
     .content {
       width: 100%;
       // height: 117px;
@@ -325,8 +353,8 @@
         width: 100%;
         height: auto;
         padding: 19px 14px 0 14px;
-        max-height: 500px;
-        overflow-y: auto;
+        // max-height: 500px;
+        // overflow-y: auto;
 
 				.ant-select{
 					width: 100%;
@@ -369,7 +397,35 @@
 				            text-decoration: underline;
 				            cursor: pointer;
 				          }
-
+									
+									.coop-btn{
+										button{
+											margin-top: 0 !important;
+										  color: #fff;
+											&:nth-child(1) {
+											  margin-right: 0 !important;
+											}
+										}
+										span,button {
+										  display: inline-block;
+										  cursor: pointer;
+										  position: relative;
+										
+										  &::after {
+										    content: "|";
+										    position: absolute;
+										    top: 0;
+										    right: 0;
+										  }
+										
+										  &:nth-last-child(1) {
+										    &::after {
+										      content: "";
+										    }
+										  }
+										}
+									}
+									
 				          .coop {
 				            button{
 				              color: #333;

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

@@ -400,9 +400,10 @@ export class HushijiandanComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			pathologyForm: {
-				// surgeryId: item.id || "",
+				surgeryId: item.id || "",
 				patientId: item.patientDTO.id || "",
-				hosId: this.currentHospital.id || "" ,
+				surgeryDeptId:this.loginUser.dept.id,
+				// hosId: this.currentHospital.id || "" ,
 				operationType: 'pathologyForm',
 				order:'createTime desc',
 			},
@@ -413,39 +414,15 @@ export class HushijiandanComponent implements OnInit {
 			.subscribe((data) => {
 				this.isSpinning = false
 				this.viewData = data.list
-				if(this.viewData.pathologyInspectDTOS){
-					for(let i of this.viewData.pathologyInspectDTOS){
+				for(let i of this.viewData){
+					if(i.pathologyInspectDTOS){
 						i.arr = []
-						i.arr.push(i.inspectProject.name)
-					}
-				}
-				this.multiDialog = true
-				return
-				if(data.list.length==1){
-					this.detailId = data.list[0].id
-					if(!data.list[0].status){
-						this.pathologyModal = true
-						return
-					}
-					if(data.list[0].status &&
-					(data.list[0].status.value==1 || data.list[0].status.value==2 ||
-					data.list[0].status.value==3 || data.list[0].status.value==4)){
-						this.pathologyModal = true
-					}else{
-						this.pathologyDetailModal = true
-					}
-				}else if(data.list.length>1){
-					this.viewData = data.list
-					if(this.viewData.pathologyInspectDTOS){
-						for(let i of this.viewData.pathologyInspectDTOS){
-							i.arr = []
-							i.arr.push(i.inspectProject.name)
+						for(let x of i.pathologyInspectDTOS){
+							i.arr.push(x.inspectProject.name)
 						}
 					}
-					this.multiDialog = true
-				}else if(data.list.length==0){
-					this.message.error('无申请单')
 				}
+				this.multiDialog = true
 			});
 	}
 
@@ -461,9 +438,10 @@ export class HushijiandanComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			pathologyForm: {
-				// surgeryId: this.surgeryWKOMsg.id || "",
+				surgeryId: this.surgeryWKOMsg.id || "",
 				patientId: this.surgeryWKOMsg.patientDTO.id || "",
-				hosId: this.currentHospital.id || "" ,
+				surgeryDeptId:this.loginUser.dept.id,
+				// hosId: this.currentHospital.id || "" ,
 				operationType: 'pathologyForm',
 				order:'createTime desc'
 			},
@@ -483,34 +461,6 @@ export class HushijiandanComponent implements OnInit {
 				}
 			}
 			this.multiDialog = true
-			return
-			if(data.list.length==1){
-				this.detailId = data.list[0].id
-				if(!data.list[0].status){
-					this.pathologyModal = true
-					return
-				}
-				if(data.list[0].status &&
-				(data.list[0].status.value==1 || data.list[0].status.value==2 ||
-					data.list[0].status.value==3 || data.list[0].status.value==4)){
-					this.pathologyModal = true
-				}else{
-					this.pathologyDetailModal = true
-				}
-			}else if(data.list.length>1){
-				this.viewData = data.list
-				for(let i of this.viewData){
-					if(i.pathologyInspectDTOS){
-						i.arr = []
-						for(let x of i.pathologyInspectDTOS){
-							i.arr.push(x.inspectProject.name)
-						}
-					}
-				}
-				this.multiDialog = true
-			}else if(data.list.length==0){
-				this.message.error('无申请单')
-			}
 		});
 	}
 	
@@ -527,8 +477,10 @@ export class HushijiandanComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			pathologyForm: {
+				surgeryId: this.surgeryDataId || "",
 				patientId: this.patientDataId || "",
 				hosId: this.currentHospital.id || "" ,
+				surgeryDeptId:this.loginUser.dept.id,
 				operationType: 'pathologyForm',
 				order:'createTime desc'
 			},

src/app/views/main/main-routing.module.ts

@@ -613,6 +613,11 @@ const routes: Routes = [
 			  path: "deptAllStatistics",
 			  loadChildren: () => import("../dept-all-statistics/dept-all-statistics.module").then((m) => m.DeptAllStatisticsModule),
 			},
+			// 病理管理-批次配送
+			{
+			  path: "batchDistribution",
+			  loadChildren: () => import("../batch-distribution/batch-distribution.module").then((m) => m.BatchDistributionModule),
+			}
     ],
   },
 ];

src/app/views/pathology-communication-book/pathology-communication-book.component.html

@@ -50,6 +50,7 @@
 	<div class="tabs">
 		<div class="tabs-item">
 			<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">交接本</div>
+			<div class="tabs-item-item"  *ngIf="coopBtns.print" [ngClass]="{'activeClass': activeIndex == 1}" (click)="tabClick(1)">未打印</div>
 		</div>
 		<div class="tabs-btn">
 			<button class="btn default" nz-button nzType="primary" nzSize="small" (click)='distributionTab()'>配送清点</button>
@@ -57,7 +58,7 @@
 	</div>
   <!-- 头部 end -->
   <div class="pharmacy-main">
-    <div *ngIf="activeIndex==0" class="list-template pharmacy-main__list pharmacy-main__print">
+    <div class="list-template pharmacy-main__list pharmacy-main__print">
 			<div class="list-template__content">
 			  <div class="list-template__top" nz-row>
 			    <div nz-col nzLg='18' class="list-template__searchBox">
@@ -100,9 +101,10 @@
 			    <div nz-col nzLg="6" class="list-template__btns">
 			      <button class="btn default" (click)='search()'>搜索</button>
 			      <button class="btn default ml8" (click)='reset()'>重置</button>
+						<button class="btn default ml8" nz-button *ngIf="coopBtns.batchPrint && activeIndex==1" (click)="print('batchPrint')" [nzLoading]="btnLoading">批量打印</button>
 			    </div>
 			  </div>
-			  <div class="list-template__bottom">
+			  <div class="list-template__bottom" *ngIf="activeIndex==0">
 			    <nz-table class="list-template__nzTable" [nzData]="listOneData" nzSize="middle" [nzShowPagination]="false"
 			      [nzLoading]="loading1">
 			      <thead>
@@ -118,7 +120,7 @@
 								<th>固定时间</th>
 			          <th>配送人</th>
 								<th>配送时间</th>
-			          <th nzWidth="80px">操作</th>
+			          <th nzWidth="120px">操作</th>
 			        </tr>
 			      </thead>
 			      <tbody>
@@ -137,6 +139,7 @@
 			          <td>
 			            <div class="coop">
 										<span (click)="oneLook($event,data)">查看</span>
+										<span *ngIf="coopBtns.print && data.printFlag==1" (click)="print('print',data)">补打</span>
 			            </div>
 			          </td>
 			        </tr>
@@ -148,114 +151,69 @@
 			      </nz-pagination>
 			    </div>
 			  </div>
-			</div>
-    </div>
-
-    <div class="pharmacy-main__list pharmacy-main__waitDelivery">
-      <div *ngIf="activeIndex==1" class="list-template pharmacy-main__list pharmacy-main__print">
-      	<div class="list-template__content">
-      	  <div class="list-template__bottom">
-      	    <nz-table class="list-template__nzTable" [nzData]="listTwoData" nzSize="middle" [nzShowPagination]="false"
-      	      [nzLoading]="loading2">
-      	      <thead>
-      	        <tr class="thead">
-      	          <th>申请单号</th>
-      	          <th>患者姓名</th>
-      	          <th>住院号</th>
-      	          <th>部位</th>
-      	          <th>标本数</th>
-      	          <th>申请科室</th>
-      	          <th>配送人</th>
-      	          <th>状态</th>
-      	          <th>操作</th>
-      	        </tr>
-      	      </thead>
-      	      <tbody>
-      	        <tr *ngFor="let data of listTwoData">
-      	         <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
-      	         <td>{{ data.patientDTO?data.patientDTO.patientName : '-' }}</td>
-      	         <td>{{ data.patientDTO.patientCode}}</td>
-      	         <td>{{ data.takePart}}</td>
-      	         <td>{{ data.specimenNum}}</td>
-      	         <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</td>
-      	         <td>{{ data.deliveryUserDTO?data.deliveryUserDTO.name : '-' }}</td>
-      	         <td>{{ data.status?data.status.name:'-' }}</td>
-      	         <td>
-      	           <div class="coop">
-      	         		<span (click)="oneLook($event,data)">查看</span>
-      	           </div>
-      	         </td>
-      	        </tr>
-      	      </tbody>
-      	    </nz-table>
-      	    <div class="list-template__pagination">
-      	      <nz-pagination [(nzPageIndex)]="pageTwoIndex" [(nzTotal)]="listTwoLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-      	        (nzPageIndexChange)="getSpeedinessList()" (nzPageSizeChange)="getSpeedinessList()">
-      	      </nz-pagination>
-      	    </div>
-      	  </div>
-      	</div>
-      </div>
-    </div>
-
-    <div class="pharmacy-main__list pharmacy-main__delivery">
-			<div *ngIf="activeIndex==2" class="list-template pharmacy-main__list pharmacy-main__print">
-				<div class="list-template__content">
-				  <div class="list-template__bottom">
-				    <nz-table class="list-template__nzTable" [nzData]="listThreeData" nzSize="middle" [nzShowPagination]="false"
-				      [nzLoading]="loading3">
-				      <thead>
-				        <tr class="thead">
-				          <th>包号</th>
-				          <th>打包人 | 打包时间</th>
-				          <th>申请单数</th>
-				          <th>标本数</th>
-									<th>配送人 | 配送时间</th>
-									<th>接收人 | 接收时间</th>
-				          <th>状态</th>
-				          <th>操作</th>
-				        </tr>
-				      </thead>
-				      <tbody>
-				        <tr *ngFor="let data of listThreeData">
-				          <td>{{ data.packCode || '-' }}</td>
-									<td>
-										<div>{{data.packUserDTO.name }}</div>
-										<div>{{data.packTime|date:'yyyy-MM-dd HH:mm' }}</div>
-									</td>
-				          <td>{{ data.pathologyFormNum }}</td>
-				          <td>{{ data.specimenNum }}</td>
-				          <td>
-				          	<div>{{data.deliveryUserDTO?data.deliveryUserDTO.name:'-' }}</div>
-				          	<div>{{data.deliveryTime|date:'yyyy-MM-dd HH:mm' || '-' }}</div>
-				          </td>
-				          <td>
-				          	<div>{{data.receiveUserDTO?data.receiveUserDTO.name:'-' }}</div>
-				          	<div>{{data.receiveTime|date:'yyyy-MM-dd HH:mm' || '-' }}</div>
-				          </td>
-									<td>{{ data.status.name }}</td>
-				          <td>
-				            <div class="coop">
-											<span (click)="threeLook($event,data)">查看标本</span>
-											<span (click)="reprint($event,data)">补打</span>
-											<span *ngIf="data.status.value==1" (click)="distribution($event,data)">配送</span>
-				            </div>
-				          </td>
-				        </tr>
-				      </tbody>
-				    </nz-table>
-				    <div class="list-template__pagination">
-				      <nz-pagination [(nzPageIndex)]="pageThreeIndex" [(nzTotal)]="listThreeLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-				        (nzPageIndexChange)="getPackList()" (nzPageSizeChange)="getPackList()">
-				      </nz-pagination>
-				    </div>
+				
+				<div class="list-template__bottom" *ngIf="activeIndex==1">
+				  <nz-table class="list-template__nzTable" [nzData]="listOneData" nzSize="middle" [nzShowPagination]="false"
+				    [nzLoading]="loading1">
+				    <thead>
+				      <tr class="thead">
+								<th 
+								*ngIf="coopBtns.batchPrint"
+								nzShowCheckbox
+								[(nzChecked)]="isAllDisplayDataChecked"
+								[nzIndeterminate]="isIndeterminate"
+								(nzCheckedChange)="checkAll($event)"></th>
+				        <th>申请单号</th>
+								<th>状态</th>
+				        <th>患者姓名</th>
+				        <th>住院号</th>
+				        <th nzWidth="100px">部位</th>
+				        <th>标本数</th>
+				        <th>申请科室</th>
+								<th>离体时间</th>
+								<th>固定时间</th>
+				        <th>配送人</th>
+								<th>配送时间</th>
+				        <th nzWidth="120px">操作</th>
+				      </tr>
+				    </thead>
+				    <tbody>
+				      <tr *ngFor="let data of listOneData">
+								<td
+								  *ngIf="coopBtns.batchPrint"
+									nzShowCheckbox
+									[(nzChecked)]="mapOfCheckedId[data.id]"
+									(nzCheckedChange)="refreshStatus()"
+								></td>
+				        <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+								<td>{{ data.status?data.status.name : '-' }}</td>
+								<td>{{ data.patientDTO.patientName}}</td>
+				        <td>{{ data.patientDTO.residenceNo}}</td>
+				        <td>{{ data.takePart}}</td>
+				        <td>{{ data.specimenNum}}</td>
+				        <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</td>
+								<td>{{ data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+								<td>{{ data.fixationTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+								<td>{{ data.deliveryUserDTO?data.deliveryUserDTO.name : '-' }}</td>
+								<td>{{ data.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+				        <td>
+				          <div class="coop">
+										<span (click)="oneLook($event,data)">查看</span>
+										<span *ngIf="coopBtns.print" (click)="print('print',data)">打印</span>
+				          </div>
+				        </td>
+				      </tr>
+				    </tbody>
+				  </nz-table>
+				  <div class="list-template__pagination">
+				    <nz-pagination [(nzPageIndex)]="pageOneIndex" [(nzTotal)]="listOneLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+				      (nzPageIndexChange)="getConnectList()" (nzPageSizeChange)="getConnectList()">
+				    </nz-pagination>
 				  </div>
 				</div>
 			</div>
     </div>
   </div>
-  <!-- 主体部分 end -->
-  <!-- <router-outlet></router-outlet> -->
 </div>
 
 <!-- 科室切换提示框 -->
@@ -453,4 +411,77 @@
 			</div>
 		</div>
 	</div>
+</div>
+
+<!-- 打印 -->
+<div id="report" style="display: none;">
+	<div class="monad">
+		<div style="font-size: 12px;">
+			<div style="position: relative;height: 100%;" *ngFor="let data of printData; let index=index;">
+				<div style="position: relative;width:96%;margin-left: 2%;padding-bottom: 12px;">
+					<div style="height: 80px;line-height: 80px;text-align: center;font-size: 30px;">病理申请单</div>
+					<div *ngIf="pathologyBarCode==1" style="position: absolute;right: 0;height: 95%;top: 10px;text-align: right;">
+					 <img style="max-width: 75%;height: 50%;" [src]="data.barCode" alt="">
+					 <div>申请单号:{{data.applyCode}}</div>
+					</div>
+					<div *ngIf="pathologyBarCode==2" style="position: absolute;right: 10px;height: 95%;top: 0px;text-align: center;">
+					 <img style="max-width: 100%;height: 80%;" [src]="data.barCode" alt="">
+					 <div>申请单号:{{data.applyCode}}</div>
+					</div>
+				</div>
+				<div style="border-top: 1px solid #333; width:96%;margin-left: 2%;padding-bottom: 12px;">
+					<div style="display: flex; justify-content: space-between; margin-top:12px;">
+						<div>姓名: {{data.patientDTO ? data.patientDTO.patientName : ''}}</div>
+						<div>性别: {{data.patientDTO && data.patientDTO.gender ? data.patientDTO.gender.name:''}}</div>
+						<div>年龄: {{data.patientDTO ? data.patientDTO.age : ''}}</div>
+						<div>电话: {{data.patientDTO?data.patientDTO.patientPhone:''}}</div>
+					</div>
+					<div style="display: flex; justify-content: space-between; margin-top:12px;">
+						<div>门诊号: {{data.patientDTO.patientCode}}</div>
+						<div>住院号: {{data.patientDTO.residenceNo}}</div>
+						<div>床号: {{data.patientDTO.bedNum}}</div>
+						<div>科室: {{deptName}}</div>
+					</div>
+					<div style="display: flex; justify-content: space-between; margin-top:12px;">
+						<div style="width: 100%;overflow: hidden;">活检部位: {{data.takePart}}</div>
+					</div>
+					<div style="display: flex; justify-content: space-between; margin-top:12px;">
+						<div>检查时间: {{data.createTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+						<div>离体时间: {{data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+						<div>固定时间: {{data.fixationTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+					</div>
+				</div>
+				<div style="border-top: 1px solid #333; width:96%;margin-left: 2%;padding-bottom: 12px;">
+					<div style="margin-top:12px;">临床诊断:</div>
+					<div style="margin-top:12px;">{{data.diagnose}}</div>
+					<div style="margin-top:12px;">检查所见:</div>
+					<div style="margin-top:12px;">
+						{{data.intraoperativeFindings}}
+					</div>
+					<div style="margin-top:12px;">手术诊断:</div>
+					<div style="margin-top:12px;">{{data.surgicalPlan}}</div>
+					<div style="margin-top:12px;">备注:</div>
+				</div>
+				<div style="width:96%;margin-left: 2%;padding-bottom: 12px; border-top: 1px solid #333;position: absolute;bottom: 0;">
+					<div style="display: flex; margin-top:12px;">
+						<div style="flex: 1;">取材医生: {{data.surgeryDoctorDTO?data.surgeryDoctorDTO.name:''}}</div>
+						<div style="flex: 1;">取材护士: {{data.nurseDTO?data.nurseDTO.name:''}}</div>
+					</div>
+					<div style="margin-top:12px;">注意事项:</div>
+					<div style="margin-top:12px;">
+						1、患者姓名、住院号必须在标本瓶上著名。
+					</div>
+					<div style="margin-top:12px;">
+						2、标本必须立即固定10 %福尔马林液体内，瓶口宜大以便取出。
+					</div>
+					<div style="margin-top:12px;">
+						3、手术取下之标本，务请全部送检，如贵科科研需要，请注明，我科检查后商议处理。
+					</div>
+					<div style="margin-top:12px;">
+						4、如发现检查与临床有意见不符之处，请与我科联系
+					</div>
+				</div>
+			 <div style="height: 26px;" *ngIf="printData && printData.length>1 && index+1 < printData.length"></div>
+			</div>
+		</div>
 </div>

src/app/views/pathology-communication-book/pathology-communication-book.component.ts

@@ -169,6 +169,8 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 	toDayTime:any = null;
 	backType:any = 'list';
 	mainRole:any = false;
+	coopBtns:any = {};
+	deptName:any = null;
 	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
 	  .id; //登录人所属科室
   ngOnDestroy() {
@@ -189,9 +191,12 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 		// 	this.isLoading = true
 		//   this.getUserData(v[0])
 		// });
+		this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
 		this.deptId = this.tool.getCurrentUserDept().id
+		this.deptName = this.tool.getCurrentUserDept().dept
+		this.getTaskTypesId()
 		this.getConnectList()
 		if(this.route.snapshot.queryParams && this.route.snapshot.queryParams.type){
 			this.backType = this.route.snapshot.queryParams.type
@@ -207,13 +212,122 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 			this.getToday()
 		},60000)
   }
+	
+	isAllDisplayDataChecked:any = false;
+	isOperating:any  = false;
+	isIndeterminate:any = false;
+	listOfAllData: any = [];
+	mapOfCheckedId: { [key: string]: boolean } = {};
+	numberOfChecked = 0;
+	selectedData:any = null;
+	
+	refreshStatus(): void {
+		let arr = [];
+		if (this.listOneData.length) {
+		  this.isAllDisplayDataChecked = this.listOneData.every(
+		    (item) => this.mapOfCheckedId[item.id]
+		  );
+		} else {
+		  this.isAllDisplayDataChecked = false;
+		}
+		
+		for (var m in this.mapOfCheckedId) {
+		  if (this.mapOfCheckedId[m]) {
+		    arr.push(m);
+		  }
+		}
+		this.selectedData = arr;
+	}
 
+	checkAll(value: boolean): void {
+		this.listOneData.forEach(item => (this.mapOfCheckedId[item.id] = value));
+		this.refreshStatus();
+	}
+	
+	taskTypeData:any;
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='pathology')
+			this.getConfig();
+		});
+	}
+	
+	// 获取配置
+	pathologyBarCode:any = 1;
+	getConfig() {
+		let postData = {
+			idx: 0,
+			sum: 10,
+			taskTypeConfig: {
+				hosId:this.hosId,
+				taskType:this.taskTypeData.id
+			}
+		}
+	  this.mainService
+	    .getFetchDataList("simple/data", "taskTypeConfig", postData)
+	    .subscribe((result) => {
+	      if (result.status == 200) {
+					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
+	      }
+	    });
+	}
+	
+	// 打印
+	btnLoading:any = false;
+	printData:any = [];
+	print(type, data){
+		let ids = null
+		if(type=='batchPrint'){
+			if(!this.selectedData || this.selectedData.length==0){
+				this.message.error('请先选择申请单')
+				return
+			}
+			ids = this.selectedData.join(',')
+		}
+		this.isSpinning = true
+		let query = {
+			operation: 'pathologyHandoverBook',
+			pathologyFormIds: type=='batchPrint' ? ids : data.id
+		}
+		this.mainService
+			.pathologyPrint(query)
+			.subscribe((res:any) => {
+				if(res.status==200){
+					let arr = res.data;
+					for(let i of arr){
+						if(i.barCode){
+							i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+						}
+					}
+					this.isSpinning = false;
+					this.printData = arr;
+					this.getConnectList();
+					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();
+						},500)
+					}, 500);
+				}else{
+					this.message.error(res.msg)
+				}
+			});
+	}
+	
 	//tab切换
 	tabClick(type){
 		this.activeIndex = type
 		localStorage.setItem("pathologyActiveIndex",type)
+		this.pageOneIndex = 1;
 		if(type==0){
 			this.getConnectList()
+		}else{
+			this.getConnectList()
 		}
 	}
 	
@@ -286,9 +400,18 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 				status:{
 					id:this.status
 				},
-				pathologyFormType:this.pathologyFormType
+				pathologyFormType:this.pathologyFormType,
+				printFlag:null
 	    },
 	  };
+		if(this.activeIndex==1){
+			data.pathologyForm.printFlag = 0
+			this.isAllDisplayDataChecked = false;
+			this.mapOfCheckedId = {};
+			this.selectedData = null;
+		}else{
+			delete data.pathologyForm.printFlag
+		}
 	  this.loading1 = true;
 	  that.mainService
 	    .getFetchDataList("data", "pathologyForm", data)

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

@@ -8,7 +8,7 @@
 			<div class="pharmacy-title">门诊病理采样端</div>
       <div class="pharmacy-name__total">
 				<nz-input-group nzSize="large">
-					<input type="text" id="Binput" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入患者信息" />
+					<input type="text" id="Binput" (keydown.enter)="onEnterPress()" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入患者信息" />
 				</nz-input-group>
 				<!-- <ng-template #suffixButton>
 					<button nz-button nzType="primary" nzSize="large" nzSearch (click)="searchSpecimen()">搜索</button>
@@ -35,31 +35,30 @@
   </div>
   <div class="pharmacy-main">
 		<div class="left" *ngIf="adviceList">
-			<div class="top" *ngIf="adviceList.patientNo">
-				<div>{{adviceList.patientName}} {{adviceList.patientGender?adviceList.patientGender.name:'-'}} ({{adviceList.patientAge||'-'}}岁)</div>
-				<div class="border">{{adviceList.patientNo}}</div>
+			<div class="top" *ngIf="adviceList.patientDTO">
+				<div>{{adviceList.patientDTO.patientName}} {{adviceList.patientDTO.gender?adviceList.patientDTO.gender.name:'-'}} ({{adviceList.patientDTO.age||'-'}}岁)</div>
+				<div class="border">{{adviceList.patientDTO.residenceNo?adviceList.patientDTO.residenceNo:adviceList.patientDTO.patientCode}}</div>
 			</div>
 			<div class="left-content" [ngClass]="{'noAddAppClass': !ifAddapplication, 'beAddAppClass': ifAddapplication}">
-				<div class="content" *ngFor="let item of adviceList.pathologyAdviceDTOS;let index=index;" (click)="listClick(item,index)" [ngClass]="{'activeLeftClass': index == leftIndex}">
+				<div class="content" *ngFor="let item of adviceList.pathologyFormDTOS;let index=index;" (click)="listClick(item,index)" [ngClass]="{'activeLeftClass': index == leftIndex}">
 					<div class="list list-df">
-						<div class="code">{{item.adviceId ? item.adviceId : '无'}}</div>
-						<div class="form-title">{{item.adviceType ? item.adviceType.name : ''}}</div>
+						<div class="code">{{item.applyCode ? item.applyCode : '无'}}</div>
+						<div class="form-title">{{item.status?item.status.name:'无'}}</div>
 						<div class="del-class">
 							<i (click)="delItem($event,item)" class="icon_transport transport-lajitong specimen-icon"></i>
 						</div>
 					</div>
-					<div class="list">项目：{{item.inspectType?item.inspectType.name:'无'}}</div>
-					<div class="list">部位：{{item.inspectPart ? item.inspectPart : '无'}}</div>
-					<div class="list">诊断：{{item.diagnosis ? item.diagnosis : '无'}}</div>
-					<div class="list">开单时间：{{item.orderTime | date:'yyyy-MM-dd HH:mm:ss'}}</div>
-					<!-- <div class="list">状态：{{item.orderStatusName}}</div> -->
+					<div class="list">项目：{{item.project.length>0 ? item.project.join('、') :'无'}}</div>
+					<div class="list">部位：{{item.takePart ? item.takePart : '无'}}</div>
+					<div class="list">诊断：{{item.diagnose ? item.diagnose : '无'}}</div>
+					<div class="list">开单时间：{{item.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</div>
 				</div>
 			</div>
 			<div *ngIf="ifAddapplication && adviceList" class="center-box">
-				<button nz-button nzType="primary" class="btn txtC mr8" (click)="addPathology(0)">新增病理申请单</button>
+				<button nz-button nzType="primary" class="btn txtC mr8" (click)="addPathology(0)" [nzLoading]="addLoading">新增病理申请单</button>
 			</div>
 		</div>
-		<div class="center" *ngIf="adviceList && adviceList.pathologyAdviceDTOS.length>0 && detailsData && viewType!='add'">
+		<div class="center" *ngIf="adviceList && adviceList.pathologyFormDTOS.length>0 && detailsData && viewType!='add'">
 			<div class="pathology-content" *ngIf="viewType=='edit'">
 				<div class="title">病理检查申请单</div>
 				<div class="content">
@@ -70,17 +69,11 @@
 								<div class="form-title" *ngIf="detailsData.pathologyFormType==null">申请单类型：无</div>
 								<div class="form-title" *ngIf="detailsData.pathologyFormType==1">申请单类型：术中快速病理检查申请单</div>
 								<div class="form-title" *ngIf="detailsData.pathologyFormType==0">申请单类型：病理检查申请单</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==2">申请单类型：病理细胞学申请单</div>
 								<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
 							</nz-form-item>
 							
 							<nz-form-item>
-								<div class="form-title width-100 font-weight-500">诊断：</div>
-								<div>
-									{{detailsData.diagnose||'无'}}
-								</div>
-							</nz-form-item>
-							
-							<nz-form-item>
 								<div class="form-title width-100 font-weight-500">病历摘要：</div>
 								<div class="indent" [ngClass]="{'height-200': isShowMove, 'height-100': !isShowMove && detailsData.medicalRecords}">{{detailsData.medicalRecords||'无'}}</div>
 								<div (click)="showLook()" class="cursor" *ngIf="medicalRecordsLength>10">
@@ -89,10 +82,17 @@
 								</div>
 							</nz-form-item>
 							
+							<nz-form-item>
+								<div class="form-title width-100 font-weight-500">临床诊断：</div>
+								<div>
+									{{detailsData.diagnose||'无'}}
+								</div>
+							</nz-form-item>
+							
 							<nz-form-item class="form-item">
-								<nz-form-label nzFor="surgicalPlan" [nzSm]="24" [nzXs]="24">手术方案</nz-form-label>
-								<nz-form-control nzErrorTip="请输入手术方案" [nzSm]="24" [nzXs]="24">
-									<input nz-input formControlName="surgicalPlan" placeholder="请输入手术方案"/>
+								<nz-form-label nzFor="surgicalPlan" [nzSm]="24" [nzXs]="24">手术诊断</nz-form-label>
+								<nz-form-control nzErrorTip="请输入手术诊断" [nzSm]="24" [nzXs]="24">
+									<input nz-input formControlName="surgicalPlan" placeholder="请输入手术诊断"/>
 								</nz-form-control>
 							</nz-form-item>
 							
@@ -188,16 +188,10 @@
 								<div class="form-title" *ngIf="detailsData.pathologyFormType==null">申请单类型：无</div>
 								<div class="form-title" *ngIf="detailsData.pathologyFormType==1">申请单类型：术中快速病理检查申请单</div>
 								<div class="form-title" *ngIf="detailsData.pathologyFormType==0">申请单类型：病理检查申请单</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==2">申请单类型：病理细胞学申请单</div>
 								<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</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 width-100 font-weight-500">病历摘要：</div>
 								<div class="indent" [ngClass]="{'height-200': isShowMove, 'height-100': !isShowMove && detailsData.medicalRecords}">{{detailsData.medicalRecords||'无'}}</div>
@@ -207,8 +201,15 @@
 								</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="form-title font-weight-500">手术诊断：</div>
 									<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
 								</div>
 								<div class="form-list">
@@ -243,7 +244,7 @@
 				</div>
 			</div>
 		
-		<div class="content-item-right" *ngIf="adviceList && adviceList.pathologyAdviceDTOS.length>0 && pathologyLogs.length && (viewType=='view' || viewType=='edit')">
+		<div class="content-item-right" *ngIf="adviceList && adviceList.pathologyFormDTOS.length>0 && pathologyLogs.length && (viewType=='view' || viewType=='edit')">
 			<div class="step-title">病理闭环</div>
 			<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
 				<ng-container *ngFor="let item of pathologyLogs; let index = index">
@@ -380,7 +381,7 @@
 					</div>
 				</nz-form-item>
 				
-				<nz-form-item class="form-item">
+<!-- 				<nz-form-item class="form-item">
 					<nz-form-label [nzSm]="4" [nzXs]="24">快捷键入</nz-form-label>
 					<div class="specimen-list">
 						<div *ngFor="let item of fastList;let index=index;" class="select-item"
@@ -388,16 +389,16 @@
 							{{item.name}}
 						</div>
 					</div>
-				</nz-form-item>
+				</nz-form-item> -->
 				
 				<nz-form-item class="form-item">
 					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">标本名称</nz-form-label>
 					<div class="specimen-tip" [ngClass]="{'isSpecumen':placeName}">{{placeName?placeName:''}}</div>
 					<nz-form-control nzErrorTip="请输入标本名称" [(nzSm)]="nzSmNum" [nzXs]="24">
-						<input nz-input maxlength="15" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
+						<input nz-input maxlength="20" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
 					</nz-form-control>
-					<div class="empty-box" [ngClass]="{'beSpecumenEmpty':placeName, 'noSpecumenEmpty':placeName==''}">
-						<span class="name">{{specimenNameLength}}/15</span>
+					<div class="empty-box" [ngClass]="{'beSpecumenEmpty':placeName, 'noSpecumenEmpty':!placeName}">
+						<span class="name">{{specimenNameLength}}/20</span>
 						<span class="empty" (click)="emptData($event)">清空</span>
 					</div>
 				</nz-form-item>
@@ -429,9 +430,9 @@
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
 	(confirmDelEvent)="confirmDel()" content="您确认要删除标本吗？"></app-dialog-delete>
 
-<!-- 删除医嘱 -->
-<app-dialog-delete [delModal]="delAdviceModal" (hideDelModalEvent)="hideAdviceModal()" [btnLoading]="btnLoading"
-	(confirmDelEvent)="confirmAdvice()" content="您确认要删除医嘱吗？"></app-dialog-delete>
+<!-- 删除申请单 -->
+<app-dialog-delete [delModal]="delAdviceModal" (hideDelModalEvent)="hideAdviceModal()" [btnLoading]="btnDelLoading"
+	(confirmDelEvent)="confirmAdvice()" content="您确认要删除申请单吗？"></app-dialog-delete>
 		
 <!-- 查看标本 -->
 <div class="look">
@@ -575,7 +576,7 @@
 							<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 						</div>
 						<div style="margin-top:10px;">
-							<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+							<div style="width: 98%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 						</div>
 					 </div>
 					 <div style="width: 30%;">
@@ -601,26 +602,29 @@
 		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
 			<div *ngFor="let data of printData.specimenList; let index=index;">
 				<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
-				 <div style="width: 46%;">
-					 <div style="display: flex;justify-content: center;">
+				 <div style="width: 35%;">
+					 <div style="display: flex;">
 						 <div style="width: 50px;height: 50px;">
 						 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
 						 </div>
-						 <div style="width: 12px;">申请单</div>
+						 <!-- <div style="width: 12px;">申请单</div> -->
 					 </div>
 					 <div>{{printData.applyCode}}</div>
 				 </div>
-				 <div style="width: 4%;"></div>
-				 <div style="width: 49%;">
-					<div style="display: flex;flex-wrap: nowrap;">门诊号: {{data.patientNo}}</div>
+				 <div style="width: 5%;"></div>
+				 <div style="width: 60%;position: relative;left: -5px;">
+					<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
 					<div style="margin-top:9px;">患者: {{data.patientName}}</div>
-					<div style="margin-top:9px;margin-left: 25px;">性别: {{data.patientGender}}</div>
+					<div style="margin-top:9px;margin-left: 30px;">性别: {{data.patientGender}}</div>
 				 </div>
 				</div>
-				<div style="margin-top:10px;padding-left: 7px;">
-					<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+				<div style="margin-top:3px;padding-left: 7px;">
+					<div style="width: 98%;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
+				</div>
+				<div style="margin-top:3px;padding-left: 7px;">
+					<div style="width: 98%;">日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 				</div>
-			 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+			 <div style="height: 18px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 			</div>
 		</div>
 	</div>

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

@@ -915,11 +915,11 @@
 						}
 					}
 					.beSpecumenEmpty{
-						right: 6px;
+						right: 10px;
 						top: 8px;
 					}
 					.noSpecumenEmpty{
-						right: 6px;
+						right: 10px;
 						top: 8px;
 					}
 				}
@@ -953,6 +953,11 @@
 	  }
 		.no-width{
 			width: 33% !important;
+			.ant-input-disabled{
+				color: rgba(0, 0, 0, 0.65) !important;
+				background: #fff !important;
+				border: none !important;
+			}
 		}
 	}
 

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

@@ -83,15 +83,19 @@ export class PathologySampleComponent implements OnInit {
 	project:any;
 	viewType:any = 'no';
 	mainRole:any;
+	deptId:any = null;
+	btnDelLoading:any = false;
   ngOnInit() {
 		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.searchSpecimenData(v[0])
 		});
 		this.changeInpSubjectSpecimen.pipe(debounceTime(500)).subscribe((v) => {
-		  this.searchSpecimen(v[0],'search')
+			this.pressType = false
+		  this.searchSpecimen(v[0],'search','new')
 		});
 		this.hosId = this.tool.getCurrentHospital().id;
-		this.userId = this.tool.getCurrentUserId()
+		this.userId = this.tool.getCurrentUserId();
+		this.deptId = this.tool.getCurrentUserDept().id;
 		this.getProDicData()
 		this.getDicData()
 		this.getSourceData()
@@ -108,7 +112,7 @@ export class PathologySampleComponent implements OnInit {
 		});
 		if(this.route.snapshot.params && this.route.snapshot.params.param){
 			this.barCode = this.route.snapshot.params.param
-			this.searchSpecimen(this.barCode,'search')
+			this.searchSpecimen(this.barCode,'search','new')
 		}
 		setTimeout(_=>{
 			document.getElementById('Binput').focus();
@@ -228,8 +232,7 @@ export class PathologySampleComponent implements OnInit {
 			if(this.leftIndex == null){
 				this.leftIndex = 0
 			}
-			this.fetchDataList(data.data.id);
-			this.searchSpecimen(this.adviceList.patientNo,'add');
+			this.searchSpecimen(this.residenceNo,'add','bottom');
 		});
 	}
 	
@@ -278,7 +281,7 @@ export class PathologySampleComponent implements OnInit {
 	    });
 	}
 	
-	// 病理医嘱删除
+	// 病理申请单删除
 	itemData:any;
 	delAdviceModal:any = false;
 	itemDataType:any = 2;
@@ -291,18 +294,17 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 确定删除
 	confirmAdvice(){
-		this.btnLoading = true;
+		this.btnDelLoading = true;
 		this.mainService
 		  .coopTypeConfig(
 		    "rmvData",
-		    "pathologyAdvice",
+		    "pathologyForm",
 		     [this.itemData.id]
 		  )
 		  .subscribe((data) => {
-		    this.btnLoading = false;
+		    this.btnDelLoading = false;
 		    this.delAdviceModal = false;
-				this.searchSpecimen(this.adviceList.patientNo,'load');
-				// this.fetchDataList(this.itemData.pathologyFormId);
+				this.searchSpecimen(this.residenceNo,'load', 'new');
 		    if (data.status==200) {
 		      this.showSpecimenModal("删除", true, "");
 		    } else {
@@ -321,8 +323,8 @@ export class PathologySampleComponent implements OnInit {
 	listClick(item,index){
 		this.leftIndex = index
 		this.adviceItem = item
-		if(item.pathologyFormId){
-			this.fetchDataList(item.pathologyFormId);
+		if(item.id){
+			this.fetchDataList(item.id);
 		}else{
 			this.viewType = 'add'
 		}
@@ -335,24 +337,28 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 标本条码搜索
 	adviceList:any = null;
-	searchSpecimen(e,type){
+	residenceNo:any = null;
+	searchSpecimen(e,type,optType){
 		if(type!='add' && type!='load'){
 			if(!this.barCode){
 				return
 			}
-			if(this.barCode.length < 10) {
+			if(this.barCode.length < 10 && !this.pressType) {
 				return
 			}
 		}
 		let data:any = {
 			idx: 0,
-			sum: 9999,
-			pathologyAdvice:{
-				patientNo:this.barCode?this.barCode:e
+			sum: 10,
+			pathologyForm:{
+				order: "createTime desc",
+				patientNo:this.barCode?this.barCode:e,
+				surgeryDeptId:this.deptId,
+				operationType:'outpatientPathologyForm'
 			}
 		}
 		this.isSpinning = true
-		this.mainService.getFetchDataList("data", "pathologyAdvice", data)
+		this.mainService.getFetchDataList("data", "pathologyForm", data)
 		.subscribe((res:any) => {
 			this.isSpinning = false
 			if(res.status==200){
@@ -369,8 +375,22 @@ export class PathologySampleComponent implements OnInit {
 					this.viewType = 'no';
 				}
 				if(res.list.length>0){
+					for(let i of res.list[0].pathologyFormDTOS){
+						i.project = []
+						if(i.pathologyInspectDTOS){
+							for(let x of i.pathologyInspectDTOS){
+								i.project.push(x.inspectProject.name)
+							}
+						}
+					}
 					this.adviceList = res.list[0]
-					this.patientId = this.adviceList.patientId
+					this.residenceNo = this.adviceList.patientDTO.residenceNo?this.adviceList.patientDTO.residenceNo:this.adviceList.patientDTO.patientCode
+					this.patientId = this.adviceList.patientDTO.id
+					if(optType=='bottom'){
+						this.leftIndex = 0;
+						this.adviceItem = this.adviceList.pathologyFormDTOS[0];
+						this.fetchDataList(this.adviceList.pathologyFormDTOS[0].id);
+					}
 				}else{
 					this.adviceList = null
 					this.viewType = 'no';
@@ -431,22 +451,29 @@ export class PathologySampleComponent implements OnInit {
 		this.inVitroData = format(result, 'yyyy-MM-dd');
 		console.log(this.inVitroData)
 	}
-	inVitroTimeSelect:any;
+	inVitroTimeSelect:any = null;
 	inVitroTimeChange(result){
-		this.inVitroTimeSelect = format(result, 'HH:mm');
+		if(result){
+			this.inVitroTimeSelect = format(result, 'HH:mm');
+		}else{
+			this.inVitroTimeSelect = null;
+		}
 		console.log(this.inVitroData + ' ' + this.inVitroTimeSelect)
 	}
-
 	
 	// 提交固定标本接收
 	startDate:any;
 	printLoading:any = false;
 	submitVerificationForm(){
 		let that = this
-		if(!this.fixationTimeSelect && this.fixationTimeSelect == null){
+		if(!this.fixationTimeSelect || this.fixationTimeSelect == null){
 			this.message.error('请选择固定时间')
 			return
 		}
+		if(!this.inVitroTimeSelect || this.inVitroTimeSelect == null){
+			this.message.error('请选择离体时间')
+			return
+		}
 		for (const i in this.validatePrintForm.controls) {
 		  this.validatePrintForm.controls[i].markAsDirty();
 		  this.validatePrintForm.controls[i].updateValueAndValidity();
@@ -508,7 +535,7 @@ export class PathologySampleComponent implements OnInit {
 					}
 					that.printLoading = false;
 					that.printData = arr;
-					this.searchSpecimen(this.adviceList.patientNo,'load');
+					this.searchSpecimen(this.residenceNo,'load', 'new');
 					setTimeout(() => {
 					  const printContent = document.getElementById("report");
 					  const WindowPrt = window.open("", "", "width=100,height=1000");
@@ -850,8 +877,8 @@ export class PathologySampleComponent implements OnInit {
 			this.specimenNameId = item.id
 			this.specimenNameName = item.name
 			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
-				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>14){
-					this.message.error('字符长度不能超过15个')
+				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>19){
+					this.message.error('字符长度不能超过20个')
 					return
 				}
 			}
@@ -875,8 +902,8 @@ export class PathologySampleComponent implements OnInit {
 	fastClick(e,item,index){
 		this.fastIndex = index
 			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
-				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>14){
-					this.message.error('字符长度不能超过15个')
+				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>19){
+					this.message.error('字符长度不能超过20个')
 					return
 				}
 			}
@@ -919,8 +946,8 @@ export class PathologySampleComponent implements OnInit {
 		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateSpecimenForm.invalid) return;
-		if(this.validateSpecimenForm.value.specimenName.length>15){
-			this.message.error('字符长度不能超过15个')
+		if(this.validateSpecimenForm.value.specimenName.length>19){
+			this.message.error('字符长度不能超过20个')
 			return
 		}
 		if(type==2){
@@ -1038,7 +1065,7 @@ export class PathologySampleComponent implements OnInit {
 	// 监听输入字数
 	specimenNameLength:any=0;
 	specimenInput(e){
-		if(e.length>15){
+		if(e.length>20){
 			return
 		}
 		this.specimenNameLength = e.length
@@ -1078,6 +1105,7 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 关闭标本
 	closeSpecimenModel(){
+		this.itemDataType = 2
 		this.hideSpecimenModal()
 	}
 	
@@ -1342,7 +1370,7 @@ export class PathologySampleComponent implements OnInit {
 					}
 					this.btnLoading = false;
 					this.printData = arr;
-					this.searchSpecimen(this.adviceList.patientNo,'load');
+					this.searchSpecimen(this.residenceNo,'load', 'new');
 					setTimeout(() => {
 						const printContent = document.getElementById("report");
 						const WindowPrt = window.open("", "", "width=100,height=1000");
@@ -1465,7 +1493,19 @@ export class PathologySampleComponent implements OnInit {
 		},200)
 	}
 
-
+	// 按了回车键
+	pressType:any = false;
+	onEnterPress(){
+		if(this.barCode.length < 10) {
+			this.pressType = true
+			console.log(1,this.barCode)
+			this.searchSpecimen(this.barCode,'search','new')
+		}else{
+			this.pressType = false
+			console.log(2,this.barCode)
+		}
+	}
+	
 	// 监听标本条码
 	specimenCodeChange(e){
 		this.changeInpSubjectSpecimen.next([e]);

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

@@ -28,7 +28,22 @@
 			</div>
 			<button class="right-btn" nz-button nzType="primary" (click)="specimenCheck()">标本核对</button>
     </div>
-    <div class="userInfo">
+		<div class="right">
+		  <div class="userInfo dropdown">
+		    <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+		      <img src="../../assets/images/icon_keshi.png" alt="">
+		      <span><ng-container *ngIf="loginUser.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}-</ng-container>{{loginUser.name}}</span>
+		      <i class="icon_transport transport-xiala1 ml8"></i>
+		    </div>
+		    <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+		      <div class="dropdownItem" (click)="setSpecimen()">切换科室</div>
+					<div class="dropdownItem" (click)="distributionRecord()">配送记录</div>
+					<div class="dropdownItem" (click)="toMain()">回到系统管理</div>
+		      <div class="dropdownItem" (click)="logOut()">退出</div>
+		    </div>
+		  </div>
+		</div>
+<!--    <div class="userInfo">
       <div class="wel">欢迎您：</div>
       <div class="user">
         <img src="../../assets/images/icon_keshi.png" alt="" />
@@ -40,7 +55,7 @@
         <div class="logOut" (click)="setSpecimen()">切换科室</div>
         <div class="logOut" (click)="logOut()">退出</div>
       </div>
-    </div>
+    </div> -->
   </div>
   <!-- 头部 end -->
   <!-- 主体部分 start -->
@@ -50,7 +65,7 @@
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
         <strong>手术间标本</strong>
-				<span *ngIf="printPharmacyList.length>0">共 {{printPharmacyList.length}} 条</span>
+				<span *ngIf="otherData1">{{otherData1.pathologyFormNum}}申请单 {{otherData1.specimenNum}}标本</span>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -82,6 +97,7 @@
                 <span title="住院号" class="weight">
 									<span class="sign-red" *ngIf="item.pathologyFormType==1">速</span>
 									<span *ngIf="item.pathologyFormType==0">普</span>
+									<span *ngIf="item.pathologyFormType==2">细</span>
 									{{item.applyCode || '无'}}
 								</span>
                 <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
@@ -141,7 +157,7 @@
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
         <strong>标本间标本</strong>
-				<span *ngIf="waitPharmacyList.length>0">共 {{waitPharmacyList.length}} 条</span>
+				<span *ngIf="otherData2">{{otherData2.pathologyFormNum}}申请单 {{otherData2.specimenNum}}标本</span>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -173,6 +189,7 @@
                 <span title="住院号" class="weight">
 									<span class="sign-red" *ngIf="item.pathologyFormType==1">速</span>
 									<span *ngIf="item.pathologyFormType==0">普</span>
+									<span *ngIf="item.pathologyFormType==2">细</span>
 									{{item.applyCode || '无'}}
             		</span>
                 <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
@@ -232,7 +249,7 @@
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
         <strong>今日离科标本</strong>
-				<span *ngIf="pharmacyList.length>0">共 {{pharmacyList.length}} 条</span>
+				<span *ngIf="otherData3">{{otherData3.pathologyFormNum}}申请单 {{otherData3.specimenNum}}标本</span>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -264,6 +281,7 @@
                 <span title="住院号" class="weight">
             			<span class="sign-red" *ngIf="item.pathologyFormType==1">速</span>
             			<span *ngIf="item.pathologyFormType==0">普</span>
+									<span *ngIf="item.pathologyFormType==2">细</span>
 									{{item.applyCode || '无'}}
             		</span>
                 <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
@@ -463,6 +481,9 @@
 		</overlay-scrollbars>
 		<div class="display_flex justify-content_flex-center">
 			<button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">确定</button>
+			<button class="btn mar-left" nz-button nzType="primary" nzGhost (click)="hideModal()">
+			  取消
+			</button>
 		</div>
 	</div>
 </div>
@@ -607,7 +628,7 @@
 						<input nz-input disabled formControlName="name" placeholder="请输入医生姓名" nzSize="default" />
 					</nz-form-control>
 				</nz-form-item>
-				<nz-form-item>
+<!-- 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="nurseJobNumber">护士工号</nz-form-label>
 					<nz-form-control [nzSpan]="18" nzErrorTip="请输入护士工号!">
 						<input nz-input (ngModelChange)="numberChange($event,2)" formControlName="nurseJobNumber" placeholder="请输入护士工号" nzSize="default" />
@@ -618,10 +639,10 @@
 					<nz-form-control [nzSpan]="18" nzErrorTip="请输入护士姓名!">
 						<input nz-input disabled formControlName="nurseName" placeholder="请输入护士姓名" nzSize="default" />
 					</nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
 				<nz-form-item *ngIf="!ifFixType">
-				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固定液类型</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固定液类型!">
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixative">固定液类型</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择固定液类型!">
 				    <nz-input-group>
 							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择固定液类型" formControlName="fixative">
 							  <ng-container *ngFor="let option of fixativeData">
@@ -648,7 +669,7 @@
 		<div class="content">
 			<div class="content-item boder-right">
 				<nz-form-item class="form-title-box">
-					<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单':'病理检查申请单'}}</div>
+					<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单' : detailsData.pathologyFormType==2 ? '病理细胞学申请单' : '病理检查申请单'}}</div>
 					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
 				</nz-form-item>
 				<nz-form-item class="form-title-box">

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

@@ -14,7 +14,11 @@
     color: @primary-color!important;
     font-weight: bold !important;
   }
-
+	
+	.mar-left{
+		margin-left: 10px;
+	}
+	
   h1,
   h2,
   h3,
@@ -163,44 +167,118 @@
       }
     }
   }
-  .userInfo {
-		width: 260px;
+		
+	.right {
+		width: 20%;
 		height: 100%;
-		padding: 8px 36px 8px 8px;
-		box-sizing: border-box;
-		font-size: 14px;
-		border-left: 1px solid #e5e9ed;
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		justify-content: right;
+		// box-shadow: 0px 3px 6px 1px rgba(167, 167, 167, 0.16);
+		height: 48px;
+		.msg {
+			float: left;
+			width: 50px;
+			height: 100%;
+			border-left: 1px solid #e5e9ed;
 
-    .wel {
-      line-height: 15px;
-    }
+			.msgBtn {
+				width: 100%;
+				height: 100%;
 
-    .user {
-      font-size: 20px;
-      height: 36px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      line-height: normal;
+				i {
+					font-size: 30px;
+				}
+			}
+		}
 
-      img {
-        height: 100%;
-        margin-right: 8px;
-      }
-    }
-    .userInfo-wrap {
-      display: flex;
-      justify-content: flex-end;
-      .logOut {
-        display: inline-block;
-        text-align: right;
-        color: @primary-color;
-        line-height: 20px;
-        cursor: pointer;
-        margin-right: 8px;
-      }
-    }
-  }
+		.userInfo {
+			height: 100%;
+			float: right;
+			padding: 0 24px;
+			box-sizing: border-box;
+			font-size: 14px;
+			// border-left: 1px solid #e5e9ed;
+
+			.wel {
+				line-height: 15px;
+				white-space: nowrap;
+				overflow: hidden;//文本超出隐藏
+				text-overflow: ellipsis;//文本超出省略号替代
+			}
+
+			.user {
+				overflow: hidden;
+				height: 48px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 16px;
+				cursor: pointer;
+
+				img {
+					width: 32px;
+					height: 32px;
+					margin-right: 8px;
+				}
+
+				span, .transport-xiala1 {
+					height: 48px;
+					line-height: 48px;
+				}
+			}
+
+			.logOut {
+				text-align: right;
+				color: @primary-color;
+				line-height: 20px;
+
+				span {
+					cursor: pointer;
+					padding: 10px;
+				}
+			}
+		}
+	}
+	
+	// 下拉列表
+	.dropdown{
+	  position: relative;
+	  height: 48px;
+	  line-height: 48px;
+	  .dropdown-content {
+	    position: absolute;
+	    top: 48px;
+	    background-color: #fff;
+	    width: 156px;
+	    box-shadow: 0px 2px 4px 1px #D9D9D9;
+	    z-index: 999999;
+	    border-radius: 4px;
+	    border: 1px solid rgba(0,0,0,0.15);
+	    color: rgba(0,0,0,0.65);
+	    &.ct{
+	      left: 50%;
+	      transform: translateX(-50%);
+	    }
+	    &.r8{
+	      right: 8px;
+	    }
+	  }
+	
+	  .dropdown-content .dropdownItem {
+	    height: 40px;
+	    cursor: pointer;
+	    display: flex;
+	    align-items: center;
+	    padding: 0 24px;
+	  }
+	
+	  .dropdown-content .dropdownItem:hover {
+	    background-color: #e9f7e9;
+	  }
+	}
+	
   // 头部 end
   // 主体部分 start
   .pharmacy-main {
@@ -649,7 +727,12 @@
 			}
 	  }
 		.no-width{
-			width: 30% !important;
+			width: 33% !important;
+			.ant-input-disabled{
+				color: rgba(0, 0, 0, 0.65) !important;
+				background: #fff !important;
+				border: none !important;
+			}
 		}
 	}
 

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

@@ -138,13 +138,14 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		});
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
+		// 手术间列表
+		this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
+		// 标本间列表
+		this.getPharmacyList(this.waitPharmacyIdx, 'specimenDept', this.waitPharmacySearchKey);
+		// 今日离科标本列表
+		this.getPharmacyList(this.pharmacyIdx, 'leavedDept', this.pharmacySearchKey);
     this.runTime();
-    // 统计
-    // this.total();
 		this.getDept()
-    // 切换科室
-    // this.changeKs();
-
     this.initRole();
     // 自动刷新倒计时 start
     this.autoUpdate();
@@ -289,7 +290,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.fixationData = format(result, 'yyyy-MM-dd');
 		console.log(this.fixationData)
 	}
-	fixationTimeSelect:any;
+	fixationTimeSelect:any = null;
 	fixationTimeChange(result){
 		if(result){
 			this.fixationTimeSelect = format(result, 'HH:mm');
@@ -310,8 +311,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  fixationDate: [null, [Validators.required]],
 			jobNumber: [null, [Validators.required]],
 			name:[null, [Validators.required]],
-			nurseJobNumber: [null, [Validators.required]],
-			nurseName:[null, [Validators.required]],
+			// nurseJobNumber: [null, [Validators.required]],
+			// nurseName:[null, [Validators.required]],
 			fixative:[null, [Validators.required]],
 		});
 		let date = new Date();
@@ -336,9 +337,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				new FormControl(null, Validators.required)
 			);
 			this.validateVerificationForm.controls.fixationDate.setValue(inVitroDate);
-			// this.validateVerificationForm.controls.fixationTimes.setValue(date);
+			this.validateVerificationForm.controls.fixationTimes.setValue(date);
 			this.fixationData = inVitroDate;
-			// this.fixationTimeSelect = format(date, 'HH:mm');
+			this.fixationTimeSelect = format(date, 'HH:mm');
 		}
 
 		this.btnLoading = true
@@ -417,7 +418,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	
 	// 获取科室
 	getDept(){
-		this.setSpecimen()
+		this.validateForm = this.fb.group({
+		  specimen: [null, [Validators.required]],
+			operation: [null, [Validators.required]],
+			generate:[null, [Validators.required]],
+			showFrozen:[null, [Validators.required]],
+		});
 		var that = this;
 		that.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
 			let item1 = res2.find(i=>i.name=='手术室科室')
@@ -467,33 +473,28 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 					this.validateForm.controls.operation.setValue(deptArr);
 				}
 				this.validateForm.controls.specimen.setValue(data.dept.id);
-				this.validateForm.controls.showFrozen.setValue(data.showFrozen);
-				if(data.autoCreateOrder){
+				if(data.showFrozen!=null){
+					this.validateForm.controls.showFrozen.setValue(data.showFrozen);
+				}else{
+					this.validateForm.controls.showFrozen.setValue(0);
+				}
+				if(data.autoCreateOrder!=null){
 					this.validateForm.controls.generate.setValue(data.autoCreateOrder);
+				}else{
+					this.validateForm.controls.generate.setValue(1);
 				}
 		  });
 	}
 
 	// 获取是否关联标本间
 	setSpecimen(){
-		if(this.validateForm){
-			this.validateForm = this.fb.group({
-			  specimen: [this.validateForm.value.specimen, [Validators.required]],
-				operation: [this.validateForm.value.operation, [Validators.required]],
-				generate:[this.validateForm.value.generate, [Validators.required]],
-				showFrozen:[this.validateForm.value.showFrozen, [Validators.required]],
-			});
-		}else{
-			this.validateForm = this.fb.group({
-			  specimen: [null, [Validators.required]],
-				operation: [null, [Validators.required]],
-				generate:[1, [Validators.required]],
-				showFrozen:[0, [Validators.required]],
-			});
-		}
 		this.relevanceModal = true
 	}
-
+	
+	hideModal(){
+		this.relevanceModal = false
+	}
+	
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -568,6 +569,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
+				user.user.autoCreateOrder = data["data"].autoCreateOrder;
 	      user.user.currentHospital = data["data"].currentHospital;
 	      localStorage.setItem("user", JSON.stringify(user));
 	    }
@@ -578,10 +580,10 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	handoverUserId:any = null; //医生工号
 	nurseId:any = null; //护士工号
 	numberChange(e,type){
-		// if(e.length < 3) {
-		// 	this.validateVerificationForm.controls.name.setValue('');
-		// 	return
-		// }
+		if(e.length < 3) {
+			this.validateVerificationForm.controls.name.setValue('');
+			return
+		}
 		let query = {
 		  account: e
 		};
@@ -593,8 +595,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 						this.validateVerificationForm.controls.name.setValue(data.userName);
 						this.handoverUserId = data.userId
 					}else{
-						this.validateVerificationForm.controls.nurseName.setValue(data.userName);
-						this.nurseId = data.userId
+						// this.validateVerificationForm.controls.nurseName.setValue(data.userName);
+						// this.nurseId = data.userId
 					}
 				}
 		  });
@@ -777,6 +779,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   loading3 = false;
   loading4 = false;
   loading5 = false;
+	otherData1 = null;
+	otherData2 = null;
+	otherData3 = null;
   getPharmacyList(idx, type, searchKey) {
     let hosId = JSON.parse(localStorage.getItem("user")).user.currentHospital.id;
     switch (type) {
@@ -828,6 +833,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
               } else {
                 this.printPharmacyFlag = true;
               }
+							this.otherData1 = result.otherData;
               // 列表数据合并
               if (idx === 0) {
                 this.printPharmacyList = result["list"];
@@ -848,6 +854,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
               } else {
                 this.waitPharmacyFlag = true;
               }
+							this.otherData2 = result.otherData;
               if (idx === 0) {
                 this.waitPharmacyList = result["list"];
               } else {
@@ -867,6 +874,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
               } else {
                 this.pharmacyFlag = true;
               }
+							this.otherData3 = result.otherData;
               if (idx === 0) {
                 this.pharmacyList = result["list"];
               } else {
@@ -963,6 +971,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 
   // 右侧菜单
   showLastItems: boolean = false;
+	showDropdown:boolean = false;
   // 下拉
   fixedMenuXiala() {
     this.showLastItems = true;
@@ -972,7 +981,17 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   fixedMenuShangla() {
     this.showLastItems = false;
   }
-
+	
+	// 回到系统管理
+	toMain() {
+	  this.router.navigateByUrl("main");
+	}
+	
+	// 配送记录
+	distributionRecord(){
+		this.router.navigateByUrl("main/batchDistribution");
+	}
+	
   mainRole: boolean = false; //回到系统管理权限
   initRole() {
     let menus = JSON.parse(localStorage.getItem("menu"));