合并代码

package.json

@@ -5,7 +5,7 @@
     "start": "ng serve --proxy-config proxy.conf.json --port 4210 --disable-host-check --public-host=dashitech.com --host 0.0.0.0",
     "build": "ng build --prod",
     "start:17": "set NODE_OPTIONS=--openssl-legacy-provider && ng serve --proxy-config proxy.conf.json --port 4210 --disable-host-check --public-host=dashitech.com --host 0.0.0.0",
-    "build:17": "set NODE_OPTIONS=--openssl-legacy-provider && npm run build",
+    "build:17": "set NODE_OPTIONS=--openssl-legacy-provider --max_old_space_size=4096 && npm run build",
     "development": "node ./upload/development.js",
     "production": "node ./upload/production.js",
     "test": "ng test",

src/app/app-routing.module.ts

@@ -11,6 +11,10 @@ import { MainGuard } from './guard/main.guard';
 import { PharmacyGuard } from './guard/pharmacy.guard';
 // 标本视图权限
 import { SpecimenView2Guard } from './guard/SpecimenView2Guard.guard';
+// 标本间端权限
+import { SpecimenRoomViewGuard } from './guard/SpecimenRoomViewGuard.guard';
+// 病理科权限
+import { PathologyGuard } from './guard/Pathology.guard';
 // 全局业务查看权限
 import { DisinfectionSupplyGuard } from './guard/DisinfectionSupplyGuard.guard';
 // 配置中心查看权限
@@ -69,6 +73,23 @@ const routes: Routes = [
     loadChildren: () => import('./views/specimen-view2/specimen-view2.module').then(m => m.SpecimenView2Module),
     canActivate: [SpecimenView2Guard]
   },
