大输液开发

src/app/app-routing.module.ts

@@ -79,12 +79,17 @@ const routes: Routes = [
 	  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/services/main.service.ts

@@ -879,4 +879,60 @@ export class MainService {
 	    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,10 @@ export class ToolService {
 	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;
@@ -195,6 +199,12 @@ export class ToolService {
         case "commonFault":
           coopBtns.commonFault = true; //常见故障
           break;
+				case "dispensingInfo":
+				  coopBtns.dispensingInfo = true; //发药信息
+				  break;
+				case "dispensingGross":
+				  coopBtns.dispensingGross = true; //发药总量
+				  break;	
       }
     });
     console.log(coopBtns);

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

@@ -5,14 +5,9 @@
 		<div class="content" *ngIf="!isSpinning">
 			<form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
 				<div class="content-item boder-right">
-					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="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 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>
@@ -34,29 +29,42 @@
 					</nz-form-item>
 					
 					<nz-form-item>
-						<div class="form-title width-100 font-weight-500">病理摘要：</div>
+						<div class="form-title width-100 font-weight-500">病历摘要：</div>
 						<div>{{detailsData.medicalRecords||'无'}}</div>
 					</nz-form-item>
 					
-					<nz-form-item class="form-item">
+					<nz-form-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 formControlName="surgicalPlan" placeholder="请输入手术方案"></textarea>
+							<textarea rows="3" nz-input disabled formControlName="surgicalPlan" placeholder="请输入手术方案"></textarea>
 						</nz-form-control>
-					</nz-form-item>
+					</nz-form-item> -->
 				</div>
 				
 				<div class="content-item">
-					<nz-form-item class="form-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]="5" [nzXs]="24">检验项目</nz-form-label>
-						<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="19" [nzXs]="24">
+						<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">
@@ -67,41 +75,39 @@
 						</nz-form-control>
 					</nz-form-item>
 					
-					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="specimenGenre" [nzSm]="5" [nzXs]="24">标本类型</nz-form-label>
-						<nz-form-control nzErrorTip="请选择标本类型!" [nzSm]="19" [nzXs]="24">
-							<nz-input-group>
-								<nz-select nzSearch nzShowSearch nzPlaceHolder="请选择标本类型" formControlName="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>
+					<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="specimenNum" [nzSm]="5" [nzXs]="24">标本件数</nz-form-label>
-						<nz-form-control nzErrorTip="请输入标本件数!" [nzSm]="19" [nzXs]="24">
-							<input nz-input formControlName="specimenNum" disabled placeholder="请输入标本件数" nzSize="default" />
-						</nz-form-control>
-					</nz-form-item>
 					
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="takePart" [nzSm]="5" [nzXs]="24">采取部位</nz-form-label>
-						<nz-form-control nzErrorTip="请输入采取部位!" [nzSm]="19" [nzXs]="24">
-							<input nz-input formControlName="takePart"  placeholder="请输入采取部位" nzSize="default" />
+						<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-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-item">
 						<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">标本</nz-form-label>
 						<div class="add-icon-class" (click)='openSpecimen()'>
@@ -112,10 +118,7 @@
 					<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:''}} <span *ngIf="item.system">-</span>