+	// 标本间端
+	{
+	  path: 'specimenRoomView',
+	  loadChildren: () => import('./views/specimen-room-view/specimen-room-view.module').then(m => m.SpecimenRoomViewModule),
+	  canActivate: [SpecimenRoomViewGuard]
+	},
+	// 病理科端
+	{
+	  path: 'pathology',
+	  loadChildren: () => import('./views/pathology/pathology.module').then(m => m.PathologyModule),
+	  canActivate: [PathologyGuard]
+	},
+	// 病理科端-扫描条码
+	{
+	  path: 'pathologyScan',
+	  loadChildren: () => import('./views/pathologyScan/pathologyScan.module').then(m => m.PathologyScanModule),
+	},
   // 全局业务查看
   {
     path: 'disinfectionSupply',

src/app/guard/Pathology.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class PathologyGuard implements CanActivate {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'pathology');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/guard/SpecimenRoomViewGuard.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SpecimenRoomViewGuard implements CanActivate {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'specimenRoomView');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/main.service.ts

@@ -916,4 +916,81 @@ export class MainService {
 	downloadAttachment(token): any {
 	  return host.host + "/common/common/downloadAttachment/" + token;
 	}
+
+	//病理申请单打印
+	 pathologyPrint(data) {
+	   return this.http.post(host.host + `/pathology/print`, data, {
+	     headers: this.headers,
+	   });
+	 }
+
+	// 病理查询标本条码
+	pathologyScanCode(data) {
+	  return this.http.post(host.host + `/pathology/scanCode`, data, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 工号搜索
+	jobSearch(data) {
+	  return this.http.post(host.host + `/data/isRepeat`, data, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 标本间获取批次号
+	generateBatchNumber() {
+	  return this.http.post(host.host + `/pathology/generateBatchNumber/blbatch`, {}, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 标本间获取标本接收信息
+	getSpecimenInfo(batchNo,deptId) {
+	  return this.http.post(host.host + `/pathology/getInfo/${batchNo}/${deptId}`, {}, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 标本间标本接收-交接完成
+	handoverCompleted(data) {
+	  return this.http.post(host.host + `/pathology/handoverCompleted`, data, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 病理科打包
+	pathologyPack(data) {
+	  return this.http.post(host.host + `/pathology/pack`, data, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 病理科今日接收汇总
+	pathologyToday(data) {
+	  return this.http.post(host.host + `/pathology/receiveToday`, data, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 大输液-发药批次-发药总量
+	drugsGross(batchId) {
+	  return this.http.get(host.host + `/infusion/solutions/drugsNum/${batchId}`, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 大输液-发药批次-发药信息
+	drugsInfo(data) {
+	  return this.http.post(host.host + `/infusion/solutions/dispensing/medicine/details`,data, {
+	    headers: this.headers,
+	  });
+	}
+
+	// 统计分析-陪检统计
+	inspectionStatistics(data) {
+	  return this.http.post(host.host + `/report/accompanied/inspection`,data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/services/tool.service.ts

@@ -51,6 +51,14 @@ export class ToolService {
       ? JSON.parse(localStorage.getItem("user")).user.currentHospital
       : JSON.parse(localStorage.getItem("user")).infoPermission.hospitals[0];
   }
+	//获取当前用户id
+	getCurrentUserId() {
+	  return JSON.parse(localStorage.getItem("user")).user.id;
+	}
+	//获取当前用户信息
+	getCurrentUserInfo() {
+	  return JSON.parse(localStorage.getItem("user")).user;
+	}
   //获取当前用户科室
   getCurrentUserDept() {
     return JSON.parse(localStorage.getItem("user")).user.dept;
@@ -223,6 +231,12 @@ export class ToolService {
         case "commonFault":
           coopBtns.commonFault = true; //常见故障
           break;
+				case "dispensingInfo":
+				  coopBtns.dispensingInfo = true; //发药信息
+				  break;
+				case "dispensingGross":
+				  coopBtns.dispensingGross = true; //发药总量
+				  break;
         case "assign":
           coopBtns.assign = true; //指派
           break;

src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -187,6 +187,17 @@ export class HsPromptModalComponent implements OnInit {
           type: {id: "386"},
         },
       }
+    }else if(this.deptType === 'pathology'){
+      dataObj = {
+        idx: 0,
+        sum: 10,
+        department: {
+          searchType: 1,// 简单查询
+          hospital: { id: hosId },
+          dept: keywords,
+          type: {id: "282"},
+        },
+      }
     }
     this.mainService
       .getFetchDataList("data", "department", dataObj)

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

@@ -0,0 +1,365 @@
+<div class="pathology-box display_flex align-items_center justify-content_flex-center">
+	<div class="pathology-content">
+		<div class="title">病理申请单<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+		</div>
+		<div class="content" *ngIf="!isSpinning">
+			<form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+				<div class="content-item boder-right">
+					<nz-form-item class="form-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.applyCode}}</div>
+						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+					</nz-form-item>
+					<nz-form-item class="form-title-box">
+						<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					</nz-form-item>
+					<nz-form-item class="form-title-box">
+						<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+						<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}</div>
+					</nz-form-item>
+					<nz-form-item>
+						<div class="form-title width-100 font-weight-500">诊断：</div>
+						<div>
+							{{detailsData.diagnose||'无'}}
+						</div>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<div class="form-title width-100 font-weight-500">病历摘要：</div>
+						<div>{{detailsData.medicalRecords||'无'}}</div>
+					</nz-form-item>
+					
+					<nz-form-item>
+						<div class="form-title width-100 font-weight-500">手术方案：</div>
+						<div>{{detailsData.surgicalPlan||'无'}}</div>
+					</nz-form-item>
+					
+					<!-- <nz-form-item class="form-item">
+						<nz-form-label nzRequired nzFor="surgicalPlan" [nzSm]="24" [nzXs]="24">手术方案</nz-form-label>
+						<nz-form-control nzErrorTip="请输入手术方案" [nzSm]="24" [nzXs]="24">
+							<textarea rows="3" nz-input disabled formControlName="surgicalPlan" placeholder="请输入手术方案"></textarea>
+						</nz-form-control>
+					</nz-form-item> -->
+				</div>
+				
+				<div class="content-item">
+	<!-- 				<nz-form-item class="form-item">
+						<nz-form-label nzRequired nzFor="intraoperativeFindings" [nzSm]="6" [nzXs]="24">术中所见</nz-form-label>
+						<nz-form-control nzErrorTip="请输入术中所见" [nzSm]="24" [nzXs]="24">
+							<textarea rows="3" nz-input formControlName="intraoperativeFindings" placeholder="请输入术中所见"></textarea>
+						</nz-form-control>
+					</nz-form-item> -->
+					<nz-form-item class="form-item">
+						<nz-form-label nzRequired nzFor="intraoperativeRapidity" [nzSm]="6" [nzXs]="24">是否术中快速</nz-form-label>
+						<nz-form-control nzErrorTip="请选择!" [nzSm]="18" [nzXs]="24">
+							<nz-radio-group formControlName="intraoperativeRapidity">
+								<label nz-radio [nzValue]="1">是</label>
+								<label nz-radio [nzValue]="0">否</label>
+							</nz-radio-group>
+						</nz-form-control>
+					</nz-form-item>
+					<nz-form-item class="form-item">
+						<nz-form-label nzRequired nzFor="project" [nzSm]="4" [nzXs]="24">检验项目</nz-form-label>
+						<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="20" [nzXs]="24">
+							<nz-input-group>
+								<nz-select nzSearch nzShowSearch nzMode="multiple" nzPlaceHolder="请选择检验项目" formControlName="project">
+									<ng-container *ngFor="let option of projectData">
+										<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+									</ng-container>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<div class="df-sb">
+						<nz-form-item class="form-item">
+							<nz-form-label nzRequired nzFor="specimenGenre">标本类型</nz-form-label>
+							<nz-form-control nzErrorTip="请选择标本类型!">
+								<nz-input-group>
+									<nz-select nzSearch nzShowSearch nzPlaceHolder="请选择标本类型" formControlName="specimenGenre">
+										<ng-container *ngFor="let option of specimenData">
+											<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+										<nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+											<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+										</nz-option>
+									</nz-select>
+								</nz-input-group>
+							</nz-form-control>
+						</nz-form-item>
+						
+						<nz-form-item class="form-item-right">
+							<nz-form-label nzRequired nzFor="specimenNum">标本数量</nz-form-label>
+							<nz-form-control nzErrorTip="请输入标本数量!">
+								<input nz-input formControlName="specimenNum" disabled placeholder="请输入标本数量" nzSize="default" />
+							</nz-form-control>
+						</nz-form-item>
+					</div>
+					
+					
+					<nz-form-item class="form-item">
+						<nz-form-label nzRequired nzFor="takePart" [nzSm]="4" [nzXs]="24">部位</nz-form-label>
+						<nz-form-control nzErrorTip="请输入部位!" [nzSm]="20" [nzXs]="24">
+							<input nz-input formControlName="takePart"  placeholder="请输入部位" nzSize="default" />
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item class="form-item">
+						<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">标本</nz-form-label>
+						<div class="add-icon-class" (click)='openSpecimen()'>
+							<span class="icon_transport transport-tag27fuben form-icon"></span>
+						</div>
+					</nz-form-item>
+					
+					<div class="specimen-list">
+						<div *ngFor="let item of specimenList;let index=index;" class="specimen-item">
+							<div class="specimen-name" (click)="specimenEdit($event,item,index)">
+							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+							</div>
+							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
+						</div>
+					</div>
+				</div>
+			</form>
+		</div>
+		<div class="mask-style" *ngIf="isSpinning">
+			<nz-spin nzSimple class="spin-style"></nz-spin>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+		  <button class="btn btn-right" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">打印标本</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 选择标本 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenModal">
+	<div class="modalBody">
+		<div class="title">新增病理标本<i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i>
+		</div>
+		<div class="content">
+			<form nz-form [formGroup]="validateSpecimenForm" class="addForm" (ngSubmit)="submitSpecimen()">
+				<nz-form-item class="form-item">
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">位置来源</nz-form-label>
+					<div class="specimen-list">
+						<div>
+							<div *ngFor="let item of placeList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == placeIndex}" (click)="placeClick($event,item,index)" class="select-item">{{item.name}}</div>
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">系统</nz-form-label>
+					<div class="specimen-list">
+						<div *ngFor="let item of systemList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == systemIndex}" (click)="systemClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">器官</nz-form-label>
+					<div class="specimen-list">
+						<div *ngFor="let item of apparatusList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == apparatusIndex}" (click)="apparatusClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</nz-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 specimenNameList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == specimenNameIndex}" (click)="specimenNameClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
+					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">标本名称</nz-form-label>
+					<nz-form-control nzErrorTip="请输入标本名称" [nzSm]="21" [nzXs]="24">
+						<input nz-input maxlength="15" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
+					</nz-form-control>
+					<div class="empty-box">
+						<span class="name">{{specimenNameLength}}/15</span>
+						<span class="empty" (click)="emptData($event)">清空</span>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
+					<nz-form-label nzFor="remark" [nzSm]="3" [nzXs]="24">备注</nz-form-label>
+					<nz-form-control nzErrorTip="请输入备注" [nzSm]="21" [nzXs]="24">
+						<textarea rows="3" nz-input formControlName="remark" placeholder="请输入备注"></textarea>
+					</nz-form-control>
+				</nz-form-item>
+			</form>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen(1)" [nzLoading]="btnSpLoading">确定</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen(2)">新增下一个标本</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+<app-prompt-modal *ngIf="specimenModalShow" [content]="promptContent" [success]="ifSuccess" [show]="specimenModalShow"
+  [info]="promptInfo" (closeModel)="closeSpecimenModel()"></app-prompt-modal>
+
+ <!-- 新增下一个标本 -->
+<app-dialog-delete [delModal]="addMadal" (hideDelModalEvent)="hideAddModal()" [btnLoading]="addSpLoading"
+  (confirmDelEvent)="confirmAdd()" content="您确认要新增下一个标本吗？"></app-dialog-delete>
+	
+	<!-- 删除模态框 -->
+	<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+	  (confirmDelEvent)="confirmDel()" content="您确认要删除标本吗？"></app-dialog-delete>
+		
+<!-- 未打印 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="notModal">
+	<div class="modalBody no-width">
+		<div class="title">未打印<i class="icon_transport transport-guanbi" (click)="hideNotModal()"></i>
+		</div>
+		<div class="content">
+			<form nz-form [formGroup]="validatePrintForm" class="addForm" (ngSubmit)="submitPrintForm()">
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="8" nzFor="inVitroTime">标本离体时间</nz-form-label>
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择标本离体时间!">
+				    <nz-input-group>
+							<nz-date-picker formControlName="inVitroTime" 
+							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="formChangeDate($event)"></nz-date-picker>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="5" nzFor="jobNumber">工号</nz-form-label>
+					<nz-form-control [nzSpan]="19" nzErrorTip="请输入工号!">
+						<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="5" nzFor="name">姓名</nz-form-label>
+					<nz-form-control [nzSpan]="19" nzErrorTip="请输入姓名!">
+						<input nz-input disabled formControlName="name" placeholder="请输入姓名" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+			</form>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitPrintForm()" [nzLoading]="printLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideNotModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+
+  <!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad">
+			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
+				border-radius: 5px;font-size: 12px;">
+				 <div style="display: flex;">
+					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
+					 <div style="width: 50%;">
+						 
+						 <img style="width: 100%; border-radius: 5px;
+						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
+					 	<!-- <img style="width: 100%; border-radius: 5px;
+					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+					 </div>
+				 </div>
+				
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+					<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+					<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+					<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
+					<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
+				</div>
+				<div style="display: flex;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
+				</div>
+				
+			</div>
+			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
+					 <div style="display: flex;">
+					 	<img style="width: 50%;height: 70px;border-radius: 5px;" [src]="data.barCode" alt="">
+						<div style="width: 50%;">
+							<img style="width: 100%; border-radius: 5px;
+								position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
+							<!-- <img style="width: 100%;border-radius: 5px;
+								position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+						</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
+					 	<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{data.patientName}}</div>
+						<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+						<div style="width:16%;box-sizing: border-box;padding:1px;border-top: 1px solid #aaa;">{{data.patientGender}}</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
+					 	<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">{{data.residenceNo}}</div>
+						<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+						<div style="width:16%;box-sizing: border-box;padding:1px;"> {{data.patientAge}}岁</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+					 	<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;
+						padding:1px;overflow: hidden;white-space: nowrap">{{data.patientDept}}</div>
+						<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+						<div style="width:16%;box-sizing: border-box;padding:1px;">{{data.patientBedNum}}床</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">标本名称</div>
+					 	<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;
+						padding:1px;overflow: hidden;white-space: nowrap">({{index+1}}/{{printData.specimenList.length}}){{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">申请单号</div>
+					 	<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.applyCode }}</div>
+					 </div>
+					 <div style="display: flex;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+					 	<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+					 </div>
+				 </div>
+				</div>
+			</div>
+		</div>
+  </div>

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

@@ -0,0 +1,282 @@
+/* 修改垂直滚动条 */
+::-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;
+}
+
+.pathology-box {
+  position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 99;
+	.pathology-content{
+		width: 80%;
+		background: #fff;
+		border-radius: 5px;
+		padding: 10px 20px;
+		color: #000;
+		.title {
+		  width: 100%;
+		  text-align: center;
+		  font-size: 18px;
+		  position: relative;
+		
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		.content{
+			width: 100%;
+			background: #f9fafb;
+			border: 1px solid #e5e9ed;
+			border-radius: 5px;
+			// overflow: hidden;
+			margin-top: 12px;
+			// height: auto;
+			// // padding: 19px 14px 10px 0;
+			// max-height: 460px;
+			// overflow-y: auto;
+			.addForm{
+				display: flex;
+				.width-100{
+					width: 100%;
+				}
+				.font-weight-500{
+					color: #000;
+					font-weight: 500;
+				}
+				.ant-select{
+					width: 100%;
+				}
+				
+				.content-item{
+					flex: 1;
+					height: 460px;
+					overflow-y: auto;
+					padding: 0 15px;
+					.df-sb{
+						display: flex;
+						justify-content: space-between;
+						.form-item{
+							flex: 1;
+							display: flex;
+							flex-wrap: nowrap;
+							.ant-form-item-label{
+								width: 33%;
+							}
+							.ant-form-item-control-wrapper{
+								width: 60%;
+							}
+						}
+						.form-item-right{
+							flex: 1;
+							display: flex;
+							flex-wrap: nowrap;
+							.ant-form-item-label{
+								width: 33%;
+							}
+							.ant-form-item-control-wrapper{
+								width: 70%;
+							}
+						}
+					}
+					.form-title-box{
+						display: flex;
+						.form-title{
+							color: #333;
+							margin-right: 40px;
+						}
+					}
+					.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{
+							
+						}
+					}
+				}
+				.boder-right{
+					border-right: 1px solid #e5e9ed;
+				}
+				.specimen-item{
+					display: flex;
+					margin-bottom: 10px;
+					.specimen-name{
+						cursor: pointer;
+					}
+					.specimen-icon{
+						color: #64BD7B;
+						cursor: pointer;
+						font-size: 20px;
+						position: relative;
+						top: -4px;
+						left: 2px;
+					}
+				}
+			}
+		}
+		.mask-style{
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 999;
+			display: flex;
+			background: rgba(0,0,0,0.2);
+			align-items: center;
+			justify-content: center;
+		}
+		.spin-style{
+			z-index:9999;
+		}
+		.bottom-btn{
+			margin-top: 10px;
+			.btn-right{
+				margin-right: 10px;
+			}
+		}
+	}
+	
+}
+	// 新增
+	&.add {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 999;
+	  .modalBody {
+	    width: 80%;
+	    height: auto;
+			padding: 10px 20px;
+			border-radius: 5px;
+			background: #fff;
+			.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: auto;
+	      padding: 19px 14px 0 14px;
+	      max-height: 500px;
+	      overflow-y: auto;
+				.ant-form-item {
+				  margin-bottom: 14px;
+					display: flex;
+					flex-wrap: wrap;
+					position: relative;
+				  .ant-form-item-label {
+				    text-align: left;
+						font-weight: 500;
+				  }
+					.ant-form-item-control-wrapper{
+						.ant-form-item-control{
+							width: 400px;
+						}
+					}
+					.empty-box{
+						position: absolute;
+						right: 6px;
+						top: 8px;
+						.name{
+							color: #ccc;
+						}
+						.empty{
+							color: #64BD7B;
+							cursor: pointer;
+						}
+					}
+				}
+				.specimen-list{
+					flex: 1;
+					.select-item{
+						margin-top: 5px;
+						display: flex;
+						flex-wrap: wrap;
+						padding: 3px 8px;
+						border: 1px solid #e5e9ed;
+						border-radius: 5px;
+						margin-right: 10px;
+						cursor: pointer;
+						display: inline-block;
+					}
+				}
+				
+				.activeClass{
+					color: #64BD7B;
+					border-color: #64BD7B !important;
+				}
+	      
+	    }
+			.bottom-btn{
+				margin-top: 10px;
+				.btn-right{
+					margin-right: 10px;
+				}
+			}
+	  }
+		.no-width{
+			width: 30% !important;
+		}
+	}

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

@@ -0,0 +1,821 @@
+import { Component, ElementRef, Output, Input, OnInit, EventEmitter } from '@angular/core';
+import { HttpHeaders, HttpRequest, HttpClient  } from "@angular/common/http";
+import host from "../../../assets/js/http";
+import { NzMessageService } from "ng-zorro-antd";
+import { MainService } from '../../services/main.service';
+import { DomSanitizer } from '@angular/platform-browser';
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+import { format, startOfDay, endOfDay, subDays} from "date-fns";
+import { ToolService } from "../../services/tool.service";
+
+@Component({
+  selector: 'app-pathology-add',
+  templateUrl: './pathology-add.component.html',
+  styleUrls: ['./pathology-add.component.less']
+})
+export class PathologyAddComponent implements OnInit {
+	
+	@Output() pathologyCancel = new EventEmitter();
+	@Input() surgeryId: string;
+	@Input() patientId: string;
+	
+	constructor(
+		private http: HttpClient,
+		private message: NzMessageService,
+		private mainService: MainService,
+		private fb: FormBuilder,
+		private tool: ToolService,
+		private sanitizer: DomSanitizer
+	) { }
+	
+	btnLoading:boolean = false;
+	validateForm: FormGroup; //新增/编辑表单
+	validateSpecimenForm: FormGroup; //选择标本表单
+	validatePrintForm: FormGroup;
+	specimenData:any=[]; //标本类型
+	projectData:any=[]; //检验项目
+	isDeptLoading:boolean = false;
+	specimenModal:boolean = false; //选择标本状态
+	isSpinning:boolean = false; //页面加载状态
+	detailsData:any;
+	specimenList:any=[]; //已选标本
+	placeIndex:any = null;
+	systemIndex:any = null;
+	apparatusIndex:any = null;
+	specimenNameIndex:any = null;
+	placeList:any=[]; //位置来源数据
+	systemList:any=[]; //系统数据
+	apparatusList:any=[]; //器官数据
+	specimenNameList:any=[]; //标本名称数据
+	promptContent: string; //操作提示框提示信息
+	ifSuccess: boolean; //操作成功/失败
+	promptInfo: string; //操作结果提示信息
+	promptModalShow: boolean; //操作提示框是否展示
+	specimenModalShow: boolean; //操作提示框是否展示
+	type:any = '未打印';
+	notModal:boolean = false;
+	hosId:any;
+	startDate: string; //离体开始
+	
+  ngOnInit() {
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.initForm()
+		this.fetchDataList()
+  }
+	
+	// 初始化新增form表单
+	initForm() {
+		this.validateForm = this.fb.group({
+		  intraoperativeRapidity: [null, [Validators.required]],
+			specimenGenre: [null, [Validators.required]],
+			// intraoperativeFindings: [null, [Validators.required]],
+			project: [null, [Validators.required]],
+			// surgicalPlan: [null, [Validators.required]],
+			specimenNum: [null,[Validators.required]],
+			takePart: [null, [Validators.required]]
+		});
+	}
+	
+	fetchDataList(){
+		let data = {
+		  idx: 0,
+		  sum: 9999,
+		  pathologyForm: {
+		    surgeryId: this.surgeryId || "",
+		    patientId: this.patientId || "",
+		    hosId: this.hosId || "" ,
+		  },
+		};
+		this.isSpinning = true;
+		this.mainService
+		  .getFetchDataList("data", "pathologyForm", data)
+		  .subscribe((data) => {
+		    this.isSpinning = false;
+		    this.detailsData = data.list[0];
+				// if(this.detailsData.surgicalPlan){
+				// 	this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
+				// }
+				// if(this.detailsData.intraoperativeFindings){
+				// 	this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
+				// }
+				this.getProDicData()
+				this.getDicData()
+				this.getSampleData()
+				this.getSourceData()
+				this.getSysData()
+		  });
+	}
+	
+	// 获取标本类型
+	getDicData(){
+		this.mainService.getDictionary("list", "specimen_type").subscribe((res) => {
+			this.specimenData = res.filter(i=>i.extra1 == 'pathologySpecimen')
+			if(this.detailsData.specimenType){
+				this.validateForm.controls.specimenGenre.setValue(this.detailsData.specimenType.id);
+			}
+			if(this.detailsData.specimenNum){
+				this.validateForm.controls.specimenNum.setValue(this.detailsData.specimenNum);
+			}
+			if(this.detailsData.takePart){
+				this.validateForm.controls.takePart.setValue(this.detailsData.takePart);
+			}
+		});
+	}
+	
+	// 获取检验项目
+	getProDicData(){
+		this.mainService.getDictionary("list", "pathology_inspect_type").subscribe((res) => {
+			this.projectData = res
+			let arr = []
+			if(this.detailsData.pathologyInspectDTOS){
+				for(let i of this.detailsData.pathologyInspectDTOS){
+					arr.push(i.inspectProject.id)
+				}
+				this.validateForm.controls.project.setValue(arr);
+			}
+		});
+	}
+	
+	// 获取标本-位置来源
+	getSourceData(){
+		this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
+			this.placeList = res
+		});
+	}
+	
+	// 获取标本-系统
+	getSysData(){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 1,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.systemList = data.list;
+		  });
+
+	}
+	
+	// 获取标本-器官
+	getApparatusData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 2,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+				if(data.list.length>0){
+					this.apparatusList = data.list;
+					if(type=='edit'){
+						setTimeout(_=>{
+							let index3 = this.apparatusList.findIndex(i=>i.id==item.organ.id)
+							this.apparatusIndex = index3
+							this.apparatusId = Number(item.organ.id);
+						},100)
+					}
+				}else{
+					this.message.info('暂无数据')
+				}
+		  });
+	}
+	
+	// 获取标本-标本名称
+	getSpNameData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 3,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.specimenNameList = data.list;
+				// this.specimenNameList.push({
+				// 	name:'其他',
+				// 	id:'qita'
+				// })
+				if(type=='edit'){
+					if(item.sample){
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, []],
+							specimenName: [null, [Validators.required]]
+						});
+						setTimeout(_=>{
+							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
+							this.specimenNameIndex = index4
+							this.specimenNameName = item.sample.name
+							this.specimenNameId = Number(item.sample.id);
+							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+						},100)
+					}else{
+						// this.validateSpecimenForm = this.fb.group({
+						//   remark: [null, []],
+						// 	specimenName: [null, [Validators.required]]
+						// });
+						// this.specimenNameIndex = this.specimenNameList.length-1
+						// // this.specimenNameName = 'qita'
+						// this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+					}
+					setTimeout(_=>{
+						this.validateSpecimenForm.controls.remark.setValue(item.remark);
+						this.specimenModal = true
+					},50)
+				}
+		  });
+	}
+	
+	// 删除标本
+	delModal:boolean = false
+	coopId:any;
+	specimenDel(e,item,index){
+		this.delModal = true
+		this.coopId = item.id
+	}
+	
+	// 确定删除
+	confirmDel(){
+		this.mainService
+		  .coopTypeConfig(
+		    "rmvData",
+		    "pathologySpecimen",
+		     [this.coopId]
+		  )
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.delModal = false;
+				this.getSampleData()
+		    if (data.status==200) {
+		      this.showSpecimenModal("删除", true, "");
+		    } else {
+		      this.showSpecimenModal("删除", false, data.data[0].msg);
+		    }
+		  });
+	}
+	// 确定删除
+	hideDelModal() {
+	  this.delModal = false;
+	}
+	
+	// 编辑标本
+	specimenDetailId:any = null;
+	specimenEdit(e,item,index){
+		this.specimenDetailId = item.id
+		let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
+		this.placeIndex = index1
+		this.placeId = Number(item.partSource.id)
+		let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
+		this.systemIndex = index2
+		this.systemId = Number(item.system.id)
+		this.getApparatusData(item.system.id,item,'edit')
+		this.getSpNameData(item.organ.id,item,'edit')
+	}
+	
+	// 选择标本
+	openSpecimen(){
+		this.validateSpecimenForm = this.fb.group({
+		  remark: [null, []],
+			specimenName:[null, [Validators.required]],
+		});
+		this.specimenDetailId = null;
+		this.placeIndex = null;
+		this.systemIndex = null;
+		this.apparatusIndex = null;
+		this.specimenNameIndex = null;
+		this.placeId = null;
+		this.systemId = null;
+		this.apparatusId = null;
+		this.specimenNameId = null;
+		this.placeList=[]; //位置来源数据
+		this.systemList=[]; //系统数据
+		this.apparatusList=[]; //器官数据
+		this.specimenNameList=[]; //标本名称数据
+		this.specimenNameName = null;
+		this.getSourceData()
+		this.getSysData()
+		this.specimenModal = true
+	}
+	
+	// 选择位置来源
+	placeId:any = null;
+	placeClick(e,item,index){
+		this.placeId = item.id
+		this.placeIndex = index
+	}
+	
+	// 选择系统
+	systemId:any = null;
+	systemClick(e,item,index){
+		this.systemId = Number(item.id)
+		this.systemIndex = index
+		this.apparatusList = [];
+		this.apparatusId = null;
+		this.apparatusIndex = null;
+		
+		this.specimenNameList = [];
+		this.specimenNameId = null;
+		this.specimenNameIndex = null;
+		this.specimenNameName = null;
+		if(this.validateSpecimenForm.value.specimenName){
+			this.validateSpecimenForm.controls.specimenName.setValue('')
+		}
+		this.getApparatusData(item.id,{},'select')
+	}
+	
+	// 选择器官
+	apparatusId:any = null;
+	apparatusClick(e,item,index){
+		this.apparatusId = Number(item.id)
+		this.apparatusIndex = index
+		this.specimenNameList = [];
+		this.specimenNameId = null;
+		this.specimenNameIndex = null;
+		this.specimenNameName = null;
+		if(this.validateSpecimenForm.value.specimenName){
+			this.validateSpecimenForm.controls.specimenName.setValue('')
+		}
+		this.getSpNameData(item.id,{},'select')
+	}
+	
+	// 选择标本名称
+	specimenNameId:any = null;
+	specimenNameName:any = null;
+	specimenNameClick(e,item,index){
+		this.specimenNameIndex = index
+		let remark = this.validateSpecimenForm.value.remark
+		// if(item.id == 'qita'){
+		// 	this.validateSpecimenForm = this.fb.group({
+		// 	  remark: [remark?remark:null, []],
+		// 		specimenName: [null, [Validators.required]]
+		// 	});
+		// 	this.specimenNameId = 'null'
+		// 	this.specimenNameName = 'qita'
+		// }else{
+			// this.validateSpecimenForm = this.fb.group({
+			//   remark: [remark?remark:null, []],
+			// });
+			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个')
+					return
+				}
+			}
+			
+			// if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length>15){
+			// 	this.message.error('字符长度不能超过15个')
+			// 	return
+			// }
+			let namn = null
+			if(this.validateSpecimenForm.value.specimenName){
+				namn = this.validateSpecimenForm.value.specimenName + '、'+ item.name
+			}else{
+				namn = item.name
+			}
+			this.validateSpecimenForm.controls.specimenName.setValue(namn);
+		// }
+	}
+	
+	// 保存标本
+	btnSpLoading:boolean = false;
+	addSpLoading:boolean = false;
+	addMadal:boolean = false;
+	submitSpecimen(type){
+		if(this.placeIndex==null){
+			this.message.error('请选择位置来源')
+			return
+		}
+		if(this.systemIndex==null){
+			this.message.error('请选择系统')
+			return
+		}
+		if(this.apparatusIndex==null){
+			this.message.error('请选择器官')
+			return
+		}
+		if(this.specimenNameIndex==null){
+			this.message.error('请选择标本名称')
+			return
+		}
+		for (const i in this.validateSpecimenForm.controls) {
+		  this.validateSpecimenForm.controls[i].markAsDirty();
+		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateSpecimenForm.invalid) return;
+		if(this.validateSpecimenForm.value.specimenName.length>15){
+			this.message.error('字符长度不能超过15个')
+			return
+		}
+		if(type==2){
+			this.addMadal = true
+			return
+		}
+		let data = {
+			pathologyFormId:this.detailsData.id,
+			partSource:{
+				id:this.placeId
+			},
+			system:{
+				id:this.systemId
+			},
+			organ:{
+				id:this.apparatusId
+			},
+			sample:{
+				id:this.specimenNameId
+			},
+			hosId:this.hosId,
+			specimenName:this.validateSpecimenForm.value.specimenName,
+			id:'',
+			remark:this.validateSpecimenForm.value.remark
+		};
+		// if(this.specimenNameName == 'qita'){
+		// 	delete data.sample
+		// 	data.specimenName = this.validateSpecimenForm.value.specimenName
+		// }else{
+			// data.specimenName = this.specimenNameName
+		// }
+		let queryType = null
+		if(this.specimenDetailId){
+			queryType = 'updData'
+			data.id = this.specimenDetailId
+		}else{
+			queryType = 'addData'
+			delete data.id
+		}
+		this.btnSpLoading = true;
+		this.mainService
+		  .simplePost(queryType, "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    this.btnSpLoading = false;
+		    if (res.status == 200) {
+					this.message.success('操作成功')
+					setTimeout(_=>{
+						this.closeSpecimenModel()
+					},200)
+		      // this.showSpecimenModal("操作", true, "");
+		    } else {
+					this.message.error(res.msg)
+		      // this.showSpecimenModal("操作", false, res.msg);
+		    }
+		  });
+	}
+	
+	// 新增下一个标本
+	confirmAdd(){
+		this.addSpLoading = true
+		let data = {
+			pathologyFormId:this.detailsData.id,
+			partSource:{
+				id:this.placeId
+			},
+			system:{
+				id:this.systemId
+			},
+			organ:{
+				id:this.apparatusId
+			},
+			sample:{
+				id:this.specimenNameId
+			},
+			hosId:this.hosId,
+			specimenName:this.validateSpecimenForm.value.specimenName,
+			id:'',
+			remark:this.validateSpecimenForm.value.remark
+		};
+		// if(this.specimenNameName == 'qita'){
+		// 	delete data.sample
+		// 	data.specimenName = this.validateSpecimenForm.value.specimenName
+		// }else{
+		// 	data.specimenName = this.specimenNameName
+		// }
+		let queryType = null
+		if(this.specimenDetailId){
+			queryType = 'updData'
+			data.id = this.specimenDetailId
+		}else{
+			queryType = 'addData'
+			delete data.id
+		}
+		// this.btnSpLoading = true;
+		this.mainService
+		  .simplePost(queryType, "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    // this.btnSpLoading = false;
+		    if (res.status == 200) {
+					this.message.success('操作成功')
+					this.validateSpecimenForm = this.fb.group({
+					  remark: [null, []],
+						specimenName:[null, [Validators.required]],
+					});
+					this.specimenDetailId = null;
+					this.specimenNameIndex = null;
+					this.specimenNameId = null;
+					
+					this.placeIndex = null;
+					this.placeId = null;
+					
+					// this.specimenNameList=[]; //标本名称数据
+					// this.specimenNameName = null;
+					
+					this.addSpLoading = false;
+					this.addMadal = false;
+					
+		    } else {
+					this.message.error(res.msg)
+		    }
+		  });
+	}
+	
+	// 新增下一个标本
+	hideAddModal() {
+	  this.addMadal = false;
+	}
+	
+	//清空标本名称
+	emptData(e){
+		e.stopPropagation()
+		this.validateSpecimenForm.controls.specimenName.setValue('')
+	}
+	
+	// 监听输入字数
+	specimenNameLength:any=0;
+	specimenInput(e){
+		if(e.length>15){
+			return
+		}
+		this.specimenNameLength = e.length
+	}
+	
+	// 获取标本列表
+	getSampleData(){
+		let data={
+			idx: 0,
+			sum: 9999,
+			pathologySpecimen:{
+				pathologyFormId:this.detailsData.id
+			}
+		}
+		this.mainService
+		  .getFetchDataList("data", "pathologySpecimen", data)
+		  .subscribe((res) => {
+		    this.specimenList = res.list
+				let str = []
+				if(res.list.length>0){
+					for(let i of res.list){
+						str.push(i.system.name + '-' + i.organ.name)
+					}
+					const newStr = new Set(str);
+					const newData = Array.from(newStr);
+					this.validateForm.controls.takePart.setValue(newData.join('、'));
+				}
+				this.validateForm.controls.specimenNum.setValue(this.specimenList.length);
+		  });
+	}
+	
+	hideSpecimenModal(){
+		this.getSampleData()
+		this.specimenModal = false
+	}
+	
+	hideNotModal(){
+		this.notModal = false
+	}
+	
+	// 日期选择
+	formChangeDate(result?): void {
+	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	//未打印提交
+	printLoading:boolean = false;
+	submitPrintForm(): void{
+		let that = this
+		for (const i in this.validatePrintForm.controls) {
+		  this.validatePrintForm.controls[i].markAsDirty();
+		  this.validatePrintForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validatePrintForm.invalid) return;
+		let ids = this.validateForm.value.project.join(',')
+		let data: any = {
+			pathologyForm:{
+				...this.validateForm.value,
+				...this.detailsData,
+				inVitroTime:this.startDate,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" ,
+				handoverUserId:this.handoverUserId,
+				pathologyInspectIds:ids,
+				specimenType:{
+					id:this.validateForm.value.specimenGenre
+				}
+			}
+		};
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO
+		delete data.pathologyForm.specimenGenre
+		data.pathologyForm.specimenNum = this.specimenList.length
+		console.log(77,data.pathologyForm.specimenNum)
+
+		this.printLoading = true;
+		this.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+				if(res.status==200){
+					let arr = res.data;
+					// if(arr.specimenList.length==1){
+					// 	for(let i of arr.specimenList){
+					// 		i.applyCode = data.pathologyForm.applyCode
+					// 	}
+					// }
+					if(arr.applyBarCode){
+						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+					}
+					for(let i of arr.specimenList){
+						i.applyCode = arr.applyCode?arr.applyCode:data.pathologyForm.applyCode
+						i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+					}
+					that.printLoading = false;
+					that.printData = arr;
+					setTimeout(() => {
+					  const printContent = document.getElementById("report");
+					  const WindowPrt = window.open("", "", "width=100,height=1000");
+						WindowPrt.document.body.innerHTML = printContent.innerHTML;
+						setTimeout(_=>{
+							WindowPrt.document.close();
+							WindowPrt.focus();
+							WindowPrt.print();
+							WindowPrt.close();
+							that.hideModal();
+						},500)
+					}, 500);
+				}else{
+					this.message.error(res.msg)
+				}
+		  });
+	}
+	
+	// 监听工号数据
+	handoverUserId:any = null;
+	numberChange(e){
+		if(e.length < 3) {
+			this.validatePrintForm.controls.name.setValue('');
+			return
+		}
+		let query = {
+		  account: e
+		};
+		this.mainService
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.validatePrintForm.controls.name.setValue(data.userName);
+					this.handoverUserId = data.userId
+				}else{
+					this.validatePrintForm.controls.name.setValue('');
+					this.handoverUserId = null
+					// this.message.error(data.data)
+				}
+		  });
+	}
+	
+	printData:any;
+	submitForm(): void{
+		var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+		if(this.specimenList.length==0){
+			this.message.error('标本不能为空')
+			return
+		}
+		if(this.detailsData.status.name=='未打印'){
+			this.notModal = true
+			this.validatePrintForm = this.fb.group({
+			  inVitroTime: [null, [Validators.required]],
+				jobNumber: [null, [Validators.required]],
+				name:[null, [Validators.required]],
+			});
+			let date = new Date();
+			this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
+			this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
+			return
+		}
+
+		let data: any = {
+			pathologyForm:{
+				...this.validateForm.value,
+				...this.detailsData,
+				surgeryId: this.surgeryId || "",
+				patientId: this.patientId || "",
+				hosId: this.hosId || "" ,
+				specimenType:{
+					id:this.validateForm.value.specimenGenre
+				}
+			}
+		};
+		data.pathologyForm.specimenNum = this.specimenList.length
+		delete data.pathologyForm.patientDTO
+		delete data.pathologyForm.surgeryDeptDTO
+		delete data.pathologyForm.surgeryDoctorDTO 
+		delete data.pathologyForm.specimenGenre 
+		that.btnLoading = true;
+		that.mainService
+		  .pathologyPrint(data)
+		  .subscribe((res:any) => {
+				if(res.status==200){
+					let arr = res.data;
+					// if(arr.specimenList.length==1){
+					// 	for(let i of arr.specimenList){
+					// 		i.applyCode = data.pathologyForm.applyCode
+					// 	}
+					// }
+					if(arr.applyBarCode){
+						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+					}
+					for(let i of arr.specimenList){
+						i.applyCode = arr.applyCode?arr.applyCode:data.pathologyForm.applyCode
+						i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+					}
+					that.btnLoading = false;
+					that.printData = arr;
+					setTimeout(() => {
+					  const printContent = document.getElementById("report");
+					  const WindowPrt = window.open("", "", "width=100,height=1000");
+						WindowPrt.document.body.innerHTML = printContent.innerHTML;
+						setTimeout(_=>{
+							WindowPrt.document.close();
+							WindowPrt.focus();
+							WindowPrt.print();
+							WindowPrt.close();
+							that.hideModal();
+						},500)
+					}, 500);
+				}else{
+					this.message.error(res.msg)
+				}
+		  });
+	}
+	
+	// 关闭标本
+	closeSpecimenModel(){
+		this.getSampleData()
+		this.hideSpecimenModal()
+	}
+	
+	closeModel(){
+		this.hideModal()
+	}
+	hideModal(){
+		this.pathologyCancel.emit()
+	}
+	
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
+	
+	showSpecimenModal(con, success, promptInfo?) {
+	  this.specimenModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.specimenModalShow = true;
+	  }, 100);
+	}
+}
+

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

@@ -0,0 +1,207 @@
+<div class="pathology-box display_flex align-items_center justify-content_flex-center">
+		<div class="pathology-content" *ngIf="!isSpinning">
+			<div class="title">查看详情
+			<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+			<div class="content">
+				<div class="content-item boder-right">
+					<div class="form-title-box">
+						<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+						<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+						<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+					</div>
+					<div class="form-title-box">
+						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+						<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+						<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
+					</div>
+					
+					<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 class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+					</div>
+					
+					<div class="form-title-box">
+						<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</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-box">
+							<div class="form-title" *ngFor="let item of specimenList">
+								{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="content-item-right">
+					<div class="step-title">病理闭环</div>
+					<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+						<ng-container *ngFor="let item of pathologyLogs; let index = index">
+								<nz-step
+									[nzDescription]="tpl"
+								>
+								</nz-step>
+								<ng-template #tpl>
+									<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+										<div style="color: #49B856;">{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+										<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									</div>
+									<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+										<div>{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+										<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									</div>
+								</ng-template>
+							</ng-container>
+					</nz-steps>
+				</div>
+			</div>
+			<div class="display_flex justify-content_flex-center bottom-btn">
+				<button class="btn btn-right" *ngIf="detailsData.status.value==6 || 
+				detailsData.status.value==7 || detailsData.status.value==8 || 
+				detailsData.status.value==9 || detailsData.status.value==10"nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
+				
+				<button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
+				detailsData.status.value==3 || detailsData.status.value==4 || 
+				detailsData.status.value==5" nz-button nzType="primary" (click)="submitPrint()" [nzLoading]="btnLoading">补打</button>
+				
+				<!-- <button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
+				detailsData.status.value==3 || detailsData.status.value==4 || 
+				detailsData.status.value==5" nz-button nzType="primary" 
+				(click)="immobilization()">标本固定</button> -->
+				
+				<button class="btn cancel" *ngIf="detailsData.status.value==2 || 
+				detailsData.status.value==3 || detailsData.status.value==4 || 
+				detailsData.status.value==5" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
+			</div>
+		</div>
+	<div class="mask-style" *ngIf="isSpinning">
+		<nz-spin nzSimple class="spin-style"></nz-spin>
+	</div>
+</div>
+
+<!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad">
+			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
+				border-radius: 5px;font-size: 12px;">
+				 <div style="display: flex;">
+					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
+					 <div style="width: 50%;">
+						 <img style="width: 100%; border-radius: 5px;
+						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
+<!-- 					 	<img style="width: 100%; border-radius: 5px;
+					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+					 </div>
+				 </div>
+				
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+					<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+					<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+					<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
+					<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
+				</div>
+				<div style="display: flex;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
+				</div>
+				
+			</div>
+			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
+					 <div style="display: flex;">
+					 	<img style="width: 50%;height: 70px;border-radius: 5px;" [src]="data.barCode" alt="">
+						<div style="width: 50%;">
+							<img style="width: 100%; border-radius: 5px;
+								position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
+							<!-- <img style="width: 100%;border-radius: 5px;
+								position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+						</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
+					 	<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{data.patientName}}</div>
+						<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+						<div style="width:16%;box-sizing: border-box;padding:1px;border-top: 1px solid #aaa;">{{data.patientGender}}</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
+					 	<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">{{data.residenceNo}}</div>
+						<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+						<div style="width:16%;box-sizing: border-box;padding:1px;"> {{data.patientAge}}岁</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+					 	<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;
+						padding:1px;overflow: hidden;white-space: nowrap">{{data.patientDept}}</div>
+						<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+						<div style="width:16%;box-sizing: border-box;padding:1px;">{{data.patientBedNum}}床</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">标本名称</div>
+					 	<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;
+						padding:1px;overflow: hidden;white-space: nowrap">({{index+1}}/{{printData.specimenList.length}}){{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+					 </div>
+					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">申请单号</div>
+					 	<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.applyCode }}</div>
+					 </div>
+					 <div style="display: flex;">
+					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+					 	<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+					 </div>
+				 </div>
+				</div>
+			</div>
+		</div>
+  </div>

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

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

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

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

src/app/share/share.module.ts

@@ -55,6 +55,9 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
 import { InspectionExecuteDetailComponent } from './inspection-execute-detail/inspection-execute-detail.component';
 import { wangEditorComponent } from './wang-editor/wang-editor.component';
 import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
+import { PathologyAddComponent } from './pathology-add/pathology-add.component';
+import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
+
 @NgModule({
   declarations: [
     DetailSampleComponent,
@@ -84,6 +87,8 @@ import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
     OutgoingRecordDetailComponent,
     InspectionExecuteDetailComponent,
 		wangEditorComponent,
+		PathologyAddComponent,
+		PathologyDetailComponent,
     DateTransformPipe,
     DataToNamePipe,
     DialogDeleteComponent,
@@ -148,6 +153,8 @@ import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
     OutgoingRecordDetailComponent,
     InspectionExecuteDetailComponent,
 		wangEditorComponent,
+		PathologyAddComponent,
+		PathologyDetailComponent,
     CommonModule,
     NgZorroAntdModule,
     FormsModule,

src/app/views/admin-office-prescription/admin-office-prescription.component.html

@@ -175,14 +175,21 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">包装规格</div>
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
 					
-					<div style="width: 10%;display: flex;font-size: 12px;
+					<div style="width: 8%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
+					border-bottom: 1px solid #e7e7e7;">包规</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">实消</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
 					align-items: center;
@@ -195,7 +202,6 @@
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
-					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 				</div>
 				<div *ngFor="let data of codes" style="display: flex;">
@@ -218,9 +224,16 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{data.fifteenExpendCount}}</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
 					
-					<div style="width: 10%;display: flex;font-size: 12px;
+					<div style="width: 8%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
@@ -238,7 +251,6 @@
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
-					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">
 						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
 							{{ data.cartonNum }} {{data.giveOutType && data.giveOutType.value==1?

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

@@ -1,7 +1,7 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzLg='18' class="list-template__searchBox">
+      <div nz-col nzLg='16' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">批次号：</span>
           <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
@@ -12,6 +12,7 @@
 					(ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
       </div>
+			<div nz-col nzLg='2' class="autoUpdate">{{ logTime }}秒</div>
       <div nz-col nzLg="6" class="list-template__btns">
         <button class="btn default" (click)='search()'>搜索</button>
         <button class="btn default ml8" (click)='reset()'>重置</button>
@@ -36,7 +37,7 @@
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+          <tr *ngFor="let data of listOfData">
             <td>{{ data.batchNo || '-' }}</td>
             <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</td>
             <td>
@@ -54,7 +55,10 @@
 								<span *ngIf="coopBtns.edit && data.batchState.name=='未发药'" (click)="edit($event,data)">编辑</span>
 								<span *ngIf="coopBtns.del && data.batchState.name=='未发药'" (click)="showDelModal($event,data.id)">删除</span>
                 <span *ngIf="coopBtns.config && data.batchState.name=='未发药'" (click)="detail($event,data)">配置</span>
-                <span *ngIf="coopBtns.print && data.batchState.name=='已发药'" (click)="print($event,data, data.id)">打印</span>
+								<span *ngIf="coopBtns.dispensingGross && data.batchState.name=='已发药'" (click)="dispensingGross($event, data)">发药总量</span>
+                <span *ngIf="coopBtns.dispensingInfo && data.batchState.name=='已发药'" (click)="dispensingInfo($event, data)">发药信息</span>
+								<span *ngIf="coopBtns.export && data.batchState.name=='已发药'" (click)="exportPc($event, data)">导出</span>
+								<span *ngIf="coopBtns.print && data.batchState.name=='已发药'" (click)="print($event,data, data.id)">打印</span>
                 <span *ngIf="coopBtns.batchPrint && data.batchState.name=='未发药'" (click)="dispensingPrint($event, data, data.id)">发药并打印</span>
               </div>
             </td>
@@ -87,11 +91,11 @@
        	  </nz-form-control>
        	</nz-form-item>
        	<nz-form-item>
-       	  <nz-form-label nzRequired nzFor="department">取药科室</nz-form-label>
+       	  <nz-form-label nzRequired nzFor="addDepartment">取药科室</nz-form-label>
        	  <nz-form-control nzErrorTip="请选择取药科室!">
        	    <nz-input-group>
-       				<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择申请科室" formControlName="department">
-       				  <ng-container *ngFor="let option of hospitals1">
+       				<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择申请科室" formControlName="addDepartment">
+       				  <ng-container *ngFor="let option of addHospitals">
        				    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
        				  </ng-container>
        				  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
@@ -124,7 +128,110 @@
   <!-- 编辑模态框 -->
   <app-dialog-delete [delModal]="editModal" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="saveLoading"
     (confirmDelEvent)="confirmDel1()" [content]="'保存后会重置您的发药科室的药品信息，您确认吗？'"></app-dialog-delete>
-
+	
+	<!-- 发药总量 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="grossModal">
+	  <div class="modalBody modalBody-ga">
+	    <div class="title">发药总量<i class="icon_transport transport-guanbi" (click)="hideGrossModal()"></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>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of viewData">
+	              <td>{{ data.drugsInfoDTO.drugName}}</td>
+	              <td>{{ data.drugsInfoDTO.specs}}</td>
+	              <td>{{ data.drugsInfoDTO.packingSpecs}}</td>
+								<td>{{ data.actualCount}}</td>
+								<td>
+									{{data.cartonNum}} 箱 &nbsp;
+									<span *ngIf="data.afterInventory>0">
+										{{data.afterInventory}} {{data.drugsInfoDTO.unit}}
+									</span>
+								</td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+	    </overlay-scrollbars>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideGrossModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>
+	
+	<!-- 发药信息 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="infoModal">
+	  <div class="modalBody modalBody-ga">
+	    <div class="title">发药信息<i class="icon_transport transport-guanbi" (click)="hideInfoModal()"></i>
+	    </div>
+			<div class="list-template__top" nz-row>
+			  <div nz-col nzLg='19' class="list-template__searchBox">
+			    <div class="list-template__searchItem">
+			      <span class="label">科室：</span>
+			      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择科室" [(ngModel)]="infoDepartment">
+			        <ng-container *ngFor="let option of hospitals1">
+			          <nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+			        </ng-container>
+			      </nz-select>
+			    </div>
+			  </div>
+			  <div nz-col nzLg="5" class="list-template__btns">
+			    <button class="btn default" (click)='searchInfo()'>搜索</button>
+					<button class="btn default" (click)='resetInfo()'>重置</button>
+			  </div>
+			</div>
+	    <overlay-scrollbars #osComponentRef1 class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="infoData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="infoLoading">
+	          <thead>
+	            <tr class="thead">
+								<th>科室名称</th>
+								<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 infoData">
+	              <td>{{ data['0']}}</td>
+								<td>{{ data['1']}}</td>
+								<td>{{ data['2']}}</td>
+								<td>{{ data['3']}}</td>
+								<td>{{ data['4']}}</td>
+	              <td>{{ data['5'] }}</td>
+	              <td>{{ data['6'] }}</td>
+								<td>{{ data['7'] }}</td>
+								<td>{{ data['8'] }}</td>
+								<td>{{ data['9'] }}</td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+	    </overlay-scrollbars>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideInfoModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>
+	
   <!-- 打印 -->
   <div id="report" style="display: none">
 		<div class="monad" *ngFor="let item of printData"
@@ -167,14 +274,21 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">包装规格</div>
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
 					
-					<div style="width: 10%;display: flex;font-size: 12px;
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包规</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
+					border-bottom: 1px solid #e7e7e7;">实消</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
 					align-items: center;
@@ -187,7 +301,6 @@
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
-					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 					
 				</div>
@@ -211,9 +324,16 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{data.fifteenExpendCount}}</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
 					
-					<div style="width: 10%;display: flex;font-size: 12px;
+					<div style="width: 8%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
@@ -231,7 +351,6 @@
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
-					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">
 					<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
 						{{ data.giveOutType.value==1 ? data.actualCount :data.cartonNum }}
@@ -243,6 +362,102 @@
 				</div>
 			</div>
 		</div>
+		
+		<div class="monad" 
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;margin-bottom: 40px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-size: 18px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液批次消耗汇总单
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;" *ngIf="printData.length">日期：{{printData[0].createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+				<div style="margin-right: 15px;">批次号：{{batchNo}}</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品规格</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包装规格</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">发药总量</div>
+
+					<div style="width: 14%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">箱数合计</div>
+					
+				</div>
+				<div *ngFor="let data of summaryDataList" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{data.drugsInfoDTO.drugName}}</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{data.drugsInfoDTO.specs}}</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{data.actualCount}}</div>
+					
+					<div style="width: 14%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">
+					{{data.cartonNum}} 箱 &nbsp;
+					<span *ngIf="data.afterInventory>0">
+						{{data.afterInventory}} {{data.drugsInfoDTO.unit}}
+					</span>
+					</div>
+					
+				</div>
+			</div>
+		</div>
   </div>
 
 </div>

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

@@ -24,6 +24,9 @@
   }
 }
 
+.autoUpdate{
+	text-align: right;
+}
 .save {
   position: fixed;
   left: 0;
@@ -32,7 +35,15 @@
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
   z-index: 99;
-
+	.modalBody-ga{
+		width: 80% !important;
+		.list-template__searchBox{
+			margin-top: 10px;
+		}
+		.ant-select{
+			width: 20%;
+		}
+	}
   .modalBody {
     width: 350px;
     background: #fff;

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

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
+import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import {
   FormBuilder,
@@ -22,7 +22,8 @@ import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
   templateUrl: "./dispensing-batch.component.html",
   styleUrls: ["./dispensing-batch.component.less"],
 })
-export class DispensingBatchComponent implements OnInit {
+
+export class DispensingBatchComponent implements OnInit, OnDestroy {
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -37,17 +38,22 @@ export class DispensingBatchComponent implements OnInit {
     private tool: ToolService,
     private http: HttpClient,
   ) {}
-
+	
+	ngOnDestroy() {
+		clearInterval(this.logTimer)
+	}
+	
   ngOnInit() {
-    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
-			this.isDeptLoading = true;
-			this.getDeparts(e);
-    });
+		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.getAddDeparts(e);
+		});
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
+		this.getAddDeparts('')
     this.getAllHospital();
     this.getDeptHandoverType();
+		this.autoUpdate(true)
   }
   listOfData: any[] = []; //表格数据
   promptContent: string; //操作提示框提示信息