-							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-							{{item.organ?item.organ.name:''}} <span>-</span>
-							{{item.sample?item.sample.name:item.specimenName}}
+							{{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>
@@ -171,7 +174,7 @@
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
-					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">标本名称</nz-form-label>
+					<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)">
@@ -180,11 +183,15 @@
 					</div>
 				</nz-form-item>
 				
-				<nz-form-item class="form-item" *ngIf="specimenNameName=='qita'">
-					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">其他标本名称</nz-form-label>
-					<nz-form-control nzErrorTip="请输入其他标本名称" [nzSm]="21" [nzXs]="24">
-						<input nz-input formControlName="specimenName" placeholder="请输入其他标本名称"/>
+				<nz-form-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">
@@ -196,7 +203,8 @@
 			</form>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen()" [nzLoading]="btnSpLoading">确定</button>
+			<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>
@@ -209,9 +217,13 @@
 <app-prompt-modal *ngIf="specimenModalShow" [content]="promptContent" [success]="ifSuccess" [show]="specimenModalShow"
   [info]="promptInfo" (closeModel)="closeSpecimenModel()"></app-prompt-modal>
 
- <!-- 删除模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-  (confirmDelEvent)="confirmDel()" content="您确认要删除标本吗？"></app-dialog-delete>
+ <!-- 新增下一个标本 -->
+<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">
@@ -257,55 +269,96 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;border-top: 1px solid #aaa;">
-					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
-					<div style="width:70%;padding:1px;">{{printData.patientName}}({{printData.patientAge}}岁)</div>
+				 <div 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:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
-					<div style="width:70%;padding:1px;">{{printData.patientBedNum}}床/{{printData.residenceNo}}</div>
+					<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
-					<div style="width:70%;padding:1px;">{{printData.patientDept}}</div>
+					<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">部位</div>
-					<div style="width:70%;padding:1px;">{{printData.takePart}}</div>
+					<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
-					<div style="width:70%;padding:1px;">{{printData.specimenNum}}</div>
+					<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: 10px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></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: 30px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
-					<div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-						<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="data.barCode" alt="">
-						<div class="monad-sign" style="border-bottom: 1px solid #AAAAAA;padding-left:1px;">
-							<div>{{data.system}}-{{data.organ}}</div>
-							<div>({{index+1}}/{{printData.specimenList.length}}) {{data.partSource}}-{{data.specimenName}}</div>
-						</div>
-						<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
-							<div style="width:70%;padding:1px;">{{data.patientName}}({{data.patientAge}}岁)</div>
-						</div>
-						<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
-							<div style="width:70%;padding:1px;">{{data.patientBedNum}}床/{{data.residenceNo}}</div>
+				 <div 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 style="display: flex;border-bottom: 1px solid #AAAAAA;">
-							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
-							<div style="width:70%;padding:1px;">{{data.patientDept}}</div>
-						</div>
-						<div style="display: flex;">
-							<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">离体时间</div>
-							<div style="width:70%;padding:1px;">{{data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
-						</div>
-					</div>
+					 </div>
+					 <div 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>

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

@@ -78,6 +78,32 @@
 					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{
@@ -199,6 +225,7 @@
 				  margin-bottom: 14px;
 					display: flex;
 					flex-wrap: wrap;
+					position: relative;
 				  .ant-form-item-label {
 				    text-align: left;
 						font-weight: 500;
@@ -208,6 +235,18 @@
 							width: 400px;
 						}
 					}
+					.empty-box{
+						position: absolute;
+						right: 6px;
+						top: 8px;
+						.name{
+							color: #ccc;
+						}
+						.empty{
+							color: #64BD7B;
+							cursor: pointer;
+						}
+					}
 				}
 				.specimen-list{
 					flex: 1;

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

@@ -71,11 +71,11 @@ export class PathologyAddComponent implements OnInit {
 	// 初始化新增form表单
 	initForm() {
 		this.validateForm = this.fb.group({
-		  intraoperativeRapidity: [1, [Validators.required]],
+		  intraoperativeRapidity: [null, [Validators.required]],
 			specimenGenre: [null, [Validators.required]],
-			intraoperativeFindings: [null, [Validators.required]],
+			// intraoperativeFindings: [null, [Validators.required]],
 			project: [null, [Validators.required]],
-			surgicalPlan: [null, [Validators.required]],
+			// surgicalPlan: [null, [Validators.required]],
 			specimenNum: [null,[Validators.required]],
 			takePart: [null, [Validators.required]]
 		});
@@ -97,12 +97,12 @@ export class PathologyAddComponent implements OnInit {
 		  .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);
-				}
+				// 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()
@@ -213,29 +213,31 @@ export class PathologyAddComponent implements OnInit {
 		  .getFetchDataList("simple/data", "dictionaryTree", postData)
 		  .subscribe((data) => {
 		    this.specimenNameList = data.list;
-				this.specimenNameList.push({
-					name:'其他',
-					id:'qita'
-				})
+				// this.specimenNameList.push({
+				// 	name:'其他',
+				// 	id:'qita'
+				// })
 				if(type=='edit'){
 					if(item.sample){
 						this.validateSpecimenForm = this.fb.group({
-						  remark: [null, []]
+						  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);
+						// 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);
@@ -294,7 +296,8 @@ export class PathologyAddComponent implements OnInit {
 	// 选择标本
 	openSpecimen(){
 		this.validateSpecimenForm = this.fb.group({
-		  remark: [null, []]
+		  remark: [null, []],
+			specimenName:[null, [Validators.required]],
 		});
 		this.specimenDetailId = null;
 		this.placeIndex = null;
@@ -362,25 +365,45 @@ export class PathologyAddComponent implements OnInit {
 	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, []],
-			});
+		// 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;
-	submitSpecimen(){
+	addSpLoading:boolean = false;
+	addMadal:boolean = false;
+	submitSpecimen(type){
 		if(this.placeIndex==null){
 			this.message.error('请选择位置来源')
 			return
@@ -402,6 +425,14 @@ export class PathologyAddComponent implements OnInit {
 		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateSpecimenForm.invalid) return;
+		if(this.validateSpecimenForm.value.specimenName.length>15){
+			this.message.error('字符长度不能超过15个')
+			return
+		}
+		if(type==2){
+			this.addMadal = true
+			return
+		}
 		let data = {
 			pathologyFormId:this.detailsData.id,
 			partSource:{
@@ -417,16 +448,16 @@ export class PathologyAddComponent implements OnInit {
 				id:this.specimenNameId
 			},
 			hosId:this.hosId,
-			specimenName:null,
+			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
-		}
+		// 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'
@@ -441,13 +472,104 @@ export class PathologyAddComponent implements OnInit {
 		  .subscribe((res) => {
 		    this.btnSpLoading = false;
 		    if (res.status == 200) {
-		      this.showSpecimenModal("操作", true, "");
+					this.message.success('操作成功')
+					setTimeout(_=>{
+						this.closeSpecimenModel()
+					},200)
+		      // this.showSpecimenModal("操作", true, "");
 		    } else {
-		      this.showSpecimenModal("操作", false, res.msg);
+					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={
@@ -461,11 +583,21 @@ export class PathologyAddComponent implements OnInit {
 		  .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
 	}
 	
@@ -507,16 +639,25 @@ export class PathologyAddComponent implements OnInit {
 		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;
@@ -600,6 +741,7 @@ export class PathologyAddComponent implements OnInit {
 				}
 			}
 		};
+		data.pathologyForm.specimenNum = this.specimenList.length
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO
 		delete data.pathologyForm.surgeryDoctorDTO 
@@ -610,10 +752,16 @@ export class PathologyAddComponent implements OnInit {
 		  .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;

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

@@ -28,22 +28,22 @@
 					</div>
 					
 					<div class="form-list">
-						<div class="form-title font-weight-500">病理摘要：</div>
+						<div class="form-title font-weight-500">病历摘要：</div>
 						<div class="indent">{{detailsData.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-list">
 						<div class="form-title font-weight-500">术中所见：</div>
 						<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
-					</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 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">
@@ -56,10 +56,7 @@
 						<div class="form-title font-weight-500">标本：</div>
 						<div class="form-title-box">
 							<div class="form-title" *ngFor="let item of specimenList">
-								{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
-								{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-								{{item.organ?item.organ.name:''}} <span>-</span>
-								{{item.sample?item.sample.name:item.specimenName}}
+								{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
 							</div>
 						</div>
 					</div>
@@ -74,11 +71,11 @@
 								</nz-step>
 								<ng-template #tpl>
 									<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-										<div style="color: #49B856;">{{item.operationType.name}}</div>
+										<div style="color: #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}}</div>
+										<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>
@@ -89,7 +86,7 @@
 			<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>
+				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 || 
@@ -100,7 +97,9 @@
 				detailsData.status.value==5" nz-button nzType="primary" 
 				(click)="immobilization()">标本固定</button> -->
 				
-				<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</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">
@@ -113,53 +112,93 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;border-top: 1px solid #aaa;">
-					<div style="width:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
-					<div style="width:70%;padding:1px;">{{printData.patientName}}({{printData.patientAge}}岁)</div>
+				 <div 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:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
-					<div style="width:70%;padding:1px;">{{printData.patientBedNum}}床/{{printData.residenceNo}}</div>
+					<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
-					<div style="width:70%;padding:1px;">{{printData.patientDept}}</div>
+					<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">部位</div>
-					<div style="width:70%;padding:1px;">{{printData.takePart}}</div>
+					<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
-					<div style="width:70%;padding:1px;">{{printData.specimenNum}}</div>
+					<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: 10px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></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: 30px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-					 <img style="width: 100%;height: 90px;border-radius: 5px;" [src]="data.barCode" alt="">
-					 <div class="monad-sign" style="border-bottom: 1px solid #AAAAAA; padding-left:1px;">
-					 	<div>{{data.system}}-{{data.organ}}</div>
-					 	<div>({{index+1}}/{{printData.specimenList.length}}) {{data.partSource}}-{{data.specimenName}}</div>
+					 <div 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:30%;border-right: 1px solid #AAAAAA;padding:1px;">患者</div>
-					 	<div style="width:70%;padding:1px;">{{data.patientName}}({{data.patientAge}}岁)</div>
+					 	<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">住院信息</div>
-					 	<div style="width:70%;padding:1px;">{{data.patientBedNum}}床/{{data.residenceNo}}</div>
+					 	<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">科室</div>
-					 	<div style="width:70%;padding:1px;">{{data.patientDept}}</div>
+					 	<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:30%;border-right: 1px solid #AAAAAA;padding:1px;">离体时间</div>
-					 	<div style="width:70%;padding:1px;">{{data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+					 	<div 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>

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

@@ -106,10 +106,16 @@ export class PathologyDetailComponent implements OnInit {
 		  .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;

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

@@ -1663,7 +1663,7 @@
                             <!-- 【是否开启手术即将开始通知】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回病房】开启 -->
-														<button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.isPathologyForm == 1" class="btn1 mr8 mb8 mt8" (click)="pathologyAddItem($event,item)">病理申请单</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>

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

@@ -588,6 +588,16 @@ const routes: Routes = [
         path: "assetsConsumable",
         loadChildren: () => import("../assets-consumable/assets-consumable.module").then((m) => m.AssetsConsumableModule),
       },
+			// 陪检统计
+			{
+			  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/pathology/pathology.component.html

@@ -7,12 +7,12 @@
 		</h2>
     </div>
     <div class="pharmacy-name">
-			<div class="mar-ri-30">
+			<div class="mar-ri-30" *ngIf="toDayData">
 				今日接收：
-				申请单 <span class="weight">50</span> &nbsp;
-				标本 <span class="weight">50</span>&nbsp;
-				送出 <span class="weight">50</span>&nbsp;
-				速冻 <span class="weight">50</span>&nbsp;
+				申请单 <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">
@@ -38,12 +38,12 @@
 	<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">(13)</span></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" nzSize="small" (click)='connect()'>交接</button>
-			<button class="btn default" nzSize="small" (click)='packaging()'>打包</button>
+			<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 -->
@@ -102,15 +102,15 @@
 			      </thead>
 			      <tbody>
 			        <tr *ngFor="let data of listOneData">
-			          <td><span style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
-								<td>{{ data.patientDTO.patientName || '-' }}</td>
-			          <td>{{ data.residenceNo}}</td>
+			          <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.drugNum || '0'}}</td>
-								<td>{{ data.cartonNum || '0' }}</td>
-								<td>{{ data.totalPrice || '0' }}</td>
-								<td>{{ data.time|date:'yyyy-MM-dd HH:mm'  }}</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>
@@ -149,19 +149,19 @@
       	      </thead>
       	      <tbody>
       	        <tr *ngFor="let data of listTwoData">
-      	          <td><span style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
-      	          <td>{{ data.patientDTO.patientName || '-' }}</td>
-      	          <td>{{ data.residenceNo}}</td>
-      	          <td>{{ data.takePart}}</td>
-      	          <td>{{ data.specimenNum}}</td>
-      	          <td>{{ data.drugNum || '0'}}</td>
-      	          <td>{{ data.cartonNum || '0' }}</td>
-      	          <td>{{ data.totalPrice || '0' }}</td>
-      	          <td>
-      	            <div class="coop">
-      								<span (click)="oneLook($event,data)">查看</span>
-      	            </div>
-      	          </td>
+      	         <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>
@@ -195,25 +195,27 @@
 				      </thead>
 				      <tbody>
 				        <tr *ngFor="let data of listThreeData">
-				          <td>{{ data.batchNo || '-' }}</td>
+				          <td>{{ data.packCode || '-' }}</td>
 									<td>
-										<div>{{data.batchNo }}</div>
-										<div>{{data.batchNo }}</div>
+										<div>{{data.packUserDTO.name }}</div>
+										<div>{{data.packTime|date:'yyyy-MM-dd HH:mm' }}</div>
 									</td>
-				          <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</td>
-				          <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-' }}</td>
+				          <td>{{ data.pathologyFormNum }}</td>
+				          <td>{{ data.specimenNum }}</td>
 				          <td>
-				          	<div>{{data.batchNo }}</div>
-				          	<div>{{data.batchNo }}</div>
+				          	<div>{{data.deliveryUserDTO?data.deliveryUserDTO.name:'-' }}</div>
+				          	<div>{{data.deliveryTime|date:'yyyy-MM-dd HH:mm' || '-' }}</div>
 				          </td>
 				          <td>
-				          	<div>{{data.batchNo }}</div>
-				          	<div>{{data.batchNo }}</div>
+				          	<div>{{data.receiveUserDTO?data.receiveUserDTO.name:'-' }}</div>
+				          	<div>{{data.receiveTime|date:'yyyy-MM-dd HH:mm' || '-' }}</div>
 				          </td>
-									<td>{{ data.batchState?data.batchState.name : '-' }}</td>
+									<td>{{ data.status.name }}</td>
 				          <td>
 				            <div class="coop">
-											<span (click)="oneLook($event,data)">查看</span>
+											<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>
@@ -230,7 +232,7 @@
     </div>
   </div>
   <!-- 主体部分 end -->
-  <router-outlet></router-outlet>
+  <!-- <router-outlet></router-outlet> -->
 </div>
 
 <!-- 科室切换提示框 -->
@@ -241,7 +243,7 @@
   [show]="hsPromptModalShow"
   (closeModelHs)="closeModelHs($event)"
   (clearModelHs)="clearModelHs($event)"
-  deptType="nurse"
+  deptType="pathology"
 > 
   <!-- 返回系统按钮 -->
   <!-- 右侧悬浮框 -->
@@ -290,241 +292,12 @@
 </app-hs-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">
-				<!-- <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">
-						接收申请单数: <span class="weight">50</span>  &nbsp;
-						接收标本数: <span class="weight">50</span>  
-					</div>
-					<div>
-						<!-- <div class="width-120">标本条码：</div> -->
-						<input nz-input id="specimen" 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.surgeryDeptDTO.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:''}} <span *ngIf="item.system">-</span>
-												{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-												{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
-												{{item.sample?item.sample.name:''}}
-											</div>
-										</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" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">交接完成</button>
-			<!-- <button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button> -->
-		</div>
-	</div>
-</div>
-
-
 <!-- 查看详情 -->
-<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="listDetailMoadl">
-	<div class="pathology-content">
-		<div class="title">查看详情
-		<i class="icon_transport transport-guanbi" (click)="closeDetail()"></i></div>
-		<div class="content">
-			<div class="content-item">
-				<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.surgeryDeptDTO.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:''}} <span *ngIf="item.system">-</span>
-												{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-												{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
-												{{item.sample?item.sample.name:''}}
-											</div>
-										</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" nz-button nzType="primary" (click)="closeDetail()">知道了</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 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>
@@ -550,22 +323,18 @@
 				</div>
 				
 				<div class="form-list">
-					<div class="form-title font-weight-500">病理摘要：</div>
+					<div class="form-title font-weight-500">病历摘要：</div>
 					<div class="indent">{{detailsData.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 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">
@@ -578,10 +347,7 @@
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
 						<div *ngFor="let item of specimenList" class="specimen-item-class">
-							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
-							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
-							{{item.sample?item.sample.name:''}}
+							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
 						</div>
 					</div>
 				</div>
@@ -598,11 +364,11 @@
 							</nz-step>
 							<ng-template #tpl>
 								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-									<div style="color: #49B856;">{{item.operationType.name}}</div>
+									<div style="color: #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}}</div>
+									<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>
@@ -611,12 +377,155 @@
 			</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>
+			<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.component.less

@@ -193,6 +193,8 @@
 			align-items: center;
 			.btn{
 				margin-left: 10px;
+				background: #49b856;
+				color: #fff;
 			}
 		}
 	}
@@ -622,7 +624,7 @@
 				.ant-form-item {
 				  margin-bottom: 14px;
 					display: flex;
-					flex-wrap: wrap;
+					// flex-wrap: wrap;
 				  .ant-form-item-label {
 				    text-align: left;
 						font-weight: 500;
@@ -666,7 +668,7 @@
 	width: 100%;
 	height: 100%;
 	background: rgba(0, 0, 0, 0.4);
-	z-index: 99;
+	z-index: 9999;
 	.pathology-content{
 		width: 80%;
 		background: #fff;
@@ -689,14 +691,16 @@
 		    padding: 0 5px;
 		  }
 		}
+		.border{
+			border: 1px solid #e5e9ed;
+		}
 		.content{
 			width: 100%;
 			background: #f9fafb;
-			// border: 1px solid #e5e9ed;
 			border-radius: 5px;
 			margin-top: 12px;
 			height: 460px;
-			// display: flex;
+			display: flex;
 			// .addForm{
 				// display: flex;
 				.font-weight-500{
@@ -707,6 +711,7 @@
 					width: 100%;
 				}
 				.content-item{
+					flex: 1;
 					// height: auto;
 					// max-height: 460px;
 					// overflow-y: auto;
@@ -750,6 +755,9 @@
 							margin-left: 10px;
 						}
 					}
+					.df-center{
+						justify-content: center;
+					}
 					.form-list{
 						margin-bottom: 10px;
 						.specimen-list{
@@ -823,6 +831,9 @@
 				}
 			// }
 		}
+		.border{
+			border: 1px solid #e5e9ed;
+		}
 		.bottom-btn{
 			margin-top: 10px;
 			.btn-right{
@@ -833,6 +844,242 @@
 	
 }
 
+
+.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;
+				line-height: 30px;
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 420px;
+      height: auto;
+			.content-modal{
+				height: 150px;
+				background: #f9fafb;
+				border: 1px solid #e5e9ed;
+				border-radius: 5px;
+				margin-top: 12px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 0px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				.title-class{
+					border-bottom: 1px solid #e5e9ed;
+					line-height: 40px;
+					margin-bottom: 15px;
+				}
+				.ant-select{
+					width: 100%;
+				}
+				.ant-calendar-picker{
+					width: 100% !important;
+				}
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              // line-height: 14px;
+              text-align: left;
+							width: 132px;
+            }
+						.job-class{
+							text-align: left;
+							line-height: 40px !important;
+							width: 100%;
+						}
+						.ant-form-item-control-wrapper{
+							width: 100%;
+						}
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
 .mask-style{
 	width: 100%;
 	height: 100%;

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.ts

@@ -189,23 +189,23 @@ export class RoundRobinComponent implements OnInit {
   depting = "";
   searchDepartment(dept, type) {
     this.depting = dept;
-		let typeId = null
+		let postData={
+			department: {
+				dept,
+				hospital: { id: this.hosId },
+				cascadeHosId: this.hosId,
+				type: { id: null },
+			},
+			idx: 0,
+			sum: 5,
+		}
 		if(this.selectedTasktype.associationType.value == "specimen"){
-			typeId = 282 
+			postData.department.type.id = 282
+			delete postData.department.hospital
 		}else{
-			typeId = 383
+			postData.department.type.id = 383
+			delete postData.department.cascadeHosId
 		}
-    let postData = {
-      department: {
-        dept,
-        type: { id: typeId },
-        hospital: {
-          id: this.hosId,
-        },
-      },
-      idx: 0,
-      sum: 5,
-    };
     this.mainService
       .getFetchDataList("data", "department", postData)
       .subscribe((result) => {
@@ -313,6 +313,7 @@ export class RoundRobinComponent implements OnInit {
   addModal() {
     this.add = true; //新增
     this.modal = true;
+		this.selectedTasktype = null;
     this.initForm();
   }
   //关闭新增/编辑弹框
@@ -601,21 +602,24 @@ export class RoundRobinComponent implements OnInit {
       targetDept.forEach((item, index) => {
         targetDeptArr.push({ id: item, dept: targetDeptShow[index] });
       });
-			let typeId = null
+			let query={
+				department: {
+					hospital: { id: data.hospital },
+					cascadeHosId:data.hospital,
+					type: { id: null },
+				},
+				idx: 0,
+				sum: 20,
+			}
 			if(this.selectedTasktype.associationType.value == "specimen"){
-				typeId = 282
+				query.department.type.id = 282
+				delete query.department.hospital
 			}else{
-				typeId = 383
+				query.department.type.id = 383
+				delete query.department.cascadeHosId
 			}
       this.mainService
-        .getFetchDataList("data", "department", {
-          department: {
-            hospital: { id: data.hospital },
-            type: { id: typeId },
-          },
-          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.component.html

@@ -82,15 +82,15 @@
 									<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
 									{{item.applyCode || '无'}}
 								</span>
-                <span title="姓名" class="weight">{{item.patientDTO.patientName || '无'}}</span>
+                <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span title="部位">部位：{{item.takePart || '无'}}</span>
-                <span title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+                <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 title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+                <span class="text-right" title="离体时间">离体时间：{{item.inVitroTime?(item.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
               </div>
             </div>
           </div>
@@ -172,15 +172,15 @@
             			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
             			{{item.applyCode || '无'}}
             		</span>
-                <span title="姓名" class="weight">{{item.patientDTO.patientName || '无'}}</span>
+                <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span title="部位">部位：{{item.takePart || '无'}}</span>
-                <span title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+                <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 title="固定时间">固定时间：{{item.fixationTime?(item.fixationTime|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>
@@ -262,19 +262,19 @@
             			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
             			{{item.applyCode || '无'}}
             		</span>
-                <span title="姓名" class="weight">{{item.patientDTO.patientName || '无'}}</span>
+                <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span title="部位">部位：{{item.takePart || '无'}}</span>
-                <span title="标本数">标本数：{{item.specimenNum || '无'}}</span>
+                <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 title="固定时间">固定时间：{{item.fixationTime?(item.fixationTime|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 title="离科时间">离科时间：{{item.leaveDeptTime?(item.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
+								<span class="text-right" title="离科时间">离科时间：{{item.leaveDeptTime?(item.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</span>
 							</div>
             </div>
           </div>
@@ -487,23 +487,23 @@
 				</div>
 				
 				<div class="form-list">
-					<div class="form-title font-weight-500">病理摘要：</div>
+					<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-list">
 					<div class="form-title font-weight-500">术中所见：</div>
 					<div class="indent">{{codeData.intraoperativeFindings||'无'}}</div>
-				</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 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.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>
@@ -538,10 +538,7 @@
 										<td>{{index+1}}</td>
 										<td>{{ data.specimenCode}}</td>
 										<td>
-											{{data.partSource?data.partSource.name:''}} <span *ngIf="data.system">-</span>
-											{{data.system?data.system.name:''}} <span *ngIf="data.organ">-</span>
-											{{data.organ?data.organ.name:''}} <span>-</span>
-											{{data.sample?data.sample.name:data.specimenName}}
+											{{data.partSource?data.partSource.name:''}}{{data.organ?data.organ.name:''}}{{data.specimenName}}
 										</td>
 									</tr>
 								</tbody>
@@ -643,22 +640,22 @@
 				</div>
 				
 				<div class="form-list">
-					<div class="form-title font-weight-500">病理摘要：</div>
+					<div class="form-title font-weight-500">病历摘要：</div>
 					<div class="indent">{{detailsData.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-list">
 					<div class="form-title font-weight-500">术中所见：</div>
 					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
-				</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 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">
@@ -671,10 +668,7 @@
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
 						<div *ngFor="let item of specimenList" class="specimen-item-class">
-							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
-							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-							{{item.organ?item.organ.name:''}} <span>-</span>
-							{{item.sample?item.sample.name:item.specimenName}}
+							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
 						</div>
 					</div>
 				</div>
@@ -691,11 +685,11 @@
 							</nz-step>
 							<ng-template #tpl>
 								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-									<div style="color: #49B856;">{{item.operationType.name}}</div>
+									<div style="color: #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}}</div>
+									<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>

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

@@ -104,7 +104,7 @@
         font-size: 16px;
 				display: flex;
 				.pharmacy-title{
-					width: 160px;
+					width: 170px;
 					font-weight: 600;
 					font-size: 22px;
 				}
@@ -211,8 +211,9 @@
       display: flex;
       flex-direction: column;
       background-color: #f9fafb;
-      flex: 1;
-      margin: 0 4px;
+      // flex: 1;
+			width: 33%;
+      // margin: 0 4px;
       box-sizing: border-box;
       border: 1px solid #e5e9ed;
       // 标题 start
@@ -335,6 +336,12 @@
               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{
@@ -351,9 +358,20 @@
                   justify-content: flex-start;
                 }
               }
+							.text-left{
+								text-align: left;
+							}
+							.text-right{
+								text-align: right;
+							}
               span {
                 color: #666;
-                font-size: 12px;
+                font-size: 14px;
+								width: 50%;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								// flex: 1;
               }
               strong {
                 color: #333;

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

@@ -655,7 +655,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     }
     let postData = {
 			idx: 0,
-			sum: 9999,
+			sum: 50,
 			pathologyForm:{
 				detailsType: type,
 				keyWords:searchKey,