@@ -59,6 +65,7 @@ export class DispensingBatchComponent implements OnInit {
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
   department: number; //所属科室
+	infoDepartment: number; //所属科室
 	hosId: number; 
 	dateRange;//时间
 	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
@@ -77,7 +84,8 @@ export class DispensingBatchComponent implements OnInit {
   deptsPhoneId = 1; //科室电话自增id
   allParentdepart: any = []; //所有的父级科室列表
   hospitals1: any = []; //科室列表(搜索)
-	rowData: object = {}; //打印选择列表
+	addHospitals: any = [];
+	rowData: any = null; //打印选择列表
 	editModal:boolean = false; //编辑时弹框
   searchParentDeptSubject = new Subject();
   // 初始化增删改按钮
@@ -89,6 +97,7 @@ export class DispensingBatchComponent implements OnInit {
   //搜索父级科室
 	isDeptLoading = false;
   changeInp(e) {
+		this.isDeptLoading = true;
     this.searchParentDeptSubject.next(e);
   }
   // 配送建单
@@ -105,6 +114,24 @@ export class DispensingBatchComponent implements OnInit {
     this.editModal = false;
   }
 	
+	// 30s倒计时
+	logTimer = null; //定时器
+	logTime = 0; //自动刷新秒数
+	logTimeConst = 30; //自动刷新秒数
+	autoUpdate(flag = true) {
+	  if (flag) {
+	    this.logTime = this.logTimeConst;
+	  }
+	  clearInterval(this.logTimer);
+	  this.logTimer = setInterval(() => {
+	    this.logTime--;
+	    if (this.logTime === 0) {
+	      this.logTime = this.logTimeConst;
+				this.getList()
+	    }
+	  }, 1000);
+	}
+	
   // 编辑保存
   confirmDel1() {
     var that = this;
@@ -117,7 +144,7 @@ export class DispensingBatchComponent implements OnInit {
 			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
 			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
 			hosId:this.hosId,
-			pharmacy:this.validateForm.value.department,
+			pharmacy:this.validateForm.value.addDepartment,
 			id:that.coopId,
 			loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
     };
@@ -205,40 +232,50 @@ export class DispensingBatchComponent implements OnInit {
 	}
 	
 	// 获取所有科室
-  getDeparts(dept) {
-    var that = this;
-    let data = {
-      department: {
-        dept,
-        hospital: {
-          id: this.hosId
-        },
+  getDeparts() {
+		let data = {
+		  batchId:this.rowData.id
+		};
+		this.mainService
+		  .getConsumeDept(data)
+		  .subscribe((res) => {
+				this.isDeptLoading = false;
+				this.hospitals1 = res.data
+		  });
+  }
+	
+	// 获取药房科室
+	getAddDeparts(dept) {
+		var that = this;
+		let data = {
+			department: {
+				dept,
+				hospital: {
+					id: this.hosId
+				},
 				type:{
 					id:''
 				}
-      },
-      idx: 0,
-      sum: 20,
-    };
+			},
+			idx: 0,
+			sum: 20,
+		};
 		that.mainService.getDictionary("list", "dept_type").subscribe((res) => {
-		  let typeData = res.find(i=>i.value=='pharmacyRoom');
+			let typeData = res.find(i=>i.value=='pharmacyRoom');
 			if(typeData){
 				data.department.type.id = typeData.id
 			}
 			that.mainService
-			  .getFetchDataList("data", "department", data)
-			  .subscribe((data) => {
-					setTimeout(_=>{
-						this.hospitals1 = data.list
-						that.isDeptLoading = false;
-					},500)
-			  });
+				.getFetchDataList("data", "department", data)
+				.subscribe((data) => {
+					this.addHospitals = data.list
+					that.isDeptLoading = false;
+				});
 		});
-  }
-	
+	}
+		
   // 获取所有院区
   getAllHospital() {
-		this.getDeparts('')
     this.getList();
   }
 
@@ -275,7 +312,7 @@ export class DispensingBatchComponent implements OnInit {
 		.subscribe((result) => {
 			if (result.status == 200) {
 				let data = result.list[0] || {};
-				this.validateForm.controls.department.setValue(data.pharmacyDept || '');
+				this.validateForm.controls.addDepartment.setValue(data.pharmacyDept || '');
 				this.add = true;
 				this.modal = true;
 				this.isAddDeptsPhone = true;
@@ -299,7 +336,7 @@ export class DispensingBatchComponent implements OnInit {
   initForm() {
     this.validateForm = this.fb.group({
       dispensingTime: [null, [Validators.required]],
-      department: [null, [Validators.required]],
+      addDepartment: [null, [Validators.required]],
 			loadAllConsumeDept: [true,[]]
     });
 		let date = new Date();
@@ -320,7 +357,7 @@ export class DispensingBatchComponent implements OnInit {
 			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
 			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
 			hosId:this.hosId,
-			pharmacy:this.validateForm.value.department,
+			pharmacy:this.validateForm.value.addDepartment,
 			loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
     };
   
@@ -350,7 +387,7 @@ export class DispensingBatchComponent implements OnInit {
     this.add = false;
     this.coopId = data.id;
     this.coopItem = data;
-    this.validateForm.controls.department.setValue(data.pharmacy);
+    this.validateForm.controls.addDepartment.setValue(data.pharmacy);
     this.validateForm.controls.dispensingTime.setValue([data.startTime,data.endTime]);
 		if(data.loadAllConsumeDept==1){
 			this.validateForm.controls.loadAllConsumeDept.setValue(true);
@@ -411,7 +448,106 @@ export class DispensingBatchComponent implements OnInit {
         }
       });
   }
-
+	
+	// 发药总量
+	grossModal:boolean = false;
+	grossLoading:boolean = false;
+	viewData:any = [];
+	dispensingGross(e,data){
+		this.grossModal = true
+		this.grossLoading = true
+		this.mainService
+		  .drugsGross(data.id)
+		  .subscribe((res:any) => {
+		    this.grossLoading = false;
+				this.viewData = res.data
+		  });
+	}
+	
+	// 关闭发药总量
+	hideGrossModal(){
+		this.grossModal = false
+	}
+	
+	// 发药信息
+	infoModal:boolean = false;
+	infoLoading:boolean = false;
+	infoData:any = [];
+	dispensingInfo(e,data){
+		this.rowData = data
+		this.getDeparts()
+		this.infoModal = true
+		this.infoLoading = true
+		this.mainService
+		  .drugsInfo({
+				batchId:data.id,
+				dataType:'batchDispensingMedicine'
+			}).subscribe((res:any) => {
+		    this.infoLoading = false;
+				this.infoData = res.list
+		  });
+	}
+	
+	// 关闭发药信息
+	hideInfoModal(){
+		this.infoModal = false
+	}
+	// 发药信息搜索
+	searchInfo(){
+		this.getInfo()
+	}
+	
+	getInfo(){
+		this.infoLoading = true
+		this.mainService
+		  .drugsInfo({
+				deptId:this.infoDepartment,
+				batchId:this.rowData.id,
+				dataType:'batchDispensingMedicine'
+			}).subscribe((res:any) => {
+		    this.infoLoading = false;
+				this.infoData = res.list
+		  });
+	}
+	
+	// 发药信息重置
+	resetInfo(){
+		this.infoDepartment = null
+		this.getInfo()
+	}
+	
+	// 导出
+	maskFlag:any = null;
+	exportPc(e,data){
+		this.maskFlag = this.message.loading("正在导出..", {
+		  nzDuration: 0,
+		}).messageId;
+		this.mainService.exportReport("drugsBatch", {
+			batchId:data.id
+		}).subscribe(
+		  (res:any) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.success('导出成功');
+		    var file = new Blob([res], {
+		      type: "application/vnd.ms-excel",
+		    });
+		    var fileURL = URL.createObjectURL(file);
+		    var a = document.createElement("a");
+		    a.href = fileURL;
+		    a.target = "_blank";
+		    a.download = `发药批次数据-${data.batchNo}.xls`;
+		    document.body.appendChild(a);
+		    a.click();
+		  },
+		  (err) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.error('导出失败');
+		  }
+		);
+	}
+	
   // 查看
   detail(e, data) {
     e.stopPropagation();
@@ -420,6 +556,8 @@ export class DispensingBatchComponent implements OnInit {
 
 	// 发药并打印
 	printData = []; 
+	summaryDataList = [];
+	batchNo:any = null;
 	print(e, data, id){
 		this.rowData = data
 		e.stopPropagation();
@@ -428,7 +566,9 @@ export class DispensingBatchComponent implements OnInit {
 		that.mainService
 		  .transfusionPrint("drugsBatch", id)
 		  .subscribe((res) => {
+				this.batchNo = res.data.batchNo
 				let arr = res.data.drugsListDTOS;
+				this.summaryDataList = res.data.summaryDataList;
 				for(let i of arr){
 					for(let t of i.drugsConfigureDTOS){
 						t.deptName = i.pharmacyDTO?i.pharmacyDTO.dept:'-'

src/app/views/dispensing-detail/dispensing-detail.component.html

@@ -10,15 +10,16 @@
         <thead>
           <tr class="thead">
             <th nzWidth="25%">药品名称</th>
-            <th nzWidth="16%">规格</th>
-						<th nzWidth="8%">消耗量</th>
-						<th nzWidth="6%">原库存</th>
-						<th nzWidth="8%">包装规格</th>
-						<th nzWidth="8%">发药箱数</th>
-						<th nzWidth="5%">实发</th>
-            <th nzWidth="6%">新库存</th>
-						<th nzWidth="5%">增减</th>
-            <th nzWidth="13%">操作</th>
+            <th>规格</th>
+						<th>实消</th>
+						<th>15日消耗</th>
+						<th>原库存</th>
+						<th>包规</th>
+						<th>发药箱数</th>
+						<th>实发</th>
+            <th>新库存</th>
+						<th>增减</th>
+            <th>操作</th>
           </tr>
         </thead>
         <tbody>
@@ -29,6 +30,7 @@
 						</td>
             <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'-' }}</td>
             <td>{{ data.expendCount||'0' }}</td>
+						<td>{{ data.fifteenExpendCount||'0' }}</td>
             <td>{{ data.formerInventory || '0' }}</td>
             <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
 						<td>{{ data.cartonNum || 0 }}</td> 

src/app/views/dispensing-info-detail/dispensing-info-detail-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DispensingInfoDetailComponent } from './dispensing-info-detail.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DispensingInfoDetailComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DispensingInfoDetailRoutingModule { }

src/app/views/dispensing-info-detail/dispensing-info-detail.component.html

@@ -0,0 +1,374 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='18' class="list-template__searchBox">
+        <div class="list-template__searchItem searchItem-100">
+          <span class="label">发药时间区间：</span>
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd HH:mm:ss"
+					(ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+				<div class="list-template__searchItem">
+				  <span class="label">科室名称：</span>
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'dept')" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择申请科室" [(ngModel)]="department">
+				    <ng-container *ngFor="let option of hospitals1">
+				      <nz-option *ngIf="!loading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+				    </ng-container>
+				    <nz-option *ngIf="loading" nzDisabled nzCustomContent>
+				      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				    </nz-option>
+				  </nz-select>
+				</div>
+				<div class="list-template__searchItem">
+				  <span class="label">药品名称：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'commodity')" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择商品名称" [(ngModel)]="commodity">
+					  <ng-container *ngFor="let option of commodityData">
+					    <nz-option *ngIf="!loading" [nzLabel]="option.drugName + '('+option.specs+')'" [nzValue]="option.id"></nz-option>
+					  </ng-container>
+					  <nz-option *ngIf="loading" nzDisabled nzCustomContent>
+					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					  </nz-option>
+					</nz-select>
+				</div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label">批次号：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'batch')" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择批次号" [(ngModel)]="batch">
+					  <ng-container *ngFor="let option of batchData">
+					    <nz-option *ngIf="!loading" [nzLabel]="option.batchNo" [nzValue]="option.id"></nz-option>
+					  </ng-container>
+					  <nz-option *ngIf="loading" nzDisabled nzCustomContent>
+					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					  </nz-option>
+					</nz-select>
+				</div>
+      </div>
+      <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 *ngIf="coopBtns.export" class="btn default ml8" (click)='excelExport()'>导出</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>发药日期</th>
+          </tr>
+        </thead>
+        <tbody v-if="listOfData && listOfData.length>0">
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+            <td>
+							<div>{{ data['0'] }}</div>
+							<div>{{ data['1'] }}</div>
+						</td>
+						<td>
+							<div>{{ data['2']}}</div>
+							<div>{{ data['3']}}</div>
+						</td>
+            <td>{{ data['4']}} + {{data['5']}} +
+						 {{data['6'] }} = {{data.num}}</td>
+						 
+            <td>{{ data['7']}}</td>
+            <td>{{ data['8']==0 ? '-' : data['8']}}</td>
+						<td>{{ data['9']}}</td>
+						<td>{{ data['10']}}</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]="loading1">
+            <thead>
+              <tr class="thead">
+								<th nzWidth="10%">药品标识</th>
+                <th nzWidth="10%">药品名称</th>
+                <th nzWidth="10%">规格</th>
+                <th nzWidth="10%">消耗数量</th>
+                <th nzWidth="10%">实发数量</th>
+                <th nzWidth="10%">包装规格</th>
+                <th nzWidth="10%">发药药箱</th>
+                <th nzWidth="10%">原库存数</th>
+                <th nzWidth="10%">计算后库存</th>
+        				<th nzWidth="10%">增减</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'无' }}</td>
+                <td>{{ data.expendCount||'0' }}</td>
+                <td>{{ data.actualCount||'0' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
+                <td>{{ data.cartonNum || '0' }}</td>
+                <td>{{ data.formerInventory || '0' }}</td>
+                <td>{{ data.afterInventory || '0'}}</td>
+        				<td>{{ data.addSub || '0' }}</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 id="report" style="display: none;">
+		<div class="monad" 
+				*ngIf="rowData"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-size: 18px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液发药单-{{rowData.applyDeptDTO?rowData.applyDeptDTO.dept:''}}
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">日期：{{rowData.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+				<div style="margin-right: 15px;">批次号：{{rowData.batch?rowData.batch.batchNo:'-'}}</div>
+				<div style="margin-right: 15px;">单号：{{rowData.packingNo}}</div>
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">取药药房：{{rowData.pharmacyDTO?rowData.pharmacyDTO.dept:'-'}}</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">规格</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包规</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">实消</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">临时增发</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">箱数</div>
+				</div>
+				<div *ngFor="let data of codes" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">
+						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
+							{{ data.cartonNum }} {{data.giveOutType && data.giveOutType.value==1?
+							data.drugsInfoDTO.unit:'箱'}}
+						</span>
+					</div>
+					
+				</div>
+			</div>
+		</div>
+		
+		<div class="monad"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;margin-bottom: 40px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-size: 18px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液批次消耗汇总单
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">日期：666</div>
+				<div style="margin-right: 15px;">批次号：777</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品规格</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包装规格</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">发药总量</div>
+		
+					<div style="width: 14%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">箱数合计</div>
+					
+				</div>
+				<div style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">葡萄胎</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">100ml*1</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">100</div>
+					
+					<div style="width: 13%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">200</div>
+					
+					
+					<div style="width: 14%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">
+					<span>
+						20箱
+					</span>
+					</div>
+					
+				</div>
+			</div>
+		</div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/views/dispensing-info-detail/dispensing-info-detail.component.less

@@ -0,0 +1,238 @@
+@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;
+    }
+  }
+}
+
+.searchItem-100{
+	.label{
+		width: 100px !important;
+	}
+}
+.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;
+        }
+      }
+    }
+  }
+}
+

src/app/views/dispensing-info-detail/dispensing-info-detail.component.ts

@@ -0,0 +1,262 @@
+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-dispensing-info-detail",
+  templateUrl: "./dispensing-info-detail.component.html",
+  styleUrls: ["./dispensing-info-detail.component.less"],
+})
+export class DispensingInfoDetailComponent 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.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+     if(e[1]=='dept'){
+			 this.getDeparts(e[0]);
+		 }else if(e[1]=='commodity'){
+			 this.getCommodityData(e[0])
+		 }else{
+			 this.getBathData(e[0])
+		 }
+
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllquest();
+  }
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: ""; //所属科室
+	batch:any = null;
+	commodity:any = null;
+	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 = []; //科室单查看数据
+	commodityData:any = [];
+	batchData:any = [];
+	maskFlag:any = null;
+	
+	
+  // 导出
+  excelExport(){
+    this.maskFlag = this.message.loading("正在导出..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.exportReport("dispensingMedicine", {
+			deptId:this.department,
+			batchId:this.batch,
+			startTime: this.startDate,
+			endTime: this.endDate,
+			drugId:this.commodity,
+			hosId:this.hosId
+		}).subscribe(
+      (data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = "发药信息详情.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.error('导出失败');
+      }
+    );
+  }
+
+  //搜索父级科室
+	loading = false;
+  changeInp(e,type) {
+		this.loading = true
+    this.searchParentDeptSubject.next([e,type]);
+  }
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.department = null;
+		this.batch = null;
+		this.commodity = null;
+    this.batchNumber = "";
+		this.dateRange = [];
+		this.startDate = "";
+		this.endDate = "";
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+			deptId:this.department,
+			batchId:this.batch,
+			startTime: this.startDate,
+			endTime: this.endDate,
+			drugId:this.commodity,
+			hosId:this.hosId
+    };
+		this.loading1 = true;
+		this.mainService
+			.drugsInfo(data).subscribe((res:any) => {
+				this.loading1 = false;
+				for(let i of res.list){
+					i.num = i['4'] + i['5'] + i['6']
+				}
+				this.listOfData = res.list
+				that.listLength = res.totalNum;
+			});
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    return;
+	  }
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+		this.dateRange = [this.startDate,this.endDate]
+	}
+	
+	// 获取所有科室
+  getDeparts(dept) {
+    var that = this;
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.hosId
+        },
+      },
+      idx: 0,
+      sum: 20,
+    };
+    that.mainService
+		.getFetchDataList("data", "department", data)
+		.subscribe((data) => {
+			this.loading = false
+			this.hospitals1 = data.list
+		});
+  }
+	
+	// 获取药品
+	getCommodityData(name) {
+	  let data = {
+	    drugsInfo: {
+	      drugName: name || "",
+	      hosId: this.hosId || "" ,
+	    	drugType:{
+	    		id:'20327'
+	    	}
+	    },
+	    idx: 0,
+	    sum: 10,
+	  };
+	  this.mainService
+		.getFetchDataList("data", "drugsInfo", data)
+		.subscribe((data) => {
+			this.loading = false
+			this.commodityData = data.list
+		});
+	}
+	
+	// 获取批次号
+	getBathData(name) {
+	  let data = {
+	    drugsBatch: {
+	    	batchNo:name,
+	    	hosId: this.hosId,
+				batchStatus:{
+					value:2
+				}
+	    },
+	    idx: 0,
+	    sum: 10,
+	  };
+	  this.mainService
+		.getFetchDataList("data", "drugsBatch", data)
+		.subscribe((data) => {
+			this.loading = false
+			this.batchData = data.list
+		});
+	}
+  getAllquest() {
+		this.getDeparts('')
+		this.getCommodityData('')
+		this.getBathData('')
+    this.getList();
+  }
+}

src/app/views/dispensing-info-detail/dispensing-info-detail.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DispensingInfoDetailRoutingModule } from './dispensing-info-detail-routing.module';
+import { DispensingInfoDetailComponent } from './dispensing-info-detail.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    DispensingInfoDetailComponent,
+  ],
+  imports: [
+    CommonModule,
+    DispensingInfoDetailRoutingModule,
+    ShareModule
+  ]
+})
+export class DispensingInfoDetailModule { }

src/app/views/drug-cloud/drug-cloud.component.html

@@ -17,7 +17,7 @@
           <span class="label">药品：</span>
 					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'drug')" nzServerSearch nzShowSearch nzPlaceHolder="请选择药品" [(ngModel)]="drug">
 					  <ng-container *ngFor="let option of drugData">
-					    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.drugName" [nzValue]="option.id"></nz-option>
+					    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.drugName + '('+option.specs+')'" [nzValue]="option.id"></nz-option>
 					  </ng-container>
 					  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
 					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -566,6 +566,7 @@
                       nzSpan="8"
                       class="borderL alignC display_flex justify-content_flex-center align-items_center h100p"
                     >
+											<button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.isPathologyForm == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="pathologyAdd($event)">病理申请单</button>
                       <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
                       <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
                     </div>
@@ -1665,6 +1666,7 @@
                             <!-- 【是否开启手术即将开始通知】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回病房】开启 -->
+														<button *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.isPathologyForm == 1" class="btn1 mr8 mb8 mt8" (click)="pathologyAddItem($event,item)">病理申请单</button>
                             <button class="btn1 mr8 mb8 mt8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回苏醒室】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
@@ -4021,3 +4023,9 @@
   </div>
 </div>
 <button ngxPrint printSectionId="print-section" #printBtn hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>
+
+<!-- 病理申请单 -->
+<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
+
+<!-- 病理详情 -->
+<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>

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

@@ -1625,6 +1625,7 @@
 
 .alignC {
   display: flex;
+	flex-wrap: wrap;
   justify-content: center;
   align-items: center;
 }

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

@@ -164,10 +164,13 @@ export class HushijiandanComponent implements OnInit {
   orderListTime = 0; //工单列表自动刷新秒数
   orderListTimeConst = 60; //工单列表自动刷新秒数
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
-
+	pathologyModal:boolean = false; //病理申请单
+	pathologyDetailModal:boolean = false; //病理详情
   // 初始化权限按钮
   coopBtns: any = {};
-
+	surgeryDataId: any; //手术id
+	patientDataId: any; //病人id
+	
   ngOnInit() {
     this.getCoopBtns();
     this.currentHospital = this.tool.getCurrentHospital();
@@ -308,7 +311,62 @@ export class HushijiandanComponent implements OnInit {
     this.coopBtns = coopBtns;
     console.log(this.coopBtns);
   }
-
+	
+	// 手术排程-病理申请单
+	pathologyAddItem(e,item){
+		this.surgeryDataId = item.id
+		this.patientDataId = item.patientDTO.id
+		let data = {
+			idx: 0,
+			sum: 9999,
+			pathologyForm: {
+				surgeryId: item.id || "",
+				patientId: item.patientDTO.id || "",
+				hosId: this.currentHospital.id || "" ,
+			},
+		};
+		this.mainService
+			.getFetchDataList("data", "pathologyForm", data)
+			.subscribe((data) => {
+				if(data.list[0].status.value==1){
+					this.pathologyModal = true
+				}else{
+					this.pathologyDetailModal = true
+				}
+			});
+	}
+	
+	// 病理申请单
+	pathologyAdd(e){
+		this.surgeryDataId = this.surgeryWKOMsg.id
+		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		let data = {
+			idx: 0,
+			sum: 9999,
+			pathologyForm: {
+				surgeryId: this.surgeryWKOMsg.id || "",
+				patientId: this.surgeryWKOMsg.patientDTO.id || "",
+				hosId: this.currentHospital.id || "" ,
+			},
+		};
+		this.mainService
+		.getFetchDataList("data", "pathologyForm", data)
+		.subscribe((data) => {
+			if(data.list[0].status.value==1){
+				this.pathologyModal = true
+			}else{
+				this.pathologyDetailModal = true
+			}
+		});
+	}
+	
+	pathologyDetailCancel(){
+		this.pathologyDetailModal = false
+	}
+	
+	pathologyCancel(){
+		this.pathologyModal = false
+	}
   // 切换综合日志和一键报修
   smallTabs = [];
   smallTabId = 2; //默认显示一键报修

src/app/views/inspect-statistics/inspect-statistics-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { InspectStatisticsComponent } from './inspect-statistics.component';
+import { OrderDetailComponent } from '../../share/order-detail/order-detail.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: InspectStatisticsComponent,
+		children: [
+		  {
+		    // 查看详情
+		    path: 'orderDetail/:id',
+		    component: OrderDetailComponent,
+		  }
+		]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class InspectStatisticsRoutingModule { }

src/app/views/inspect-statistics/inspect-statistics.component.html

@@ -0,0 +1,90 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl="18" class="list-template__searchBox">
+        <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 nzXl="6" class="list-template__btns">
+        <button nz-button class="btn default" (click)="search()">搜索</button>
+        <button nz-button class="btn default ml8" (click)="reset()">
+          重置
+        </button>
+				<button nz-button class="btn default ml8" (click)="excelExport()">
+				  导出
+				</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 nzWidth="50px">序号</th>
+						<th>发起时间</th>
+						<th>完成时间</th>
+						<th>起点科室</th>
+						<th>目标科室</th>
+						<th nzWidth="30%">工单备注</th>
+						<th>患者住院号</th>
+						<th>姓名</th>
+						<th>转运人员</th>
+            <th nzWidth="70px">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData; let index = index">
+						<td>{{ index+(pageIndex-1) * pageSize + 1 }}</td>
+            <td>{{ data['1'] | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+            <td>{{ data['2'] | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+            <td>{{ data['3']}}</td>
+            <td>{{ data['4'] }}</td>
+            <td>{{ data['5'] }}</td>
+            <td>{{ data['6'] }}</td>
+            <td>{{ data['7'] }}</td>
+						<td>{{ data['8'] }}</td>
+            <td>
+              <div class="coop">
+                <span
+                  *ngIf="coopBtns.look"
+                  (click)="personDetail(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>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/inspect-statistics/inspect-statistics.component.less

@@ -0,0 +1,95 @@
+@import "../../../../src/theme.less";
+.list-template__searchItem{
+	.label{
+		width: 100px !important;
+	}
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 1000px;
+    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%;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .conItem {
+        color: #333;
+
+        .jiTit {
+          height: 50px;
+          line-height: 50px;
+          border-bottom: 1px solid #e5e9ed;
+          padding: 0 32px;
+        }
+
+        .defeat {
+          font-size: 14px;
+          color: #333;
+          padding: 15px 32px;
+          min-height: 125px;
+        }
+
+        &.noCon {
+          background: #f9fafb;
+          padding: 16px 32px 24px 32px;
+          border-top: 1px solid #e5e9ed;
+
+          .title {
+            text-align: left;
+            font-size: 14px;
+            margin-bottom: 8px;
+          }
+
+          textarea {
+            min-height: 210px;
+          }
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+      margin-left: 10px;
+    }
+  }
+
+  .txtL {
+    text-align: left !important;
+  }
+
+  .txtR {
+    text-align: right !important;
+  }
+}

src/app/views/inspect-statistics/inspect-statistics.component.ts

@@ -0,0 +1,141 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+
+import { MainService } from "../../services/main.service";
+import { DateService } from "../../services/date.service";
+import { MyServiceService } from "../../services/my-service.service";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay, startOfToday } from 'date-fns';
+import { NzMessageService } from "ng-zorro-antd";
+
+@Component({
+  selector: "app-inspect-statistics",
+  templateUrl: "./inspect-statistics.component.html",
+  styleUrls: ["./inspect-statistics.component.less"],
+})
+export class InspectStatisticsComponent implements OnInit {
+  constructor(
+		private message: NzMessageService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private dateService: DateService,
+    private myService: MyServiceService,
+    private tool: ToolService
+  ) {}
+
+  ngOnInit() {
+		const todayStart = startOfToday();
+		const formattedTodayStart = format(todayStart, 'yyyy-MM-dd');
+		this.startDate = formattedTodayStart+' '+'00:00:00';
+		this.endDate = formattedTodayStart+' '+'23:59:59';
+		this.dateRange = [this.startDate,this.endDate];
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.getList();
+  }
+	hosId:any = null;
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+
+  dateRange: any = []; //发起时间区间 天
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  searchData: any = {}; // 综合统计页面带过来的参数
+
+ // 搜索
+ search() {
+   this.pageIndex = 1;
+   this.getList();
+ }
+ // 重置
+ reset() {
+  this.pageIndex = 1;
+  this.startDate = null;
+ 	this.endDate = null;
+ 	this.dateRange = [];
+  this.getList();
+ }
+ // 表格数据
+ loading1 = false;
+ getList() {
+   var that = this;
+   let data = {
+     idx: that.pageIndex - 1,
+     sum: that.pageSize,
+     startTime: this.startDate,
+     endTime: this.endDate,
+     // hosId: this.hosId
+   };
+
+   this.loading1 = true;
+   that.mainService
+     .inspectionStatistics(data)
+     .subscribe((res:any) => {
+       this.loading1 = false;
+       that.listOfData = res.list;
+       that.listLength = res.totalNum;
+     });
+ }
+ 
+ // 日期选择
+ startDate: string; //发起时间开始
+ endDate: string; //发起时间结束
+ changeDate(result?): void {
+   if (result.length==0) {
+     this.startDate = this.endDate = null;
+     return;
+   }
+   this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+   this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+	 this.dateRange = [this.startDate,this.endDate]
+ }
+
+// 导出
+	maskFlag:any = null;
+	excelExport(){
+		this.maskFlag = this.message.loading("正在导出..", {
+		  nzDuration: 0,
+		}).messageId;
+		this.mainService.exportReport("accompaniedInspection", {
+			startTime: this.startDate,
+			endTime: this.endDate,
+		}).subscribe(
+		  (data) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.success('导出成功');
+		    var file = new Blob([data], {
+		      type: "application/vnd.ms-excel",
+		    });
+		    var fileURL = URL.createObjectURL(file);
+		    var a = document.createElement("a");
+		    a.href = fileURL;
+		    a.target = "_blank";
+		    a.download = `陪检统计数据.xls`;
+		    document.body.appendChild(a);
+		    a.click();
+		  },
+		  (err) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.error('导出失败');
+		  }
+		);
+	}
+	
+  //查看
+  personDetail(data) {
+		this.router.navigateByUrl("/main/inspectStatistics/orderDetail/" + data['0']);
+  }
+
+}

src/app/views/inspect-statistics/inspect-statistics.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { InspectStatisticsRoutingModule } from './inspect-statistics-routing.module';
+import { InspectStatisticsComponent } from './inspect-statistics.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    InspectStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    InspectStatisticsRoutingModule,
+    ShareModule
+  ]
+})
+export class InspectStatisticsModule { }

src/app/views/login/login.component.ts

@@ -37,6 +37,8 @@ export class LoginComponent implements OnInit {
   ngOnInit() {
     this.http = http;
     this.isSingleSignOn = location.href.includes("?");
+		localStorage.removeItem("scanCodeData");
+		localStorage.removeItem("pathologyActiveIndex");
     if (this.isSingleSignOn) {
       this.singleSignOn();
     } else {

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

@@ -593,6 +593,16 @@ const routes: Routes = [
         path: "incidentManagement",
         loadChildren: () => import("../incident-management/incident-management.module").then((m) => m.IncidentManagementModule),
       },
+			// 陪检统计
+			{
+			  path: "inspectStatistics",
+			  loadChildren: () => import("../inspect-statistics/inspect-statistics.module").then((m) => m.InspectStatisticsModule),
+			},
+			// 发药信息详情
+			{
+			  path: "dispensingInfoDetail",
+			  loadChildren: () => import("../dispensing-info-detail/dispensing-info-detail.module").then((m) => m.DispensingInfoDetailModule),
+			},
     ],
   },
 ];

src/app/views/main/main.component.html

@@ -41,7 +41,9 @@
           <button nz-button nzType="primary" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</button>
           <button nz-button nzType="primary" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')" [nzLoading]="deptTypeLoading">业务视图</button>
           <button nz-button nzType="primary" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</button>
-          <button nz-button nzType="primary" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</button>
+					<button nz-button nzType="primary" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</button>
+					<button nz-button nzType="primary" *ngIf="pathology" (click)="toPathology()">病理科端</button>
+					<button nz-button nzType="primary" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</button>
           <button nz-button nzType="primary" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()">配置中心</button>
         </div>
         <div class="right">

src/app/views/main/main.component.ts

@@ -29,6 +29,8 @@ export class MainComponent implements OnInit {
   largeScreenRole2: boolean = false; //大屏端权限
   specimenViewRole: boolean = false; //业务视图权限
   specimenViewRole2: boolean = false; //标本视图权限
+	specimenRoomView: boolean = false; //标本间权限
+	pathology: boolean = false; //病理科权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
   configurationCenterRole: boolean = false; //配置中心权限
   PCCommutesToWork: boolean = false; //PC上下班权限
@@ -289,6 +291,14 @@ export class MainComponent implements OnInit {
         this.specimenViewRole2 = true;
         console.log("标本视图权限");
       }
+			if (e.link == "specimenRoomView") {
+			  this.specimenRoomView = true;
+			  console.log("标本间权限");
+			}
+			if (e.link == "pathology") {
+			  this.pathology = true;
+			  console.log("病理科权限");
+			}
       if (e.link == "disinfectionSupply") {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
@@ -408,6 +418,14 @@ export class MainComponent implements OnInit {
   toSpecimenView2(): void {
     this.router.navigateByUrl("specimenView2");
   }
+	// 标本间
+	toSpecimenRoomView(): void {
+	  this.router.navigateByUrl("specimenRoomView");
+	}
+	// 病理科
+	toPathology(): void {
+	  this.router.navigateByUrl("pathology");
+	}
   // 全局业务查看
   toDisinfectionSupply(): void {
     this.router.navigateByUrl("disinfectionSupply");

src/app/views/operation-config/operation-config.component.html

@@ -84,6 +84,11 @@
           <nz-form-label class="label">是否开启手术即将开始通知</nz-form-label>
           <nz-checkbox-group [(ngModel)]="surgeryBegin"></nz-checkbox-group>
         </div>
+				<!-- 是否开启病理申请单 -->
+				<div class="display_flex align-items_center mb8">
+				  <nz-form-label class="label">是否开启病理申请单</nz-form-label>
+				  <nz-checkbox-group [(ngModel)]="isPathologyForm"></nz-checkbox-group>
+				</div>
       </div>
       <!-- 自动建单配置 -->
       <div *ngIf="tabModalName=='automaticOrderCreation'">
@@ -93,6 +98,11 @@
           <nz-checkbox-group [(ngModel)]="autoCreateOrders" (ngModelChange)="changeAutoCreateOrders($event)"></nz-checkbox-group>
           <nz-time-picker [(ngModel)]="autoTime" nzFormat="HH:mm" *ngIf="autoCreateOrders[0].checked"></nz-time-picker>
         </div>
+				<!-- 是否开启速冻标本自动建单 -->
+				<div class="display_flex align-items_center mb8">
+				  <nz-form-label class="label">是否开启速冻标本自动建单</nz-form-label>
+				  <nz-checkbox-group [(ngModel)]="isFrozenSpecimen"></nz-checkbox-group>
+				</div>
       </div>
       <div class="bottom">
         <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

src/app/views/operation-config/operation-config.component.ts

@@ -44,6 +44,14 @@ export class OperationConfigComponent implements OnInit {
   surgeryBegin:any[] = [
     {label:'是否开启',value: 0}
   ];
+	// 是否开启病理申请单
+	isPathologyForm:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	// 是否开启速冻标本自动建单
+	isFrozenSpecimen:any[] = [
+	  {label:'是否开启',value: 0}
+	];
   // 建单时间
   autoTime:Date | null = null;
   tasktype1Id:any;
@@ -143,6 +151,8 @@ export class OperationConfigComponent implements OnInit {
       recoveryTypeId: this.tasktype2Id || undefined,
       remandClean: this.autoRemandClean[0].checked ? 1 : 0,
       surgeryBegin: this.surgeryBegin[0].checked ? 1 : 0,
+			isPathologyForm: this.isPathologyForm[0].checked ? 1 : 0,
+			isFrozenSpecimen: this.isFrozenSpecimen[0].checked ? 1 : 0,
       cleanTypeId: this.cleanTypeId || undefined,
     };
     let postData = Object.assign({}, this.configs, editData);
@@ -331,7 +341,9 @@ export class OperationConfigComponent implements OnInit {
                 }
 
                 this.surgeryBegin[0].checked = this.configs.surgeryBegin == 1;
-              }
+								this.isPathologyForm[0].checked = this.configs.isPathologyForm == 1;
+								this.isFrozenSpecimen[0].checked = this.configs.isFrozenSpecimen == 1;
+							}
             });
         }else{
           this.loading = false;

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

@@ -0,0 +1,17 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { PathologyComponent } from "./pathology.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: PathologyComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class PathologyRoutingModule {}

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

@@ -0,0 +1,531 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+   <div class="pharmacy-logo">
+		<h2 class="pharmacy-name__title">
+			<span>病理科</span>
+		</h2>
+    </div>
+    <div class="pharmacy-name">
+			<div class="mar-ri-30" *ngIf="toDayData">
+				今日接收：
+				申请单 <span class="weight">{{toDayData.pathologyFormNum}}</span> &nbsp;
+				标本 <span class="weight">{{toDayData.specimenNum}}</span>&nbsp;
+				速冻 <span class="weight">{{toDayData.rapidityNum}}</span>&nbsp;
+				送出申请单 <span class="weight">{{toDayData.sendOut}}</span>&nbsp;
+			</div>
+      <div class="pharmacy-name__total">
+				<nz-input-group nzSize="large">
+					<input type="text" id="Binput" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="可扫描物理标本条码及包码" />
+				</nz-input-group>
+      </div>
+			<div class="error-class">{{errorcODEMsg}}</div>
+    </div>
+    <div class="userInfo">
+      <div class="wel">欢迎您：</div>
+      <div class="user">
+        <img src="../../assets/images/icon_keshi.png" alt="" />
+        <span *ngIf="deptDisplay">{{
+          deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept
+        }}</span>
+      </div>
+      <div class="userInfo-wrap">
+        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="logOut()">退出</div>
+      </div>
+    </div>
+  </div>
+	<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" [ngClass]="{'activeClass': activeIndex == 1}" (click)="tabClick(1)">实时术中快速<span class="red" *ngIf="toDayData">({{toDayData.unReceiveRapidityNum?toDayData.unReceiveRapidityNum:0}})</span></div>
+			<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 2}" (click)="tabClick(2)">打包配送</div>
+		</div>
+		<div class="tabs-btn">
+			<button class="btn default" nz-button nzType="primary" nzSize="small" (click)='connect()'>接收</button>
+			<button class="btn default" nz-button nzType="primary" nzSize="small" (click)='packaging()'>打包</button>
+		</div>
+	</div>
+  <!-- 头部 end -->
+  <div class="pharmacy-main">
+    <div *ngIf="activeIndex==0" 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">
+			      <div class="list-template__searchItem">
+			        <span class="label">接收时间：</span>
+			        <nz-range-picker [(ngModel)]="acceptTime" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="changeDate($event)"></nz-range-picker>
+			      </div>
+						<div class="list-template__searchItem">
+						  <span class="label">配送人：</span>
+							<nz-select class="formItem" (nzOnSearch)="changeUserInp($event)"
+							  [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择配送人"
+							  [(ngModel)]="deliveryUser">
+							  <ng-container *ngFor="let option of userData">
+							    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+							    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+							  </nz-option>
+							</nz-select>
+						</div>
+						<div class="list-template__searchItem">
+						  <span class="label">术中快速：</span>
+							<nz-radio-group [(ngModel)]="intraoperativeRapidity">
+								<label nz-radio nzValue="1">是</label>
+								<label nz-radio nzValue="0">否</label>
+							</nz-radio-group>
+						</div>
+			    </div>
+			    <div nz-col nzLg="6" 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]="listOneData" nzSize="middle" [nzShowPagination]="false"
+			      [nzLoading]="loading1">
+			      <thead>
+			        <tr class="thead">
+			          <th>申请单号</th>
+			          <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 listOneData">
+			          <td><span *ngIf="data.intraoperativeRapidity==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.receiveUserDTO?data.receiveUserDTO.name : '-' }}</td>
+								<td>{{ data.receiveTime|date:'yyyy-MM-dd HH:mm:ss'  }}</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)]="pageOneIndex" [(nzTotal)]="listOneLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+			        (nzPageIndexChange)="getConnectList()" (nzPageSizeChange)="getConnectList()">
+			      </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.intraoperativeRapidity==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>
+				</div>
+			</div>
+    </div>
+  </div>
+  <!-- 主体部分 end -->
+  <!-- <router-outlet></router-outlet> -->
+</div>
+
+<!-- 科室切换提示框 -->
+<app-hs-prompt-modal
+  [changeShow]="changeShow"
+  [closeTime]="closeTime"
+  [closeTimeFlag]="closeTimeFlag"
+  [show]="hsPromptModalShow"
+  (closeModelHs)="closeModelHs($event)"
+  (clearModelHs)="clearModelHs($event)"
+  deptType="pathology"
+> 
+  <!-- 返回系统按钮 -->
+  <!-- 右侧悬浮框 -->
+   <div id="fixedMenu" class="fixed" *ngIf="mainRole">
+    <div class="right">
+      <div class="fixedMenu hujiaozhongxin">
+        <div class="menuItems">
+          <div class="item">快捷菜单</div>
+        </div>
+      </div>
+      <div class="fixedMenu">
+        <div class="menuItems">
+          <div
+            class="others"
+            [ngStyle]="{
+              height: showLastItems
+                ? mainRole
+                  ? 35 * 2 + 'px'
+                  : 35 * 1 + 'px'
+                : 0
+            }"
+          >
+            <div
+              [ngClass]="{ item: true, checked: fixedTab == 'back' }"
+              *ngIf="mainRole"
+              (click)="checkFixedTab('toSystem')"
+            >
+              返回系统
+            </div>
+          </div>
+        </div>
+        <div class="arrow" *ngIf="!showLastItems" (click)="fixedMenuXiala()">
+          <i class="icon_transport transport-xiala2-01"></i>
+        </div>
+        <div class="arrow" *ngIf="showLastItems" (click)="fixedMenuShangla()">
+          <i class="icon_transport transport-shangla-"></i>
+        </div>
+      </div>
+    </div>
+    <div
+      *ngIf="showLastItems && fixedTab != ''"
+      (click)="fixedMenuShangla()"
+      class="fixedMark"
+    ></div>
+  </div>
+</app-hs-prompt-modal>
+
+
+<!-- 查看详情 -->
+<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 border">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
+				</div>
+				
+				<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-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 class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</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">
+							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+			<div class="content-item-right">
+				<div class="step-title">病理闭环</div>
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;">{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
+		</div>
+	</div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>
+
+<!-- 补打 -->
+<app-dialog-delete [delModal]="printModal" (hideDelModalEvent)="hidePrintModal()" [btnLoading]="parintLoading"
+  (confirmDelEvent)="confirmPrintDel()" [content]="'您确认要重新打印条码吗？'"></app-dialog-delete>
+	
+<!-- 配送 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="distributionModal">
+	<div class="modalBody">
+		<div class="title">配送信息填写<i class="icon_transport transport-guanbi" (click)="hideDistributionModal()"></i>
+		</div>
+		<div class="content">
+		 <div class="title-class">包内含申请单{{rowData.pathologyFormNum}}张、标本{{rowData.specimenNum}}支，请填写配送人员工号。</div>
+		 <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitDistributionForm()">
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="jobNumber">配送人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入配送人工号!">
+					<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入配送人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">配送人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入配送人工号!"> -->
+					<div class="job-class">{{distributionName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="gurop">接收院区</nz-form-label>
+				<nz-form-control nzErrorTip="请选择接收院区!">
+					<nz-input-group>
+						<nz-select class="formItem" (ngModelChange)="changeHospDate($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择接收院区" formControlName="gurop">
+							<ng-container *ngFor="let option of hospital">
+								<nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							</ng-container>
+						</nz-select>
+					</nz-input-group>
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="department">接收科室</nz-form-label>
+				<nz-form-control nzErrorTip="请选择接收科室!">
+					<nz-input-group>
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择接收科室" formControlName="department">
+							<ng-container *ngFor="let option of department">
+								<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+							</ng-container>
+							<nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+								<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+							</nz-option>
+						</nz-select>
+					</nz-input-group>
+				</nz-form-control>
+			</nz-form-item>
+		 </form>
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitDistributionForm()" [nzLoading]="btnLoading">确定配送</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideDistributionModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 配送接收 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="receptionModal">
+	<div class="modalBody">
+		<div class="title">配送接收<i class="icon_transport transport-guanbi" (click)="hideReceptionModal()"></i>
+		</div>
+		<div class="content">
+		 <div class="title-class">
+			 包内含申请单12张、标本100，请确认接收。
+			</div>
+		 <form nz-form [formGroup]="validateConnectForm" class="addForm" (ngSubmit)="submitReceptionForm()">
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="receptionNumber">接收人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入接收人工号!">
+					<input nz-input (ngModelChange)="receptionChange($event)" formControlName="receptionNumber" placeholder="请输入接收人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">接收人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入接收人工号!"> -->
+					<div class="job-class">{{receptionName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="dispatchingNumber">配送人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入配送人工号!">
+					<input nz-input (ngModelChange)="dispatchingChange($event)" formControlName="dispatchingNumber" placeholder="请输入配送人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">配送人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入配送人工号!"> -->
+					<div class="job-class">{{dispatchingName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+		 </form>
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitReceptionForm()" [nzLoading]="btnConnectLoading">确定接收</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideReceptionModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 打包并打印 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="packModal">
+	<div class="modalBody">
+		<div class="title">打包并打印<i class="icon_transport transport-guanbi" (click)="hidePackModal()"></i>
+		</div>
+		<div class="content-modal">
+			 本次共扫描单据50张、标本40，是否打包并打印？
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitPackForm()" [nzLoading]="btnPackLoading">打包并打印</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hidePackModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 打印 -->
+<div id="report" style="display: none;" *ngIf="printData">
+	<div class="monad">
+		<div style="font-size: 10px;padding: 2px;">
+			<!-- <div> -->
+				<div style="display: flex;align-items: center;justify-content: center;">
+					<img style="width: 100%;height: 60px;" [src]="printData.qrCode" alt="">
+				</div>
+				<div style="padding: 1px;">
+					<div style="display: flex;flex-wrap: nowrap;margin-bottom:3px;">包码:{{printData.packCode}}</div>
+					<div style="display: flex;">打包时间:{{printData.packTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+					<!-- <div style="display: flex;">打包人:{{printData.packUserDTO?printData.packUserDTO.name:'-'}}</div> -->
+					<!-- <div style="display: flex;margin-bottom:6px;">申请单数:{{printData.pathologyFormNum}}</div> -->
+					<!-- <div style="display: flex;margin-bottom:6px;">标本数:{{printData.specimenNum}}</div> -->
+				</div>
+			<!-- </div> -->
+			<!-- <div style="display: flex;">打包时间:{{printData.packTime|date:'yyyy-MM-dd HH:mm:ss'}}</div> -->
+		</div>
+	</div>
+</div>

src/app/views/pathology/pathology.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PathologyRoutingModule } from './pathology-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { PathologyComponent } from './pathology.component';
+
+
+@NgModule({
+  declarations: [PathologyComponent],
+  imports: [
+    CommonModule,
+    PathologyRoutingModule,
+    ShareModule
+  ]
+})
+export class PathologyModule { }

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

@@ -0,0 +1,17 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { PathologyScanComponent } from "./pathologyScan.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: PathologyScanComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class PathologyScanRoutingModule {}

src/app/views/pathologyScan/pathologyScan.component.html

@@ -0,0 +1,282 @@
+<!-- 标本接收 -->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="fixationModal">
+	<div class="pathology-content">
+		<div class="title">
+		<!-- <i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i></div> -->
+		<div class="content">
+			<div class="content-item">
+				<!-- <div class="center">提示：申请单含<span class="red">{{codeData.specimenNum}}</span>只标本，已扫<span class="red">{{codeData.pathologySpecimenDTOList.length}}</span>只<span *ngIf="codeData.pathologySpecimenDTOList.length < codeData.specimenNum">，请继续扫描标本。</span></div> -->
+				<div class="disp-fl">
+					<div class="disp-title">
+						<div *ngIf="dataType=='receive'" class="title-weight">标本接收</div>
+						<div *ngIf="dataType=='pack'" class="title-weight">标本打包</div>
+						<div *ngIf="dataType?dataType=='receive' : businessType == 'connect'">
+							接收申请单数: <span class="weight">{{otherData.pathologyFormNum}}</span>  &nbsp;
+							接收标本数: <span class="weight">{{otherData.specimenNum}}</span>  
+						</div>
+						<div *ngIf="dataType?dataType=='pack' : businessType == 'packaging'">
+							打包申请单数: <span class="weight">{{otherData.pathologyFormNum}}</span>  &nbsp;
+							打包标本数: <span class="weight">{{otherData.specimenNum}}</span>  
+						</div>
+					</div>
+					
+					<div *ngIf="dataType!='pathologyPack' && businessType!='packagLook'">
+						<input nz-input id="specimen" [placeholder]="placeholder" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
+					</div>
+					<div class="error-class">{{errorMsg}}</div>
+				</div>
+				<div class="list-template">
+				  <div class="list-template__content">
+						<div class="list-template__bottom" style="padding: 0 !important;">
+							<nz-table class="list-template__nzTable" [nzData]="codeData" nzSize="middle" [nzShowPagination]="false"
+								[nzLoading]="tableLoading">
+								<thead>
+									<tr class="thead">
+										<th>申请单号 | 申请科室</th>
+										<th>患者姓名 | 住院号</th>
+										<th>标本数</th>
+										<th>部位</th>
+										<th>标本名称</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeData let index = index">
+										<td>
+											<div>{{ data.applyCode}}</div>
+											<div>{{ data.patientDTO.department.dept}}</div>
+										</td>
+										<td>
+											<div>{{ data.patientDTO.patientName}}</div>
+											<div>{{ data.patientDTO.residenceNo}}</div>
+										</td>
+										<td>{{ data.specimenNum}}</td>
+										<td>{{ data.takePart}}</td>
+										<td>
+											<div *ngFor="let item of data.pathologySpecimenDTOList">
+												{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</nz-table>
+							<div class="list-template__pagination">
+							  <nz-pagination [(nzPageIndex)]="pageReceptionIndex" [(nzTotal)]="listReceptionLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+							    (nzPageIndexChange)="pageChange()" (nzPageSizeChange)="pageChange()">
+							  </nz-pagination>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" *ngIf="dataType?dataType=='receive' : businessType == 'connect'" [disabled]="codeData.length==0" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">交接完成</button>
+			<button class="btn btn-right" *ngIf="dataType?dataType=='pack' : businessType == 'packaging'" [disabled]="codeData.length==0" nz-button nzType="primary" (click)="submitScanForm()" [nzLoading]="btnLoading">扫描完成</button>
+			<button class="btn btn-right" *ngIf="dataType=='pathologyPack'" nz-button nzType="primary" [disabled]="codeData.length==0" (click)="connectAccomplish()" [nzLoading]="btnMultiLoading">交接完成</button>
+			<button class="btn cancel" *ngIf="dataType=='pathologyPack'" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
+			<button class="btn cancel" *ngIf="dataType?dataType=='pack' : businessType == 'packaging'" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
+			<button class="btn btn-right" *ngIf="businessType=='packagLook'" nz-button nzType="primary" (click)="hideSpecimenModal()">知道了</button>
+		</div>
+	</div>
+</div>
+</div>
+
+<!-- 多支标本提示 -->
+<div class="multi add display_flex align-items_center justify-content_flex-center" *ngIf="multiModal">
+	<div class="pathology-content">
+		<div class="title">多支标本提示
+		<i class="icon_transport transport-guanbi" (click)="hideMultiModal()"></i></div>
+		<div class="content border">
+			<div class="content-item">
+				<div class="center">提示：{{scanCodeData.patientName}}的申请单含<span>{{codeMultiData.length}}</span>支标本，您已扫描<span>{{muArr.length}}</span>支</div>
+				<div class="disp-fl df-center">
+					<div>
+						<input nz-input id="multiSpecimen" placeholder="可扫描物理标本条码及包码" [(ngModel)]="specimenMultiCode" (ngModelChange)="codeMultiChange($event)"/>
+					</div>
+					<div class="error-class">{{errorMultiMsg}}</div>
+				</div>
+				<div class="list-template">
+				  <div class="list-template__content">
+						<div class="list-template__bottom" style="padding: 0 !important;">
+							<nz-table class="list-template__nzTable" [nzData]="codeMultiData" nzSize="middle" [nzShowPagination]="false"
+								[nzLoading]="tableLoading">
+								<thead>
+									<tr class="thead">
+										<th>序号</th>
+										<th>条码号</th>
+										<th>标本名称</th>
+										<th *ngIf="dataType=='receive'">已接收 | 未接收</th>
+										<th *ngIf="dataType=='pack'">已扫描 | 未扫描</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeMultiData let index = index">
+										<td>{{index+1}}</td>
+										<td>{{ data.specimenCode}}</td>
+										<td>
+											{{data.partSource?data.partSource.name:''}}{{data.organ?data.organ.name:''}}{{data.specimenName}}
+										</td>
+										<td *ngIf="dataType=='receive'">
+											<div *ngIf="data.isScan==1">已接收</div>
+											<div *ngIf="data.isScan==0" class="red">未接收</div>
+										</td>
+										<td *ngIf="dataType=='pack'">
+											<div *ngIf="data.isScan==1">已扫描</div>
+											<div *ngIf="data.isScan==0" class="red">未扫描</div>
+										</td>
+									</tr>
+								</tbody>
+							</nz-table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" *ngIf="dataType=='receive'" nz-button nzType="primary" (click)="submitMultiForm()" [nzLoading]="btnMultiLoading">确认接收</button>
+			<button class="btn btn-right" *ngIf="dataType=='pack'" nz-button nzType="primary" (click)="submitMultiScanForm()" [nzLoading]="btnMultiLoading">扫描完成</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideMultiModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>
+
+<!-- 人员交接 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="connectModal">
+	<div class="modalBody">
+		<div class="title">人员交接<i class="icon_transport transport-guanbi" (click)="hideConnectModal()"></i>
+		</div>
+		<div class="content">
+		 <div class="title-class">
+			 <div>配送人应送达：单据{{mustReceived.pathologyFormNum}}张、
+			 标本{{mustReceived.specimenNum}}、速冻标本{{mustReceived.rapidityNum}}</div>
+			 <div>本次共接收单据
+			 <span [ngClass]="{'red': currReceived.pathologyFormNum < mustReceived.pathologyFormNum}">
+				 {{currReceived.pathologyFormNum}}
+			 </span>张、
+			 标本<span [ngClass]="{'red': currReceived.specimenNum<mustReceived.specimenNum}">{{currReceived.specimenNum}}</span>、速冻标本
+			 <span [ngClass]="{'red': currReceived.rapidityNum<mustReceived.rapidityNum}">{{currReceived.rapidityNum}}</span>
+			 </div>
+			</div>
+		 <form nz-form [formGroup]="validateConnectForm" class="addForm" (ngSubmit)="submitConnectForm()">
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="receptionNumber">接收人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入接收人工号!">
+					<input nz-input (ngModelChange)="receptionChange($event)" formControlName="receptionNumber" placeholder="请输入接收人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">接收人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入接收人工号!"> -->
+					<div class="job-class">{{receptionName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="dispatchingNumber">配送人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入配送人工号!">
+					<input nz-input (ngModelChange)="dispatchingChange($event)" formControlName="dispatchingNumber" placeholder="请输入配送人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">配送人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入配送人工号!"> -->
+					<div class="job-class">{{dispatchingName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+		 </form>
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitConnectForm()" [nzLoading]="btnConnectLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideConnectModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 配送接收 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="receptionModal">
+	<div class="modalBody">
+		<div class="title">配送接收<i class="icon_transport transport-guanbi" (click)="hideReceptionModal()"></i>
+		</div>
+		<div class="content">
+		 <div class="title-class">
+			 包内含申请单{{otherData.pathologyFormNum}}张、标本{{otherData.specimenNum}}，请确认接收。
+			</div>
+		 <form nz-form [formGroup]="validateConnectForm" class="addForm" (ngSubmit)="submitReceptionForm()">
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="receptionNumber">接收人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入接收人工号!">
+					<input nz-input (ngModelChange)="receptionChange($event)" formControlName="receptionNumber" placeholder="请输入接收人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">接收人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入接收人工号!"> -->
+					<div class="job-class">{{receptionName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="dispatchingNumber">配送人工号</nz-form-label>
+				<nz-form-control nzErrorTip="请输入配送人工号!">
+					<input nz-input (ngModelChange)="dispatchingChange($event)" formControlName="dispatchingNumber" placeholder="请输入配送人工号" nzSize="default" />
+				</nz-form-control>
+			</nz-form-item>
+			<nz-form-item class="form-name">
+				<nz-form-label style="margin-left: 12px;">配送人姓名</nz-form-label>
+				<!-- <nz-form-control nzErrorTip="请输入配送人工号!"> -->
+					<div class="job-class">{{dispatchingName}}</div>
+				<!-- </nz-form-control> -->
+			</nz-form-item>
+		 </form>
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitReceptionForm()" [nzLoading]="btnConnectLoading">确定接收</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideReceptionModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 打包并打印 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="packModal">
+	<div class="modalBody">
+		<div class="title">打包并打印<i class="icon_transport transport-guanbi" (click)="hidePackModal()"></i>
+		</div>
+		<div class="content-modal">
+			 本次共扫描单据{{otherData.pathologyFormNum}}张、标本{{otherData.specimenNum}}，是否打包并打印？
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitPackForm()" [nzLoading]="btnPackLoading">打包并打印</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hidePackModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 打印 -->
+<div id="report" style="display: none;">
+	<div class="monad">
+		<div style="font-size: 10px;padding: 2px;">
+			<!-- <div> -->
+				<div style="display: flex;align-items: center;justify-content: center;">
+					<img style="width: 100%;height: 60px;" [src]="printData.qrCode" alt="">
+				</div>
+				<div style="padding: 1px;">
+					<div style="display: flex;flex-wrap: nowrap;margin-bottom:3px;">包码:{{printData.packCode}}</div>
+					<div style="display: flex;">打包时间:{{printData.packTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+					<!-- <div style="display: flex;">打包人:{{printData.packUserDTO?printData.packUserDTO.name:'-'}}</div> -->
+					<!-- <div style="display: flex;margin-bottom:6px;">申请单数:{{printData.pathologyFormNum}}</div> -->
+					<!-- <div style="display: flex;margin-bottom:6px;">标本数:{{printData.specimenNum}}</div> -->
+				</div>
+			<!-- </div> -->
+			<!-- <div style="display: flex;">打包时间:{{printData.packTime|date:'yyyy-MM-dd HH:mm:ss'}}</div> -->
+		</div>
+	</div>
+</div>

src/app/views/pathologyScan/pathologyScan.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PathologyScanRoutingModule } from './pathologyScan-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { PathologyScanComponent } from './pathologyScan.component';
+
+
+@NgModule({
+  declarations: [PathologyScanComponent],
+  imports: [
+    CommonModule,
+    PathologyScanRoutingModule,
+    ShareModule
+  ]
+})
+export class PathologyScanModule { }

src/app/views/round-robin/round-robin.component.html

@@ -191,9 +191,9 @@
             </nz-form-control>
           </nz-form-item>
           <ng-container *ngIf="selectedTasktype">
-            <nz-form-item *ngIf="selectedTasktype.associationType.value=='specimenPlan'">
+            <nz-form-item *ngIf="selectedTasktype.associationType.value=='specimenPlan' || selectedTasktype.associationType.value=='specimen'">
               <nz-form-label [nzSm]="6" [nzXs]="24"
-                [nzRequired]="selectedTasktype.associationType.value=='specimenPlan'" nzFor="endDepartment">终点科室
+                [nzRequired]="selectedTasktype.associationType.value=='specimenPlan' || selectedTasktype.associationType.value=='specimen'" nzFor="endDepartment">终点科室
               </nz-form-label>
               <nz-form-control nzErrorTip="请选择终点科室!">
                 <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
@@ -220,9 +220,8 @@
           </ng-container>
         </form>
         <ng-container *ngIf="selectedTasktype">
-          <p *ngIf="selectedTasktype.associationType.value=='specimenPlan'" class="roundRobinTips">
-            提示：起点科室即为标本开通科室；执行人即为科室绑定人员设定；前往设置<a [routerLink]="['/main','officeManagement']">开通科室</a>、<a
-              [routerLink]="['/main','workAssignment']">工作分配</a>>>
+          <p *ngIf="selectedTasktype.associationType.value=='specimenPlan' || selectedTasktype.associationType.value=='specimen'" class="roundRobinTips">
+            提示：起点科室即为标本开通科室；执行人即为科室绑定人员设定；前往设置开通科室、工作分配
           </p>
           <p *ngIf="selectedTasktype.associationType.value=='other'&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)"
             class="roundRobinTips">

src/app/views/round-robin/round-robin.component.ts

@@ -114,7 +114,6 @@ export class RoundRobinComponent implements OnInit {
         this.validateForm.controls.endDepartment.setValue(null);
       }
     }
-
     let data = {
       department: {
         hospital: { id },
@@ -190,17 +189,23 @@ export class RoundRobinComponent implements OnInit {
   depting = "";
   searchDepartment(dept, type) {
     this.depting = dept;
-    let postData = {
-      department: {
-        dept,
-        type: { id: 383 },
-        hospital: {
-          id: this.hosId,
-        },
-      },
-      idx: 0,
-      sum: 5,
-    };
+		let postData={
+			department: {
+				dept,
+				hospital: { id: this.hosId },
+				cascadeHosId: this.hosId,
+				type: { id: null },
+			},
+			idx: 0,
+			sum: 5,
+		}
+		if(this.selectedTasktype.associationType.value == "specimen"){
+			postData.department.type.id = 282
+			delete postData.department.hospital
+		}else{
+			postData.department.type.id = 383
+			delete postData.department.cascadeHosId
+		}
     this.mainService
       .getFetchDataList("data", "department", postData)
       .subscribe((result) => {
@@ -288,7 +293,7 @@ export class RoundRobinComponent implements OnInit {
       sum: 5,
       taskType: {
         hosIds: this.hosId + "",
-        associationTypeIds: "380,259",
+        associationTypeIds: "380,259,256",
         taskName,
       },
     };
@@ -308,6 +313,7 @@ export class RoundRobinComponent implements OnInit {
   addModal() {
     this.add = true; //新增
     this.modal = true;
+		this.selectedTasktype = null;
     this.initForm();
   }
   //关闭新增/编辑弹框
@@ -441,7 +447,8 @@ export class RoundRobinComponent implements OnInit {
           executeTime: new Date(this.validateForm.value.executeTime).getTime(),
         },
       };
-      if (this.selectedTasktype.associationType.value == "specimenPlan") {
+      if (this.selectedTasktype.associationType.value == "specimenPlan"||
+					this.selectedTasktype.associationType.value == "specimen") {
         //标本轮巡
         postData.orderPlan.targetDept =
           this.validateForm.value.endDepartment.join();
@@ -475,7 +482,8 @@ export class RoundRobinComponent implements OnInit {
         dayType: this.validateForm.value.datesType,
         executeTime: new Date(this.validateForm.value.executeTime).getTime(),
       };
-      if (this.selectedTasktype.associationType.value == "specimenPlan") {
+      if (this.selectedTasktype.associationType.value == "specimenPlan"||
+				this.selectedTasktype.associationType.value == "specimen") {
         //标本轮巡
         postData.targetDept = this.validateForm.value.endDepartment.join();
       } else if (this.selectedTasktype.associationType.value == "other") {
@@ -541,7 +549,7 @@ export class RoundRobinComponent implements OnInit {
         sum: 5,
         taskType: {
           hosIds: this.hosId + "",
-          associationTypeIds: "380,259",
+          associationTypeIds: "380,259,256",
           taskName: "",
         },
       };
@@ -585,7 +593,8 @@ export class RoundRobinComponent implements OnInit {
     }
     //轮巡策略（时间）end
     // --------终点科室---
-    if (data.taskType.associationType.value == "specimenPlan") {
+    if (data.taskType.associationType.value == "specimenPlan" ||
+			this.selectedTasktype.associationType.value == "specimen") {
       //标本轮巡，则回显
       let targetDeptArr = [];
       let targetDept = data.targetDept.split(",");
@@ -593,15 +602,24 @@ export class RoundRobinComponent implements OnInit {
       targetDept.forEach((item, index) => {
         targetDeptArr.push({ id: item, dept: targetDeptShow[index] });
       });
+			let query={
+				department: {
+					hospital: { id: data.hospital },
+					cascadeHosId:data.hospital,
+					type: { id: null },
+				},
+				idx: 0,
+				sum: 20,
+			}
+			if(this.selectedTasktype.associationType.value == "specimen"){
+				query.department.type.id = 282
+				delete query.department.hospital
+			}else{
+				query.department.type.id = 383
+				delete query.department.cascadeHosId
+			}
       this.mainService
-        .getFetchDataList("data", "department", {
-          department: {
-            hospital: { id: data.hospital },
-            type: { id: 383 },
-          },
-          idx: 0,
-          sum: 20,
-        })
+        .getFetchDataList("data", "department", query)
         .subscribe((data) => {
           this.maskFlagLoading2 = false;
           if (!this.maskFlagLoading1 && !this.maskFlagLoading2) {

src/app/views/specimen-room-view/specimen-room-view-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { SpecimenRoomViewComponent } from "./specimen-room-view.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: SpecimenRoomViewComponent,
+    // children: [
+    //   {
+    //     // 工单详情-标本
+    //     path: "detailSample/:id",
+    //     component: DetailSampleComponent,
+    //   },
+    // ],
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class SpecimenRoomViewRoutingModule {}

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

@@ -0,0 +1,709 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+   <div class="pharmacy-logo">
+<!--      <img
+        [src]="tool.logoUrl"
+        class="pharmacy-logo__img"
+        [alt]="tool.logoTitle"
+      />
+      <h1 class="pharmacy-logo__name">{{tool.logoTitle}}</h1> -->
+			<h2 class="pharmacy-name__title">
+			  <span>标本间</span>
+			  <!-- <span class="currentDate">{{ time | date: "yyyy年MM月dd日" }}</span> -->
+			</h2>
+    </div>
+    <div class="pharmacy-name">
+      <div class="pharmacy-name__total">
+				<div class="pharmacy-title">标本条码：</div>
+				<nz-input-group nzSize="large">
+					<input type="text" id="Binput" (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>
+				</ng-template> -->
+      </div>
+			<div>
+				<div class="error-class">{{searchMsg}}</div>
+			</div>
+    </div>
+    <div class="userInfo">
+      <div class="wel">欢迎您：</div>
+      <div class="user">
+        <img src="../../assets/images/icon_keshi.png" alt="" />
+        <span *ngIf="deptDisplay">{{
+          deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept
+        }}</span>
+      </div>
+      <div class="userInfo-wrap">
+        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="logOut()">退出</div>
+      </div>
+    </div>
+  </div>
+  <!-- 头部 end -->
+  <!-- 主体部分 start -->
+  <div class="pharmacy-main">
+    <!-- 手术间标本start -->
+    <div class="pharmacy-main__list pharmacy-main__print">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>手术间标本</strong>
+				<span *ngIf="printPharmacyList.length>0">共 {{printPharmacyList.length}} 条</span>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="printPharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('surgeryDept')">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef1 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading1" style="height: 100%">
+          <div
+            class="pharmacy-main__selection noPointer"
+            *ngFor="let item of printPharmacyList"
+						(click)="viewDetail(item,1)"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <span title="住院号" class="weight">
+									<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+									{{item.applyCode || '无'}}
+								</span>
+                <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span class="text-left" [title]="item.takePart">部位：{{item.takePart || '无'}}</span>
+                <span class="text-right" title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="手术间">手术间：{{item.surgeryDeptDTO.dept || '无'}}</span>
+                <span class="text-right" title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+              </div>
+            </div>
+          </div>
+          <div
+            class="pharmacy-main__selection pharmacy-main__selection--noData"
+            *ngIf="printPharmacyList.length === 0"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <!-- <div
+            (click)="loadMore(1)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="printPharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="printPharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div> -->
+        </div>
+        <div
+          *ngIf="loading1"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+
+    <!-- 标本间标本 start -->
+    <div class="pharmacy-main__list pharmacy-main__waitDelivery">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>标本间标本</strong>
+				<span *ngIf="waitPharmacyList.length>0">共 {{waitPharmacyList.length}} 条</span>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="waitPharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('specimenDept')">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef2 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading2" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of waitPharmacyList; let i = index"
+						(click)="viewDetail(item,2)"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <span title="住院号" class="weight">
+            			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+            			{{item.applyCode || '无'}}
+            		</span>
+                <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span class="text-left" [title]="item.takePart">部位：{{item.takePart || '无'}}</span>
+                <span class="text-right" title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+								<span class="text-right" title="固定时间">固定时间：{{item.fixationTime?(item.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+              </div>
+            </div>
+          </div>
+          <div
+            class="pharmacy-main__selection pharmacy-main__selection--noData"
+            *ngIf="waitPharmacyList.length === 0"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <!-- <div
+            (click)="loadMore(2)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="waitPharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="waitPharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div> -->
+        </div>
+        <div
+          *ngIf="loading2"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+
+    <!-- 今日离科标本 start -->
+    <div class="pharmacy-main__list pharmacy-main__delivery">
+      <!-- 标题 start -->
+      <div class="pharmacy-main__title">
+        <strong>今日离科标本</strong>
+				<span *ngIf="pharmacyList.length>0">共 {{pharmacyList.length}} 条</span>
+        <span class="autoUpdate">{{ logTime }}秒</span>
+      </div>
+      <!-- 标题 end -->
+      <!-- 搜索框 start -->
+      <div class="pharmacy-main__search">
+        <div class="pharmacy-main__searchInput">
+          <input
+            nz-input
+            placeholder="请输入关键字"
+            [(ngModel)]="pharmacySearchKey"
+          />
+          <div class="pharmacy-main__searchText" (click)="searchKeyHandle('leavedDept')">
+            <i nz-icon nzType="search"></i>
+            <span>搜索</span>
+          </div>
+        </div>
+      </div>
+      <!-- 搜索框 end -->
+      <!-- 列表 start -->
+      <overlay-scrollbars #osComponentRef3 class="pharmacy-main__selectionWrap">
+        <div *ngIf="!loading3" style="height: 100%">
+          <div
+            class="pharmacy-main__selection"
+            *ngFor="let item of pharmacyList; let i = index"
+						(click)="viewDetail(item,3)"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <div class="pharmacy-main__selectionItem">
+                <span title="住院号" class="weight">
+            			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+            			{{item.applyCode || '无'}}
+            		</span>
+                <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span class="text-left" [title]="item.takePart">部位：{{item.takePart || '无'}}</span>
+                <span class="text-right" title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+              </div>
+              <div class="pharmacy-main__selectionItem">
+                <span title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+            		<span class="text-right" title="固定时间">固定时间：{{item.fixationTime?(item.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+              </div>
+							<div class="pharmacy-main__selectionItem">
+							  <span title="配送人">配送人：{{item.deliveryUserDTO?item.deliveryUserDTO.name:'无'}}</span>
+								<span class="text-right" title="离科时间">离科时间：{{item.leaveDeptTime?(item.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+							</div>
+            </div>
+          </div>
+          <div
+            class="pharmacy-main__selection pharmacy-main__selection--noData"
+            *ngIf="pharmacyList.length === 0"
+          >
+            <img src="./../../assets/images/image_kongbaiye.png" alt="" />
+          </div>
+          <!-- <div
+            (click)="loadMore(3)"
+            class="pharmacy-main__selection pharmacy-main__selection--more"
+            *ngIf="pharmacyFlag"
+          >
+            <div class="pharmacy-main__selectionInfo">
+              <i
+                nz-icon
+                nzType="loading"
+                nzTheme="outline"
+                class="pharmacy-main__selection--icon"
+                *ngIf="pharmacyLoad"
+              ></i
+              >查看更多
+            </div>
+          </div> -->
+        </div>
+        <div
+          *ngIf="loading3"
+          style="height: calc(100vh - 212px); min-height: 556px"
+        >
+          <div
+            class="loadingFull display_flex justify-content_flex-center align-items_center"
+          >
+            <div class="loadingFullInner">
+              <img src="../../../assets/images/loading.gif" alt="" />
+              <div>加载中...</div>
+            </div>
+          </div>
+        </div>
+      </overlay-scrollbars>
+      <!-- 列表 end -->
+    </div>
+  </div>
+  <!-- 主体部分 end -->
+  <router-outlet></router-outlet>
+</div>
+
+<!-- 科室切换提示框 -->
+<app-hs-prompt-modal
+  [changeShow]="changeShow"
+  [closeTime]="closeTime"
+  [closeTimeFlag]="closeTimeFlag"
+  [show]="hsPromptModalShow"
+  (closeModelHs)="closeModelHs($event)"
+  (clearModelHs)="clearModelHs($event)"
+  deptType="nurse"
+> 
+  <!-- 返回系统按钮 -->
+  <!-- 右侧悬浮框 -->
+   <div id="fixedMenu" class="fixed" *ngIf="mainRole">
+    <div class="right">
+      <div class="fixedMenu hujiaozhongxin">
+        <div class="menuItems">
+          <div class="item">快捷菜单</div>
+        </div>
+      </div>
+      <div class="fixedMenu">
+        <div class="menuItems">
+          <div
+            class="others"
+            [ngStyle]="{
+              height: showLastItems
+                ? mainRole
+                  ? 35 * 2 + 'px'
+                  : 35 * 1 + 'px'
+                : 0
+            }"
+          >
+            <div
+              [ngClass]="{ item: true, checked: fixedTab == 'back' }"
+              *ngIf="mainRole"
+              (click)="checkFixedTab('toSystem')"
+            >
+              返回系统
+            </div>
+          </div>
+        </div>
+        <div class="arrow" *ngIf="!showLastItems" (click)="fixedMenuXiala()">
+          <i class="icon_transport transport-xiala2-01"></i>
+        </div>
+        <div class="arrow" *ngIf="showLastItems" (click)="fixedMenuShangla()">
+          <i class="icon_transport transport-shangla-"></i>
+        </div>
+      </div>
+    </div>
+    <div
+      *ngIf="showLastItems && fixedTab != ''"
+      (click)="fixedMenuShangla()"
+      class="fixedMark"
+    ></div>
+  </div>
+</app-hs-prompt-modal>
+
+<!-- 标本历史记录查看 -->
+<!-- <app-history-prompt-modal
+  *ngIf="logPromptModalShow"
+  [show]="logPromptModalShow"
+  [scode]="scode"
+  (closeModelHs)="closeModelLog($event)"
+></app-history-prompt-modal> -->
+
+<!-- 标本列表查看 -->
+<!-- <app-spe-prompt-modal
+  *ngIf="spePromptModalShow"
+  [show]="spePromptModalShow"
+  [checkDeptId]="checkDeptId"
+  [pharmacySearchKey]="pharmacySearchKey"
+  [printDate]="printDate"
+  (closeModelHs)="closeModelSpe($event)"
+></app-spe-prompt-modal> -->
+
+<!-- 工单列表查看 -->
+<!-- <app-order-prompt-modal
+  *ngIf="orderPromptModalShow"
+  [show]="orderPromptModalShow"
+  [workId]="workId"
+  (closeModelHs)="closeModelOrder($event)"
+></app-order-prompt-modal> -->
+
+<!-- 关联标本/手术室 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="relevanceModal">
+	<div class="modalBody">
+		<div class="title">关联科室</div>
+		<overlay-scrollbars #osComponentRef1 class="content">
+		 <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="specimen" [nzSm]="5" [nzXs]="24">关联标本间</nz-form-label>
+				<nz-form-control nzErrorTip="请选择标本间!" [nzSm]="19" [nzXs]="24">
+					<nz-input-group>
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择标本间" formControlName="specimen">
+							<ng-container *ngFor="let option of specimenData">
+								<nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+							</ng-container>
+						</nz-select>
+					</nz-input-group>
+				</nz-form-control>
+			</nz-form-item>
+			
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="operation" [nzSm]="5" [nzXs]="24">关联手术间</nz-form-label>
+				<nz-form-control nzErrorTip="请选择手术间!" [nzSm]="19" [nzXs]="24">
+					<nz-input-group>
+						<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择请选择手术间" formControlName="operation">
+							<ng-container *ngFor="let option of operationData">
+								<nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+							</ng-container>
+						</nz-select>
+					</nz-input-group>
+				</nz-form-control>
+			</nz-form-item>
+			
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="generate">标本是否直接生成配送单</nz-form-label>
+				<nz-form-control nzErrorTip="请选择!">
+					<nz-radio-group formControlName="generate">
+						<label nz-radio [nzValue]="1">是</label>
+						<label nz-radio [nzValue]="0">否</label>
+					</nz-radio-group>
+				</nz-form-control>
+			</nz-form-item>
+		 </form>
+		</overlay-scrollbars>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">确定</button>
+		</div>
+	</div>
+</div>
+
+
+<!-- 标本接收 -->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="fixationModal">
+	<div class="pathology-content">
+		<div class="title">标本接收固定
+		<i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i></div>
+		<div class="content">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{codeData.intraoperativeRapidity==1?'是':'否'}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{codeData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{codeData.status.name}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{codeData.patientDTO.department.dept}}</div>
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{codeData.patientDTO.patientCode}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{codeData.patientDTO.patientName}} ({{codeData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{codeData.patientDTO.age||'-'}}岁</div>
+				</div>
+				<div class="form-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">
+						{{codeData.diagnose||'无'}}
+					</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">病历摘要：</div>
+					<div class="indent">{{codeData.medicalRecords||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">手术方案：</div>
+					<div class="indent">{{codeData.surgicalPlan||'无'}}</div>
+				</div>
+	<!-- 			<div class="form-list">
+					<div class="form-title font-weight-500">术中所见：</div>
+					<div class="indent">{{codeData.intraoperativeFindings||'无'}}</div>
+				</div> -->
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{codeData.specimenType?codeData.specimenType.name:'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{codeData.specimenNum?codeData.specimenNum:'无'}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">部位：</span>{{codeData.takePart||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">取标本位置：</span>{{codeData.surgeryDeptDTO?codeData.surgeryDeptDTO.dept:''}}</div>
+					<div class="form-title"><span class="font-weight-500">取材医生：</span>{{codeData.surgeryDoctorDTO?codeData.surgeryDoctorDTO.name : '-'}}</div>
+				</div>
+	<!-- 			<div class="form-list">
+					<div class="form-title font-weight-500">标本：</div>
+					<div>标本1</div>
+					<div>标本2</div>
+				</div> -->
+			</div>
+			
+			<div class="content-item">
+				<div class="center">提示：申请单含<span class="red">{{codeData.specimenNum}}</span>只标本，已扫<span class="red">{{codeData.pathologySpecimenDTOList.length}}</span>只<span *ngIf="codeData.pathologySpecimenDTOList.length < codeData.specimenNum">，请继续扫描标本。</span></div>
+				<div class="disp-fl">
+					<div class="width-120">标本条码：</div>
+					<input nz-input id="specimen" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
+				</div>
+				<div class="error-fix">{{fixationError}}</div>
+				<div class="list-template">
+				  <div class="list-template__content">
+						<div class="list-template__bottom" style="padding: 0 !important;">
+							<nz-table class="list-template__nzTable" [nzData]="codeData.pathologySpecimenDTOList" nzSize="middle" [nzShowPagination]="false"
+								[nzLoading]="tableLoading">
+								<thead>
+									<tr class="thead">
+										<th nzWidth="10%">序号</th>
+										<th>条码号</th>
+										<th>标本名称</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeData.pathologySpecimenDTOList let index = index">
+										<td>{{index+1}}</td>
+										<td>{{ data.specimenCode}}</td>
+										<td>
+											{{data.partSource?data.partSource.name:''}}{{data.organ?data.organ.name:''}}{{data.specimenName}}
+										</td>
+									</tr>
+								</tbody>
+							</nz-table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" [disabled]="codeData.specimenNum != codeData.pathologySpecimenDTOList.length" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+<!-- 标本固定信息 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="verificationMoadl">
+	<div class="modalBody no-width">
+		<div class="title">标本固定信息<i class="icon_transport transport-guanbi" (click)="hideVerificationModal()"></i>
+		</div>
+		<div class="content">
+			<form nz-form [formGroup]="validateVerificationForm" class="addForm" (ngSubmit)="submitVerificationForm()">
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择固定时间!">
+				    <nz-input-group>
+							<nz-date-picker formControlName="fixationTime" 
+							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="formChangeDate($event)"></nz-date-picker>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="jobNumber">工号</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入工号!">
+						<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="name">姓名</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入姓名!">
+						<input nz-input disabled formControlName="name" placeholder="请输入姓名" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固体液类型</nz-form-label>
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固体液类型!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择固体液类型" formControlName="fixative">
+							  <ng-container *ngFor="let option of fixativeData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+			</form>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitVerificationForm()" [nzLoading]="btnInfoLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideVerificationModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 标本查看详情-->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="detailMoadl">
+	<div class="pathology-content">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+		<div class="content">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
+				</div>
+				
+				<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 class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</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">
+							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+			<div class="content-item-right">
+				<div class="step-title">病理闭环</div>
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;">{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
+			<!-- <button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button> -->
+		</div>
+	</div>
+</div>
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>

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

@@ -0,0 +1,835 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  background-color: #f9fafb;
+  .ant-btn[disabled] {
+    color: rgba(0, 0, 0, 0.25) !important;
+    background-color: #f5f5f5 !important;
+  }
+  .red {
+    color: red !important;
+    font-weight: bold !important;
+  }
+  .green {
+    color: @primary-color!important;
+    font-weight: bold !important;
+  }
+
+  h1,
+  h2,
+  h3,
+  p {
+    margin: 0;
+  }
+  em {
+    font-style: normal;
+  }
+	
+	
+	/* 修改垂直滚动条 */
+	::-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;
+	}
+	
+  .pharmacy {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
+  // 头部 start
+  .pharmacy-header {
+    // height: 88px;
+    background-color: #fff;
+    border-bottom: 1px solid #e5e9ed;
+    box-sizing: border-box;
+    display: flex;
+		color: #000;
+    .pharmacy-logo {
+      width: 221px;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      .pharmacy-logo__img {
+        max-width: 100%;
+        max-height: 50%;
+      }
+
+      .pharmacy-logo__name {
+        font-size: 14px;
+        color: @primary-color;
+        margin-top: 8px;
+      }
+    }
+
+    .pharmacy-name {
+      // flex: 1;
+      // border-right: 1px solid #e5e9ed;
+      display: flex;
+      // justify-content: space-between;
+      align-items: center;
+			width: 60%;
+			justify-content: center;
+      .pharmacy-name__title {
+        font-size: 22px;
+        color: #333;
+        margin-left: 43px;
+        line-height: 87px;
+        .currentDate {
+          margin-left: 24px;
+          font-size: 16px;
+        }
+      }
+      .pharmacy-name__total {
+        margin-right: 16px;
+        font-size: 16px;
+				display: flex;
+				.pharmacy-title{
+					width: 170px;
+					font-weight: 600;
+					font-size: 22px;
+				}
+      }
+			.error-class{
+				color: red;
+			}
+    }
+
+    .pharmacy-operate {
+      width: 211px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+      .pharmacy-operatePop {
+        cursor: pointer;
+        border: 1px solid #e5e9ed;
+        background-color: #fff;
+        position: absolute;
+        left: 0;
+        top: 100%;
+        width: 100%;
+        height: 34px;
+        line-height: 34px;
+        text-align: center;
+        font-size: 14px;
+        color: @primary-color;
+      }
+
+      &:after {
+        content: "";
+        display: block;
+        width: 0;
+        height: 0;
+        border-left: 7px solid transparent;
+        border-right: 7px solid transparent;
+        border-top: 10px solid #666;
+      }
+
+      .pharmacy-operate__img {
+        max-height: 40px;
+        margin-right: 8px;
+      }
+
+      .pharmacy-operate__title {
+        font-size: 20px;
+        color: #666;
+        padding-right: 24px;
+        cursor: pointer;
+      }
+    }
+  }
+  .userInfo {
+    // display: none;
+    width: 336px;
+    // height: 100%;
+    // float: right;
+    padding: 8px;
+    box-sizing: border-box;
+    font-size: 14px;
+    // border-left: 1px solid #e5e9ed;
+
+    .wel {
+      line-height: 15px;
+    }
+
+    .user {
+      font-size: 20px;
+      height: 36px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      line-height: normal;
+
+      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;
+      }
+    }
+  }
+  // 头部 end
+  // 主体部分 start
+  .pharmacy-main {
+    height: calc(100vh - 88px);
+    min-height: 680px;
+    flex: 1;
+    padding: 16px;
+    display: flex;
+    justify-content: space-between;
+    .pharmacy-main__list {
+      display: flex;
+      flex-direction: column;
+      background-color: #f9fafb;
+      // flex: 1;
+			width: 33%;
+      // margin: 0 4px;
+      box-sizing: border-box;
+      border: 1px solid #e5e9ed;
+      // 标题 start
+      .pharmacy-main__title {
+        height: 40px;
+        background-color: #fff;
+        font-size: 16px;
+        color: #333;
+        font-weight: 700;
+        padding-left: 8px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #e5e9ed;
+        .autoUpdate {
+          font-size: 14px;
+          color: #49b856;
+          margin-right: 8px;
+        }
+        .pharmacy-main__printAll {
+          // width: 80px;
+          height: 28px;
+          line-height: 28px;
+          margin-right: 16px;
+          background-color: @primary-color;
+          font-size: 14px;
+          color: #fff;
+          border-radius: 4px;
+          text-align: center;
+          display: flex;
+          justify-content: center;
+        }
+      }
+      // 标题 end
+      // 搜索框 start
+      .pharmacy-main__search {
+        padding: 8px;
+        position: relative;
+				border-bottom: 1px solid #e5e9ed;
+        .pharmacy-main__searchInput {
+          border-radius: 100px;
+          padding-right: 82px;
+          border: 1px solid #e5e9ed;
+          background-color: #fff;
+          overflow: hidden;
+          input {
+            border: none;
+          }
+          .ant-input:focus {
+            border-color: #fff;
+            outline: 0;
+            box-shadow: 0 0 0 2px #fff;
+          }
+          .pharmacy-main__searchText {
+            cursor: pointer;
+            position: absolute;
+            top: 13px;
+            right: 8px;
+            width: 74px;
+            height: 22px;
+            border-left: 1px solid #e5e9ed;
+            color: #999;
+            padding-left: 8px;
+            box-sizing: border-box;
+            span {
+              color: @primary-color;
+              margin-left: 8px;
+            }
+          }
+        }
+      }
+      // 搜索框 end
+      // 列表 start
+      .pharmacy-main__selectionWrap {
+        flex: 1;
+        // height: 630px;
+        overflow: auto;
+        &:first-child {
+          border-top: 1px solid #e5e9ed;
+        }
+        .pharmacy-main__selection {
+          box-sizing: border-box;
+          border-bottom: 1px solid #e5e9ed;
+          display: flex;
+          cursor: pointer;
+          &.noPointer{
+            cursor: pointer;
+          }
+          &.pharmacy-main__selection--more {
+            color: @primary-color;
+            height: 34px;
+            cursor: pointer;
+            .pharmacy-main__selectionInfo {
+              justify-content: center;
+              align-items: center;
+              flex-direction: row;
+              .pharmacy-main__selection--icon {
+                margin-right: 8px;
+              }
+            }
+          }
+          &.pharmacy-main__selection--noData {
+            height: calc(100vh - 212px);
+            min-height: 556px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            img {
+              width: 100px;
+            }
+          }
+          .pharmacy-main__selectionInfo {
+            padding: 8px;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            .pharmacy-main__selectionItem {
+              display: flex;
+              justify-content: space-between;
+              padding: 0 8px;
+							margin-bottom: 5px;
+							// &:nth-of-typespan(1){
+							// 	text-align: left;
+							// }
+							// &:nth-of-typespan(2){
+							// 	text-align: right;
+							// }
+							.weight{
+								font-weight: 500;
+								.sign-red{
+									color: red;
+									margin-right: 10px;
+								}
+							}
+              .moreContent{
+                width: 150px;
+                display: flex;
+                justify-content: flex-end;
+                text-align: justify;
+                &.left{
+                  justify-content: flex-start;
+                }
+              }
+							.text-left{
+								text-align: left;
+							}
+							.text-right{
+								text-align: right;
+							}
+              span {
+                color: #666;
+                font-size: 14px;
+								width: 50%;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								// flex: 1;
+              }
+              strong {
+                color: #333;
+                font-weight: 700;
+                font-size: 14px;
+              }
+            }
+          }
+          .pharmacy-main__selectionPrint {
+            width: 90px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border-left: 1px solid #e5e9ed;
+            .pharmacy-main__selectionPrintBtn {
+              width: 60px;
+              height: 28px;
+              line-height: 28px;
+              border-radius: 4px;
+              border: 1px solid @primary-color;
+              color: @primary-color;
+              text-align: center;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+      // 列表 end
+    }
+  }
+  // 主体部分 end
+
+  // 右侧悬浮菜单
+  .fixed {
+    position: fixed;
+    top: 40%;
+    right: 0;
+    z-index: 99;
+    border-radius: 5px 0 0 5px;
+
+    .fixedMark {
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, 0.2);
+      z-index: 88;
+    }
+
+    // overflow: hidden;
+    & > .left {
+      width: 480px;
+      // height: 280px;
+      float: left;
+      background: #fff;
+      padding: 16px;
+      border-radius: 5px;
+      border: 1px solid #e5e9ed;
+      // box-shadow: -8px 5px 15px #eae9e9;
+      position: relative;
+      z-index: 98;
+
+      .con {
+        background: #f9fafb;
+        width: 100%;
+        height: 100%;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 16px 20px;
+
+        &.tableCon {
+          padding: 0;
+
+          .table {
+            font-size: 14px;
+
+            tr {
+              td {
+                padding: 15px 6px;
+                text-align: center;
+
+                & > .tdiv {
+                  overflow: hidden;
+
+                  .name {
+                    float: left;
+                  }
+
+                  .num {
+                    float: right;
+                    font-size: 12px;
+
+                    span {
+                      color: @primary-color;
+                      font-size: 14px;
+                    }
+                  }
+                }
+
+                .notOpen {
+                  color: #666;
+                  font-size: 12px;
+
+                  img {
+                    margin-bottom: 8px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        .title {
+          color: #333;
+          text-align: center;
+        }
+
+        .conditions {
+          & > .ant-row {
+            margin: 8px 0;
+
+            .ant-row {
+              .ant-col-6 {
+                margin: 2px 0;
+              }
+            }
+
+            .checkAll {
+              width: 100%;
+              border-bottom: 1px solid rgb(233, 233, 233);
+              color: @primary-color;
+            }
+          }
+        }
+
+        .btns {
+          padding: 5px 20px 0 20px;
+        }
+      }
+    }
+
+    .right {
+      // opacity: .5;
+      width: 80px;
+      float: left;
+      background: rgba(255, 255, 255, 0.5);
+      border-radius: 5px 0 0 5px;
+      position: relative;
+      z-index: 98;
+
+      .fixedMenu {
+        border: 1px solid #e5e9ed;
+        color: rgba(0, 128, 0, 0.5);
+        background: rgba(255, 255, 255, 0.5);
+        text-align: center;
+        border-radius: 5px 0 0 5px;
+        // box-shadow: -3px 4px 15px rgba(234, 233, 233, .5);
+
+        &.hujiaozhongxin {
+          margin-bottom: 5px;
+        }
+
+        .menuItems {
+          .item {
+            height: 35px;
+            line-height: 35px;
+            padding: 0 6px;
+            cursor: default;
+            border-bottom: 1px solid #e5e9ed;
+            user-select: none;
+
+            &.checked {
+              background: #fff;
+              color: #52ab77;
+              opacity: 1;
+              box-shadow: -3px 4px 7px #eae9e9;
+            }
+          }
+
+          .others {
+            transition: height 0.4s linear;
+            overflow: hidden;
+          }
+        }
+
+        .arrow {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+
+	// 新增
+	&.add {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 999;
+	  .modalBody {
+	    width: 40%;
+	    height: auto;
+			padding: 10px 20px;
+			border-radius: 5px;
+			background: #fff;
+			.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: auto;
+	      padding: 19px 14px 0 14px;
+	      // max-height: 500px;
+	      // overflow-y: auto;
+				.ant-select{
+					width: 100%;
+				}
+				.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;
+						}
+					}
+				}
+				.select-item{
+					margin-top: 5px;
+					display: flex;
+					flex-wrap: wrap;
+					padding: 3px 8px;
+					border: 1px solid #e5e9ed;
+					border-radius: 5px;
+					margin-right: 10px;
+					cursor: pointer;
+					display: inline-block;
+				}
+				
+				.activeClass{
+					color: #64BD7B;
+					border-color: #64BD7B;
+				}
+	      
+	    }
+			.bottom-btn{
+				margin-top: 10px;
+				.btn-right{
+					margin-right: 10px;
+				}
+			}
+	  }
+		.no-width{
+			width: 30% !important;
+		}
+	}
+
+.pathology-box {
+  position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 99;
+	.pathology-content{
+		width: 80%;
+		background: #fff;
+		border-radius: 5px;
+		padding: 10px 20px;
+		color: #000;
+		.title {
+		  width: 100%;
+		  text-align: center;
+		  font-size: 18px;
+		  position: relative;
+		
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		.content{
+			width: 100%;
+			background: #f9fafb;
+			border: 1px solid #e5e9ed;
+			border-radius: 5px;
+			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;
+						}
+						.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{
+								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;
+}

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

@@ -0,0 +1,925 @@
+import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { Router } from "@angular/router";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { startOfDay, format, endOfDay } from "date-fns";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from "ng-zorro-antd";
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+@Component({
+  selector: "app-specimen-room-view",
+  templateUrl: "./specimen-room-view.component.html",
+  styleUrls: ["./specimen-room-view.component.less"],
+})
+export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef5: OverlayScrollbarsComponent;
+  constructor(
+	private mainService: MainService, 
+	public router: Router, 
+	public tool: ToolService,
+	private fb: FormBuilder,
+	private message: NzMessageService,
+	) {}
+  // 今日药单量
+  todayTotal: undefined;
+  // 今日已完成
+  todayComplete: undefined;
+  //手术间数据
+  printPharmacyList = []; //数据列表
+  printPharmacyIdx = 0; //页码
+  printPharmacyTotal = 0; //总数
+  printPharmacyFlag = false; //是否查看更多
+  printPharmacySearchKey = ""; //搜索的内容
+  printPharmacyLoad = false; //按钮的loading
+  // 标本间列表
+  waitPharmacyList = [];
+  waitPharmacyIdx = 0;
+  waitPharmacyTotal = 0;
+  waitPharmacyFlag = false;
+  waitPharmacySearchKey = "";
+  waitPharmacyLoad = false;
+  // 今日离科列表
+  pharmacyList = [];
+  pharmacyIdx = 0;
+  pharmacyTotal = 0;
+  pharmacyFlag = false;
+  pharmacySearchKey = "";
+  pharmacyLoad = false;
+  // 配送中列表
+  distributionList = [];
+  distributionIdx = 0;
+  distributionTotal = 0;
+  distributionFlag = false;
+  distributionSearchKey = "";
+  distributionLoad = false;
+  // 已完成列表
+  completedList = [];
+  completedIdx = 0;
+  completedTotal = 0;
+  completedFlag = false;
+  completedSearchKey = "";
+  completedLoad = false;
+	
+	barCode:any; //条码搜索
+  // other
+  loginUser: any = localStorage.getItem("user")
+    ? JSON.parse(localStorage.getItem("user")).user
+    : null; //登录人信息
+
+  logTimer = null; //定时器
+  logTime = 0; //自动刷新秒数
+  logTimeConst = 60; //自动刷新秒数
+
+  time = new Date().getTime(); // 时间戳
+  timer = null; // 时间定时器
+	relevanceModal:boolean = false //关联标本和手术室
+	validateForm: FormGroup; //关联标本和手术室表单
+	validateVerificationForm: FormGroup; //核验标本
+	specimenData:any = []; //标本间数据
+	operationData:any = []; //手术间数据
+	fixationModal:boolean = false //标本接收固定
+	verificationMoadl:boolean = false //标本核验
+	specimenCode:any; //标本条码
+	listOfData:any=[]; 
+	fixativeData:any = []; //固体液类型
+	hosId:any;
+	userId:any;
+	detailsData:any;
+	isSpinning:boolean = false; //全屏加载状态
+	codeData:any; //标本条码数据
+	btnInfoLoading :boolean = false; //标本加固加载
+	searchMsg:any = null;
+	changeInpSubject = new Subject(); //防抖
+	changeInpSubjectSpecimen = new Subject(); //防抖
+  ngOnDestroy() {
+    clearTimeout(this.timer);
+    clearTimeout(this.logTimer);
+  }
+
+  ngOnInit() {
+		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchSpecimenData(v[0])
+		});
+		this.changeInpSubjectSpecimen.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchSpecimen(v[0])
+		});
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.userId = this.tool.getCurrentUserId()
+    this.runTime();
+    // 统计
+    // this.total();
+		this.getDept()
+    // 切换科室
+    // this.changeKs();
+
+    this.initRole();
+    // 自动刷新倒计时 start
+    this.autoUpdate();
+    // 自动刷新倒计时 end
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+  }
+  // 当前时间日期
+  runTime() {
+    clearTimeout(this.timer);
+    this.timer = setTimeout(() => {
+      this.time = Date.now();
+      this.runTime();
+    }, 500);
+  }
+	
+	// 标本条码搜索
+	searchSpecimen(e){
+		if(!this.barCode){
+			return
+		}
+		if(this.barCode.length < 10) {
+			return
+		}
+		let data={
+			barcode:e
+		}
+		this.isSpinning = true
+		clearInterval(this.logTimer);
+		this.mainService.pathologyScanCode(data)
+		.subscribe((res:any) => {
+			this.isSpinning = false
+			if(res.status==200){
+				this.codeData = res.data[0]
+				if(this.codeData.pathologyInspectDTOS){
+					this.project = this.codeData.pathologyInspectDTOS.map(i=>{
+						return i.inspectProject.name
+					})
+					this.project = this.project.join('、')
+				}
+				this.fixationError = null
+				this.fixationModal = true
+				setTimeout(_=>{
+					document.getElementById('specimen').focus();
+				},200)
+				this.searchMsg = null
+			}else{
+				this.barCode = null
+				this.searchMsg = res.msg
+				// this.message.error(res.msg)
+			}
+		})
+	}
+	
+	// 选择固定时间
+	formChangeDate(result){
+	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 确定接受固定标本
+	startDate:any;
+	submitFixationForm(){
+		this.validateVerificationForm = this.fb.group({
+		  fixationTime: [null, [Validators.required]],
+			jobNumber: [null, [Validators.required]],
+			name:[null, [Validators.required]],
+			fixative:[null, [Validators.required]],
+		});
+		let date = new Date();
+		this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
+		this.validateVerificationForm.controls.fixationTime.setValue(this.startDate);
+		this.btnLoading = true
+		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
+			this.fixativeData = res
+			this.btnLoading = false
+			this.verificationMoadl = true
+		});
+	}
+	
+	// 关闭接受固定标本
+	hideSpecimenModal(){
+		this.autoUpdate()
+		this.barCode = null;
+		this.specimenCode = null;
+		this.fixationError = null
+		this.fixationModal = false;
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+	}
+	
+	// 获取标本详情
+	project:any = [];
+	getSampleData(item){
+		this.mainService.getFetchData("data", "pathologyForm", item.id)
+		.subscribe((data) => {
+			this.isSpinning = false
+			this.detailsData = data.data
+		  this.specimenList = data.data.pathologySpecimenDTOList||[]
+			this.pathologyLogs = data.data.formLogDTOS
+			this.stepLength = this.pathologyLogs.length
+			if(this.detailsData.pathologyInspectDTOS){
+				this.project = this.detailsData.pathologyInspectDTOS.map(i=>{
+					return i.inspectProject.name
+				})
+				this.project = this.project.join('、')
+			}
+		  this.detailMoadl = true
+		});
+	}
+	
+	// 获取科室
+	getDept(){
+		this.setSpecimen()
+		var that = this;
+		that.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			let item1 = res2.find(i=>i.name=='手术室科室')
+			let item2 = res2.find(i=>i.name=='标本间科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: that.hosId || "" },
+			    type: { id: item1.id || "" },
+			  },
+			};
+			let data2 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: that.hosId || "" },
+			    type: { id: item2.id || "" },
+			  },
+			};
+			that.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+			    that.operationData = res.list;
+			  });
+				
+			that.mainService
+			  .getFetchDataList("data", "department", data2)
+			  .subscribe((res) => {
+					that.specimenData = res.list
+					this.getDeptDetail()
+			  });
+		});
+	}
+	
+	// 获取关联科室详情
+	getDeptDetail(){
+		this.mainService
+		  .transfusionPrint("user", this.userId)
+		  .subscribe((res) => {
+				let data = res.data;
+				if(data.surgeryDepts){
+					let deptArr = []
+					for(let i of data.surgeryDepts){
+						deptArr.push(i.id)
+					}
+					this.validateForm.controls.operation.setValue(deptArr);
+				}
+				this.validateForm.controls.specimen.setValue(data.dept.id);
+				if(data.autoCreateOrder){
+					this.validateForm.controls.generate.setValue(data.autoCreateOrder);
+				}
+		  });
+	}
+	
+	// 获取是否关联标本间
+	setSpecimen(){
+		this.validateForm = this.fb.group({
+		  specimen: [null, [Validators.required]],
+			operation: [null, [Validators.required]],
+			generate:[1, [Validators.required]],
+		});
+		this.relevanceModal = true
+	}
+	
+	// 确定关联科室
+	btnLoading:boolean = false;
+	submitForm(){
+		for (const i in this.validateForm.controls) {
+		  this.validateForm.controls[i].markAsDirty();
+		  this.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateForm.invalid) return;
+		let deptArr = this.validateForm.value.operation.join(',')
+		let data = {
+		  user: {
+		    autoCreateOrder: this.validateForm.value.generate,
+				dept:{
+					id:this.validateForm.value.specimen
+				},
+				surgeryDeptIds:deptArr,
+				id:this.userId
+		  },
+		};
+		this.btnLoading = true
+		this.mainService
+		  .coopData("updData", "user", data)
+		  .subscribe((data) => {
+				this.getNewDept()
+				// 手术间列表
+				this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
+				// 标本间列表
+				this.getPharmacyList(this.waitPharmacyIdx, 'specimenDept', this.waitPharmacySearchKey);
+				// 今日离科标本列表
+				this.getPharmacyList(this.pharmacyIdx, 'leavedDept', this.pharmacySearchKey);
+				this.btnLoading = false
+				this.relevanceModal = false
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	getNewDept(){
+		let postData = {
+		  currentHosId: this.hosId,
+		  loginType: "PC",
+		};
+		this.mainService.changeHospital(postData).subscribe((result) => {
+		  if (result.status == 200) {
+		    let dataObj = {
+		      user: {
+		        dept: {
+		          id: this.validateForm.value.specimen,
+		        },
+		        id: JSON.parse(localStorage.getItem("user")).user.id,
+		      },
+		    };
+		    this.mainService
+		      .coopData("updData", "user", dataObj)
+		      .subscribe((data) => {
+		        if (data.status == 200) {
+		          this.getCurrentUserNow();
+		        }
+		      });
+		  }
+		});
+	}
+	
+	// 获取当前用户信息
+	getCurrentUserNow() {
+	  this.mainService.getCurrentUser1().subscribe((data:any) => {
+	    if (data["status"] == 200) {
+				this.loginUser = data.data 
+	      let user = JSON.parse(localStorage.getItem("user"));
+	      user.user.dept = data["data"].dept;
+	      user.user.currentHospital = data["data"].currentHospital;
+	      localStorage.setItem("user", JSON.stringify(user));
+	    }
+	  });
+	}
+	
+	// 输入工号查询姓名
+	handoverUserId:any = null;
+	numberChange(e){
+		if(e.length < 3) {
+			this.validateVerificationForm.controls.name.setValue('');
+			return
+		}
+		let query = {
+		  account: e
+		};
+		this.mainService
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.validateVerificationForm.controls.name.setValue(data.userName);
+					this.handoverUserId = data.userId
+				}else{
+					this.validateVerificationForm.controls.name.setValue('');
+					this.handoverUserId =null
+					// this.message.error(data.data)
+				}
+		  });
+	}
+	
+	// 提交固定标本接收
+	submitVerificationForm(){
+		for (const i in this.validateVerificationForm.controls) {
+		  this.validateVerificationForm.controls[i].markAsDirty();
+		  this.validateVerificationForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateVerificationForm.invalid) return;
+		
+		let data: any = {
+			id:this.codeData.id,
+			specimenDeptId:this.validateForm.value.specimen,
+			specimenFixingLiquid:{
+				id:this.validateVerificationForm.value.fixative
+			},
+			fixationTime:this.startDate,
+			hosId: this.hosId || "" ,
+			handoverUserId:this.handoverUserId
+		};
+		this.btnInfoLoading = true;
+		this.mainService
+		.simplePost("addData", "pathologyForm", data)
+		.subscribe((res) => {
+			this.autoUpdate(false)
+			this.btnInfoLoading = false;
+			this.barCode = null;
+			// 手术间列表
+			this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
+			// 标本间列表
+			this.getPharmacyList(this.waitPharmacyIdx, 'specimenDept', this.waitPharmacySearchKey);
+			// 今日离科标本列表
+			this.getPharmacyList(this.pharmacyIdx, 'leavedDept', this.pharmacySearchKey);
+			if (res.status == 200) {
+				this.showPromptModal("操作", true, "");
+			} else {
+				this.showPromptModal("操作", false, res.msg);
+			}
+		});
+	}
+	
+	closeModel(){
+		this.verificationMoadl = false
+		this.fixationModal = false
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+	}
+	
+	// 关闭固定接受标本
+	hideVerificationModal(){
+		this.verificationMoadl = false
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+	}
+	
+
+	// 监听标本条码
+	specimenCodeChange(e){
+		this.changeInpSubjectSpecimen.next([e]);
+	}
+	
+	// 监听接受固定标本条码
+	tableLoading:boolean = false;
+	codeChange(e){
+		this.changeInpSubject.next([e]);
+	}
+	
+	fixationError:any;
+	searchSpecimenData(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		this.tableLoading = true
+		this.mainService.pathologyScanCode({
+			barcode:e,
+			pathologyFormId:this.codeData.id
+		})
+		.subscribe((res:any) => {
+			this.autoUpdate(false)
+			this.tableLoading = false
+			this.specimenCode = null
+			if(res.status==200){
+				this.codeData = res.data[0]
+				this.fixationError = null 
+			}else{
+				this.fixationError = res.msg 
+			}
+		})
+	}
+	
+	// 查看详情
+	detailMoadl:boolean = false;
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	viewDetail(item,type){
+		this.isSpinning = true
+		this.getSampleData(item)
+		clearInterval(this.logTimer);
+		if(type==1){
+			
+		}else if(type==2){
+			
+		}else{
+			
+		}
+	}
+	
+	closeDetailMoadl(){
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+		this.detailMoadl = false
+		this.autoUpdate(false);
+	}
+	
+  // 统计
+  // total() {
+  //   let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
+  //   let startTime = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+  //   let endTime = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+  //   let postData = {
+  //     startTime,
+  //     endTime,
+  //     launch,
+  //   };
+
+  //   this.mainService.getDrugsBagStateCount(postData).subscribe((res: any) => {
+  //     if (res.status == 200) {
+  //       this.todayTotal = res.countMap.todayTotal;
+  //       this.todayComplete = res.countMap.todayComplete;
+  //     }
+  //   });
+  // }
+  // // 查看工单详情
+  // goToOrderDetail(item){
+  //   console.log(item);
+  //   this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
+  // }
+	
+  // // 查看流程信息弹窗
+  // logPromptModalShow = false; //弹窗开关
+  // scode = ""; //查看记录携带
+  // showLogs(data) {
+  //   clearInterval(this.logTimer);
+  //   this.scode = data.scode;
+  //   this.logPromptModalShow = true;
+  // }
+  // // 关闭流程信息弹窗
+  // closeModelLog(e) {
+  //   this.logPromptModalShow = JSON.parse(e).show;
+  //   this.autoUpdate(false);
+  // }
+  // // 查看标本列表弹窗
+  // spePromptModalShow = false; //弹窗开关
+  // checkDeptId = ""; //检查科室id
+  // printDate = ""; //采集日期
+  // showSpeList(data) {
+  //   clearInterval(this.logTimer);
+  //   this.checkDeptId = data.check_dept_id;
+  //   this.printDate = data.startTime;
+  //   this.spePromptModalShow = true;
+  // }
+  // 关闭标本列表弹窗
+  // closeModelSpe(e) {
+  //   this.spePromptModalShow = JSON.parse(e).show;
+  //   this.autoUpdate(false);
+  // }
+  //  // 查看工单列表弹窗
+  //  orderPromptModalShow = false; //弹窗开关
+  //  workId = ""; //配送人员ID
+  //  showOrderList(data) {
+  //    clearInterval(this.logTimer);
+  //    this.workId = data.workerid;
+  //    this.orderPromptModalShow = true;
+  //  }
+  //  // 关闭工单列表弹窗
+  //  closeModelOrder(e) {
+  //    this.orderPromptModalShow = JSON.parse(e).show;
+  //    this.autoUpdate(false);
+  //  }
+  // 自动刷新倒计时
+  autoUpdate(flag = true) {
+    if (flag) {
+      this.logTime = this.logTimeConst;
+    }
+    clearInterval(this.logTimer);
+    this.logTimer = setInterval(() => {
+      this.logTime--;
+      if (this.logTime === 0) {
+        this.logTime = this.logTimeConst;
+        // 代收急查标本（标本信息）列表
+        this.getPharmacyList(0, 'surgeryDept', this.printPharmacySearchKey);
+        // 已收取（工单信息）列表
+        this.getPharmacyList(0, 'specimenDept', this.waitPharmacySearchKey);
+        // 中转标本（标本统计信息）列表
+        this.getPharmacyList(0, 'leavedDept', this.pharmacySearchKey);
+
+      }
+    }, 1000);
+  }
+  // 药房端药房列表查询、搜索
+  // 1为pc待打印状态、2为pc配药中、3为pc核对中、4为pc配送中
+  // searchKey  为搜索的关键字，没有就不传
+  loading1 = false;
+  loading2 = false;
+  loading3 = false;
+  loading4 = false;
+  loading5 = false;
+  getPharmacyList(idx, type, searchKey) {
+    let hosId = JSON.parse(localStorage.getItem("user")).user.currentHospital.id;
+    switch (type) {
+      case 'surgeryDept':
+        this.loading1 = true;
+        break;
+      case 'specimenDept':
+        this.loading2 = true;
+        break;
+      case 'leavedDept':
+        this.loading3 = true;
+        break;
+    }
+    let postData = {
+			idx: 0,
+			sum: 50,
+			pathologyForm:{
+				detailsType: type,
+				keyWords:searchKey,
+				hosId,
+			}
+    };
+    this.mainService
+      .getFetchDataList("data", "pathologyForm", postData)
+      .subscribe((result) => {
+        switch (type) {
+          case 'surgeryDept':
+            this.loading1 = false;
+            break;
+          case 'specimenDept':
+            this.loading2 = false;
+            break;
+          case 'leavedDept':
+            this.loading3 = false;
+            break;
+        }
+        if (result["status"] == 200) {
+          switch (type) {
+            case 'surgeryDept':
+              // 总数
+              this.printPharmacyTotal = result.totalNum;
+              // 隐藏按钮的loading
+              this.printPharmacyLoad = false;
+              // 查看更多，是否显示
+              if (result["list"].length < 10) {
+                this.printPharmacyFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.printPharmacyFlag = false;
+              } else {
+                this.printPharmacyFlag = true;
+              }
+              // 列表数据合并
+              if (idx === 0) {
+                this.printPharmacyList = result["list"];
+              } else {
+                this.printPharmacyList = [
+                  ...this.printPharmacyList,
+                  ...result["list"],
+                ];
+              }
+              break;
+            case 'specimenDept':
+              this.waitPharmacyTotal = result.totalNum;
+              this.waitPharmacyLoad = false;
+              if (result["list"].length < 10) {
+                this.waitPharmacyFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.waitPharmacyFlag = false;
+              } else {
+                this.waitPharmacyFlag = true;
+              }
+              if (idx === 0) {
+                this.waitPharmacyList = result["list"];
+              } else {
+                this.waitPharmacyList = [
+                  ...this.waitPharmacyList,
+                  ...result["list"],
+                ];
+              }
+              break;
+            case 'leavedDept':
+              this.pharmacyTotal = result.totalNum;
+              this.pharmacyLoad = false;
+              if (result["list"].length < 10) {
+                this.pharmacyFlag = false;
+              } else if (result["list"].length === 0 && idx === 0) {
+                this.pharmacyFlag = false;
+              } else {
+                this.pharmacyFlag = true;
+              }
+              if (idx === 0) {
+                this.pharmacyList = result["list"];
+              } else {
+                this.pharmacyList = [...this.pharmacyList, ...result["list"]];
+              }
+              break;
+          }
+        }
+      });
+  }
+  // 加载更多
+  // loadMore(type) {
+  //   switch (type) {
+  //     case 'surgeryDept':
+  //       this.printPharmacyIdx++;
+  //       this.printPharmacyLoad = true;
+  //       this.getPharmacyList(
+  //         this.printPharmacyIdx,
+  //         type,
+  //         this.printPharmacySearchKey
+  //       );
+  //       break;
+  //     case 'specimenDept':
+  //       this.waitPharmacyIdx++;
+  //       this.waitPharmacyLoad = true;
+  //       this.getPharmacyList(
+  //         this.waitPharmacyIdx,
+  //         type,
+  //         this.waitPharmacySearchKey
+  //       );
+  //       break;
+  //     case 'leavedDept':
+  //       this.pharmacyIdx++;
+  //       this.pharmacyLoad = true;
+  //       this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
+  //       break;
+  //   }
+  // }
+  // 搜索关键词
+  searchKeyHandle(type) {
+    switch (type) {
+      case 'surgeryDept':
+        this.printPharmacyIdx = 0; //页码重置
+        this.printPharmacyList = []; //列表重置
+        this.getPharmacyList(
+          this.printPharmacyIdx,
+          type,
+          this.printPharmacySearchKey
+        );
+        break;
+      case 'specimenDept':
+        this.waitPharmacyIdx = 0; //页码重置
+        this.waitPharmacyList = []; //列表重置
+        this.getPharmacyList(
+          this.waitPharmacyIdx,
+          type,
+          this.waitPharmacySearchKey
+        );
+        break;
+      case 'leavedDept':
+        this.pharmacyIdx = 0; //页码重置
+        this.pharmacyList = []; //列表重置
+        this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
+        break;
+    }
+  }
+  // 退出
+  logOut(): void {
+    // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
+    localStorage.removeItem("user");
+    localStorage.removeItem("menu");
+    localStorage.removeItem("phones");
+    localStorage.removeItem("index");
+    // 假退出
+    this.mainService.logOut().subscribe((data) => {
+      if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
+        localStorage.removeItem("user");
+        localStorage.removeItem("menu");
+        localStorage.removeItem("phones");
+        localStorage.removeItem("index");
+      }
+    });
+
+  }
+
+  // 右侧菜单
+  showLastItems: boolean = false;
+  // 下拉
+  fixedMenuXiala() {
+    this.showLastItems = true;
+  }
+
+  // 上拉
+  fixedMenuShangla() {
+    this.showLastItems = false;
+  }
+
+  mainRole: boolean = false; //回到系统管理权限
+  initRole() {
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    console.log("菜单数量" + menus.length);
+    if (menus.length >= 2) {
+      this.mainRole = true;
+      return;
+    }
+  }
+
+  // 切换右侧菜单Tab
+  fixedTab: string = "";
+  checkFixedTab(type: string) {
+    if (type == "toSystem") {
+      this.router.navigateByUrl("main");
+    }
+    if (this.fixedTab == type) {
+      this.fixedTab = "";
+    } else {
+      this.fixedTab = type;
+    }
+  }
+  //药房端科室切换
+  changeShow = true;
+  closeTime = 3;
+  closeTimeFlag = 0;
+  hsPromptModalShow: boolean = false; //科室切换提示框是否展示
+  timerCloseTime = null;
+  deptDisplay = 1; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  //子传父接收
+  closeModelHs(e) {
+    this.hsPromptModalShow = JSON.parse(e).show;
+    this.changeShow = JSON.parse(e).changeShow;
+  }
+  //子传父接收
+  clearModelHs(e) {
+    if (JSON.parse(e).clear === true) {
+      clearInterval(this.timerCloseTime);
+    }
+    this.changeShow = JSON.parse(e).changeShow;
+  }
+  // 头部切换科室
+  changeKsNow() {
+    this.hsPromptModalShow = true;
+    clearInterval(this.timerCloseTime);
+    this.changeShow = false;
+  }
+  // 切换科室
+  changeKs() {
+    this.hsPromptModalShow = true;
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    if (this.closeTimeFlag === 0) {
+      return;
+    }
+    this.closeTime = Math.abs(this.closeTimeFlag);
+    clearInterval(this.timerCloseTime);
+    this.timerCloseTime = setInterval(() => {
+      this.closeTime = Math.max(--this.closeTime, 0);
+      if (this.closeTime === 0) {
+        if (this.closeTimeFlag <= 0) {
+          this.hsPromptModalShow = false;
+        }
+        clearInterval(this.timerCloseTime);
+      }
+    }, 1000);
+  }
+	
+	promptModalShow:boolean = false;
+	promptContent:any = null;
+	ifSuccess:any = null;
+	promptInfo:any = null;
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
+}
+

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { SpecimenRoomViewRoutingModule } from './specimen-room-view-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SpecimenRoomViewComponent } from './specimen-room-view.component';
+
+
+@NgModule({
+  declarations: [SpecimenRoomViewComponent],
+  imports: [
+    CommonModule,
+    SpecimenRoomViewRoutingModule,
+    ShareModule
+  ]
+})
+export class SpecimenRoomViewModule { }