Merge branch 'master' into develop

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -126,6 +126,30 @@
 										<label nz-radio [nzValue]="2">二维码</label>
 									</nz-radio-group>
 								</div>
+								<!--是否支持门诊新增申请单 -->
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">是否支持门诊新增申请单</nz-form-label>
+									<nz-checkbox-group [(ngModel)]="outpatientCreatePathologyForm"></nz-checkbox-group>
+								</div>
+								<!-- 门诊病理标签样式 -->
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">门诊病理标签样式</nz-form-label>
+									<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择门诊病理标签样式" [(ngModel)]="outpatientPathologyLabelSize">
+										<ng-container *ngFor="let option of labelData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 手术病理标签样式 -->
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">手术病理标签样式</nz-form-label>
+									<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择手术病理标签样式" [(ngModel)]="surgeryPathologyLabelSize">
+										<ng-container *ngFor="let option of labelData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
 							</div>
 							<div class="bottom">
 								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitPathologyForm()">保存</button>

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.less

@@ -325,7 +325,11 @@
         nz-form-label {
           margin-left: 0px !important;
         }
-
+				
+				.ant-select{
+					width: 200px;
+				}
+				
         & > div {
           background: #f9fafb;
           border: 1px solid #e5e9ed;

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -31,6 +31,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	  {label:'是否开启',value: 0}
 	];
 	
+	// 是否是否支持门诊新增申请单
+	outpatientCreatePathologyForm:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	outpatientPathologyLabelSize:any; //门诊病理标签样式
+	surgeryPathologyLabelSize:any //手术病理标签样式
 	// 门诊支持离体并固定
 	outpatientInVitroFixation:any[] = [
 	  {label:'是否开启',value: 0}
@@ -109,6 +115,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			this.getDeptList();
 			this.getTaskType();
 		}else{
+			this.getLabelDic()
 			this.getTaskTypesId()
 		}
 	}
@@ -178,8 +185,15 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		  taskType: this.taskTypeData.id,
 		  hosId: this.hosId,
 		  autoCreate: this.autoCreate[0].checked ? 1 : 0,
+			outpatientCreatePathologyForm: this.outpatientCreatePathologyForm[0].checked ? 1 : 0,
 			outpatientInVitroFixation: this.outpatientInVitroFixation[0].checked ? 1 : 0,
 			pathologyBarCode : this.pathologyBarCode,
+			outpatientPathologyLabelSize:{
+				id:this.outpatientPathologyLabelSize
+			},
+			surgeryPathologyLabelSize:{
+				id:this.surgeryPathologyLabelSize
+			}, 
 		};
 		this.btnLoading = true;
 		this.mainService
@@ -228,6 +242,14 @@ export class ConfigurationSpecimenComponent implements OnInit {
       });
   }
 	
+	// 获取标本字典
+	labelData:any = [];
+	getLabelDic(){
+		this.mainService.getDictionary("list", "pathology_label_size").subscribe((data) => {
+			this.labelData = data
+		});
+	}
+	
 	// 获取任务类型（病理标本）
 	taskTypeData:any;
 	getTaskTypesId() {
@@ -301,8 +323,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
           this.configs = result.list[0] || {};
 					// 病理标本
 					this.autoCreate[0].checked = this.configs.autoCreate == 1;
+					this.outpatientCreatePathologyForm[0].checked = this.configs.outpatientCreatePathologyForm == 1;
 					this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
 					this.pathologyBarCode = this.configs.pathologyBarCode;
+					this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
+					this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
 					// 检查标本
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;

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

@@ -391,7 +391,7 @@
 			</div> -->
 			
 			<!-- 12.11新版打印样式 -->
-			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div>
 					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;">
@@ -440,5 +440,32 @@
 				 <div style="height: 26px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
+			
+			<!-- 小尺寸 20*30-->
+			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+					<div style="width: 100%;display: flex;margin-top: 5px;">
+					 <div style="width: 40%;">
+						 <div style="display: flex;justify-content: center;">
+							 <div style="width: 50px;height: 50px;">
+							 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
+							 </div>
+							 <div style="width: 12px;">申请单</div>
+						 </div>
+						 <div style="text-align: left;">{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 2%;"></div>
+					 <div style="width: 58%;">
+						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
+						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
+						<div style="margin-top:9px;margin-left: 20px;">性别: {{data.patientGender}}</div>
+					 </div>
+					</div>
+					<div style="margin-top:10px;">
+						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+					</div>
+				 <div style="height: 15px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+				</div>
+			</div>
 		</div>
   </div>

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

@@ -82,6 +82,7 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 获取标本配置
 	pathologyBarCode:any = 1;
+	outpatientPathologyLabelSizeType:any = 1;
 	getPathologySys(){
 		let postData = {
 			  idx: 0,
@@ -97,7 +98,10 @@ export class PathologyAddComponent implements OnInit {
 		  .subscribe((result) => {
 		    if (result.status == 200) {
 					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
-		    }
+					if(result.list[0].outpatientPathologyLabelSize){
+						this.outpatientPathologyLabelSizeType = result.list[0].outpatientPathologyLabelSize.value;
+					}
+				}
 		  });
 	}
 	

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

@@ -215,7 +215,7 @@
 				</div>
 			</div> -->
 			<!-- 12.11新版打印样式 -->
-			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div>
 					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;">
@@ -264,6 +264,33 @@
 				 <div style="height: 26px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
+			
+			<!-- 小尺寸 20*30-->
+			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+					<div style="width: 100%;display: flex;margin-top: 5px;">
+					 <div style="width: 40%;">
+						 <div style="display: flex;justify-content: center;">
+							 <div style="width: 50px;height: 50px;">
+							 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
+							 </div>
+							 <div style="width: 12px;">申请单</div>
+						 </div>
+						 <div style="text-align: left;">{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 2%;"></div>
+					 <div style="width: 58%;">
+						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
+						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
+						<div style="margin-top:9px;margin-left: 20px;">性别: {{data.patientGender}}</div>
+					 </div>
+					</div>
+					<div style="margin-top:10px;">
+						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+					</div>
+				 <div style="height: 15px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+				</div>
+			</div>
 		</div>
   </div>
 	

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

@@ -151,6 +151,7 @@ export class PathologyDetailComponent implements OnInit {
 	
 	// 获取标本配置
 	pathologyBarCode:any = 1;
+	outpatientPathologyLabelSizeType:any = 1;
 	getPathologySys(){
 		let postData = {
 			  idx: 0,
@@ -166,7 +167,10 @@ export class PathologyDetailComponent implements OnInit {
 		  .subscribe((result) => {
 		    if (result.status == 200) {
 					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
-		    }
+					if(result.list[0].outpatientPathologyLabelSize){
+						this.outpatientPathologyLabelSizeType = result.list[0].outpatientPathologyLabelSize.value;
+					}
+				}
 		  });
 	}
 	

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

@@ -39,19 +39,27 @@
 				<div>{{adviceList.patientName}} {{adviceList.patientGender?adviceList.patientGender.name:'-'}} ({{adviceList.patientAge||'-'}}岁)</div>
 				<div class="border">{{adviceList.patientNo}}</div>
 			</div>
-			<div class="content" *ngFor="let item of adviceList.pathologyAdviceDTOS;let index=index;" (click)="listClick(item,index)" [ngClass]="{'activeLeftClass': index == leftIndex}">
-				<div class="list list-df">
-					<div class="code">{{item.adviceId}}</div>
-					<div class="form-title">{{item.adviceType.name}}</div>
+			<div class="left-content" [ngClass]="{'noAddAppClass': !ifAddapplication, 'beAddAppClass': ifAddapplication}">
+				<div class="content" *ngFor="let item of adviceList.pathologyAdviceDTOS;let index=index;" (click)="listClick(item,index)" [ngClass]="{'activeLeftClass': index == leftIndex}">
+					<div class="list list-df">
+						<div class="code">{{item.adviceId ? item.adviceId : '无'}}</div>
+						<div class="form-title">{{item.adviceType ? item.adviceType.name : ''}}</div>
+						<div class="del-class">
+							<i (click)="delItem($event,item)" class="icon_transport transport-lajitong specimen-icon"></i>
+						</div>
+					</div>
+					<div class="list">项目：{{item.inspectType?item.inspectType.name:'无'}}</div>
+					<div class="list">部位：{{item.inspectPart ? item.inspectPart : '无'}}</div>
+					<div class="list">诊断：{{item.diagnosis ? item.diagnosis : '无'}}</div>
+					<div class="list">开单时间：{{item.orderTime | date:'yyyy-MM-dd HH:mm:ss'}}</div>
+					<!-- <div class="list">状态：{{item.orderStatusName}}</div> -->
 				</div>
-				<div class="list">项目：{{item.inspectType.name}}</div>
-				<div class="list">部位：{{item.inspectPart}}</div>
-				<div class="list">诊断：{{item.diagnosis}}</div>
-				<div class="list">开单时间：{{item.orderTime | date:'yyyy-MM-dd HH:mm:ss'}}</div>
-				<!-- <div class="list">状态：{{item.orderStatusName}}</div> -->
+			</div>
+			<div *ngIf="ifAddapplication && adviceList" class="center-box">
+				<button nz-button nzType="primary" class="btn txtC mr8" (click)="addPathology(0)">新增病理申请单</button>
 			</div>
 		</div>
-		<div class="center" *ngIf="detailsData && viewType!='add'">
+		<div class="center" *ngIf="adviceList && adviceList.pathologyAdviceDTOS.length>0 && detailsData && viewType!='add'">
 			<div class="pathology-content" *ngIf="viewType=='edit'">
 				<div class="title">病理检查申请单</div>
 				<div class="content">
@@ -95,7 +103,7 @@
 								</nz-form-control>
 							</nz-form-item>
 							
-							<nz-form-item class="form-item">
+							<nz-form-item class="form-item" *ngIf="syncFlag==0">
 								<nz-form-label nzRequired nzFor="project" [nzSm]="4" [nzXs]="24">检验项目</nz-form-label>
 								<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="20" [nzXs]="24">
 									<nz-input-group>
@@ -108,6 +116,10 @@
 								</nz-form-control>
 							</nz-form-item>
 							
+							<div class="form-list" *ngIf="syncFlag==1">
+								<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
+							</div>
+							
 							<div class="df-sb">
 								<nz-form-item class="form-item">
 									<nz-form-label nzRequired nzFor="specimenGenre">标本类型</nz-form-label>
@@ -231,7 +243,7 @@
 				</div>
 			</div>
 		
-		<div class="content-item-right" *ngIf="pathologyLogs.length && (viewType=='view' || viewType=='edit')">
+		<div class="content-item-right" *ngIf="adviceList && adviceList.pathologyAdviceDTOS.length>0 && pathologyLogs.length && (viewType=='view' || viewType=='edit')">
 			<div class="step-title">病理闭环</div>
 			<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
 				<ng-container *ngFor="let item of pathologyLogs; let index = index">
@@ -253,7 +265,7 @@
 			</nz-steps>
 		</div>
 		<div class="pathology-content-btn" *ngIf="viewType=='add'">
-			<button class="btn" nz-button nzType="primary" (click)="addPathology()" [nzLoading]="addLoading">新增病理申请单</button>
+			<button class="btn" nz-button nzType="primary" (click)="addPathology(1)" [nzLoading]="addLoading">新增病理申请单</button>
 		</div>
   </div>
 </div>
@@ -318,6 +330,9 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
 
+<!-- 病理申请单 -->
+<!-- <app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientId" [detailId]="detailId" [applicationType]="applicationType" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add> -->
+
 <!-- 选择标本 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenModal">
 	<div class="modalBody">
@@ -402,6 +417,10 @@
 <!-- 删除模态框 -->
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
 	(confirmDelEvent)="confirmDel()" content="您确认要删除标本吗？"></app-dialog-delete>
+
+<!-- 删除医嘱 -->
+<app-dialog-delete [delModal]="delAdviceModal" (hideDelModalEvent)="hideAdviceModal()" [btnLoading]="btnLoading"
+	(confirmDelEvent)="confirmAdvice()" content="您确认要删除医嘱吗？"></app-dialog-delete>
 		
 <!-- 查看标本 -->
 <div class="look">
@@ -516,107 +535,81 @@
 <!-- 打印 -->
 <div id="report" style="display: none;">
 	<div class="monad">
-		<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
-			border-radius: 5px;font-size: 12px;">
-			 <div *ngIf="pathologyBarCode==1" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
-				 <div style="width: 60%;height: 70px;text-align: center;">
-					 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
-					 <div>{{printData.applyCode}}</div>
-				 </div>
-				 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
-					 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
-				 </div>
-			 </div>
-			 <div *ngIf="pathologyBarCode==2" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
-				 <div style="width: 40%;height: 70px;text-align: center;">
-					 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
-					 <div>{{printData.applyCode}}</div>
-				 </div>
-				 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -6px;">
-					 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
-				 </div>
-			 </div>
-			
-			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-				<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
-				<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
-				<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
-				<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
-			</div>
-			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-				<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">门诊号</div>
-				<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo?printData.residenceNo:printData.patientNo}}</div>
-				<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
-				<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
-			</div>
-			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-				<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
-				<div style="width:50%;border-right: 1px solid #AAAAAA;
-				padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
-				<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
-				<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
-			</div>
-			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-				<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
-				<div style="width:50%;border-right: 1px solid #AAAAAA;
-				padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
-				<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
-				<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
-			</div>
-			<div style="display: flex;">
-				<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
-				<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
-			</div>
-		</div>
-		
-		<div style="height: 70px;" *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">
+		<!-- 大尺寸 80*60-->
+		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0">
 			<div *ngFor="let data of printData.specimenList; let index=index;">
-			 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
-			 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+			 <div>
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
 						 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
-						 <div>{{data.specimenCode}}</div>
+						 <div>标本号:{{data.specimenCode}}</div>
 					 </div>
 					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
 						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" 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?data.residenceNo:data.patientNo}}</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.partSource:''}}{{data.organ}}{{data.specimenName}}</div>
+				 <div style="display: flex;justify-content: space-between;">
+					 <div style="width: 70%;margin-right:15px;">
+					 	<div style="display: flex; justify-content: space-between; margin-top:10px;">
+							<div>患者: {{data.patientName}}</div>
+							<div>性别: {{data.patientGender}}</div>
+						</div>
+						<div style="margin-top:10px;">
+							<div>门诊号: {{data.patientNo}}</div>
+						</div>
+						<div style="margin-top:10px;">
+							<div>科室: {{data.patientDept}}</div>
+						</div>
+						<div style="margin-top:10px;">
+							<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+						</div>
+						<div style="margin-top:10px;">
+							<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+						</div>
+					 </div>
+					 <div style="width: 30%;">
+						<div style="margin-top:10px;">年龄: {{data.patientAge}}岁</div>
+						<div style="margin-top:10px;">床号: {{data.patientBedNum}}床</div>
+						<div style="margin-top:10px;" *ngIf="operation == 'addPrint'">标本数: {{index+1}}/{{printData.specimenNum}}</div>
+						<div style="margin-top:10px;" *ngIf="operation != 'addPrint'">标本数: {{index+1}}/{{printData.specimenList.length}}</div>
+						<div style="width: 100%;height: 60px;display: flex;margin-top: 5px;">
+						 <div style="height: 50px;width: 50px;">
+							 <img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="printData.applyBarCode" alt="">
+							 <div style="position: relative;left: -18px;">{{printData.applyCode}}</div>
+						 </div>
+						 <div style="width: 12px;position: relative; top: 2px;">申请单</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;padding:1px;">申请单号</div>
-					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.applyCode }}</div>
+			 </div>
+			 <div style="height: 26px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+			</div>
+		</div>
+		
+		<!-- 小尺寸 20*30-->
+		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
+			<div *ngFor="let data of printData.specimenList; let index=index;">
+				<div style="width: 100%;display: flex;margin-top: 5px;">
+				 <div style="width: 40%;">
+					 <div style="display: flex;justify-content: center;">
+						 <div style="width: 50px;height: 50px;">
+						 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
+						 </div>
+						 <div style="width: 12px;">申请单</div>
+					 </div>
+					 <div style="text-align: left;">{{printData.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 style="width: 2%;"></div>
+				 <div style="width: 58%;">
+					<div style="display: flex;flex-wrap: nowrap;">门诊号: {{data.patientNo}}</div>
+					<div style="margin-top:9px;">患者: {{data.patientName}}</div>
+					<div style="margin-top:9px;margin-left: 20px;">性别: {{data.patientGender}}</div>
 				 </div>
-			 </div>
+				</div>
+				<div style="margin-top:10px;">
+					<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+				</div>
+			 <div style="height: 15px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 			</div>
 		</div>
 	</div>

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

@@ -413,8 +413,17 @@
 			width: 20%;
 			box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.16);
 			z-index: 999;
-			overflow-y: auto;
 			font-weight: 500;
+			position: relative;
+			.center-box{
+				text-align: center;
+				position: absolute;
+				bottom: 0;
+				width: 100%;
+				background: #fff;
+				padding: 10px 0;
+				border-top: 1px solid #ccc;
+			}
 			.top{
 				padding: 10px 40px;
 				text-align: center;
@@ -423,29 +432,44 @@
 					border-bottom: 1px solid #ccc;
 				}
 			}
-			.content{
-				padding: 8px 8px 0 8px;
-				font-size: 14px;
-				border: 1px solid #CCCCCC;
-				margin-bottom: 10px;
-				cursor: pointer;
-				.list{
+			.noAddAppClass{
+				height: calc(100vh - 116px);
+			}
+			.beAddAppClass{
+				height: calc(100vh - 169px);
+			}
+			.left-content{
+				overflow-y: auto;
+				.content{
+					padding: 8px 8px 0 8px;
+					font-size: 14px;
+					border: 1px solid #CCCCCC;
 					margin-bottom: 10px;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					.code{
-						margin-right: 10px;
+					cursor: pointer;
+					.list{
+						margin-bottom: 10px;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						position: relative;
+						.del-class{
+							position: absolute;
+							right: 0;
+							color: #49b856;
+						}
+						.code{
+							margin-right: 10px;
+						}
+					}
+					.list-df{
+						display: flex;
 					}
 				}
-				.list-df{
-					display: flex;
+				.activeLeftClass{
+					background: #F2FAF2;
+					border: 1px solid #64BD7B;
 				}
 			}
-			.activeLeftClass{
-				background: #F2FAF2;
-				border: 1px solid #64BD7B;
-			}
 		}
 		.center {
 			width: 60%;

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

@@ -123,22 +123,30 @@ export class PathologySampleComponent implements OnInit {
 	// 新增申请单
 	applicationType:any;
 	addLoading:any = false;
-	addPathology(){
+	addPathology(type){
 		let data = {
 			idx: 0,
 			sum: 9999,
-			pathologyAdviceId: this.adviceItem.id || "",
+			pathologyAdviceId: "",
 			patientId: this.patientId || "",
 			hosId: this.hosId || "" ,
 			operationType: 'outpatientPathologyForm',
 			pathologyFormType: 0
 		};
+		if(type==0){
+			delete data.pathologyAdviceId
+		}else{
+			data.pathologyAdviceId = this.adviceItem.id
+		}
 		this.addLoading = true
 		this.mainService
 		.simplePost("addData", "pathologyForm", data)
 		.subscribe((data) => {
 			this.addLoading = false
 			this.viewType = 'edit';
+			if(this.leftIndex == null){
+				this.leftIndex = 0
+			}
 			this.fetchDataList(data.data.id);
 			this.searchSpecimen(this.adviceList.patientNo,'add');
 		});
@@ -156,6 +164,8 @@ export class PathologySampleComponent implements OnInit {
 	// 获取配置
 	pathologyBarCode:any = 1;
 	ifImmobilization:any = false;
+	ifAddapplication:any = false;
+	outpatientPathologyLabelSizeType:any = 1; //1:大标本打印 2：小标本打印
 	getConfig() {
 		let postData = {
 			idx: 0,
@@ -174,11 +184,56 @@ export class PathologySampleComponent implements OnInit {
 					}else{
 						this.ifImmobilization = false
 					}
+					if(result.list[0].outpatientCreatePathologyForm && result.list[0].outpatientCreatePathologyForm==1){
+						this.ifAddapplication = true
+					}else{
+						this.ifAddapplication = false
+					}
+					if(result.list[0].outpatientPathologyLabelSize){
+						this.outpatientPathologyLabelSizeType = result.list[0].outpatientPathologyLabelSize.value;
+					}
 					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
 	      }
 	    });
 	}
 	
+	// 病理医嘱删除
+	itemData:any;
+	delAdviceModal:any = false;
+	itemDataType:any = 2;
+	delItem(e,data){
+		e.stopPropagation();
+		this.itemDataType = 1
+		this.itemData = data
+		this.delAdviceModal = true
+	}
+	
+	// 确定删除
+	confirmAdvice(){
+		this.btnLoading = true;
+		this.mainService
+		  .coopTypeConfig(
+		    "rmvData",
+		    "pathologyAdvice",
+		     [this.itemData.id]
+		  )
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.delAdviceModal = false;
+				this.searchSpecimen(this.adviceList.patientNo,'load');
+				// this.fetchDataList(this.itemData.pathologyFormId);
+		    if (data.status==200) {
+		      this.showSpecimenModal("删除", true, "");
+		    } else {
+		      this.showSpecimenModal("删除", false, data.data[0].msg);
+		    }
+		  });
+	}
+	// 确定删除
+	hideAdviceModal() {
+	  this.delAdviceModal = false;
+	}
+	
 	// 病理点击
 	leftIndex:any = null;
 	adviceItem:any;
@@ -200,8 +255,7 @@ export class PathologySampleComponent implements OnInit {
 	// 标本条码搜索
 	adviceList:any = null;
 	searchSpecimen(e,type){
-		console.log(7777,this.route.snapshot.params.param)
-		if(type!='add'){
+		if(type!='add' && type!='load'){
 			if(!this.barCode){
 				return
 			}
@@ -224,21 +278,22 @@ export class PathologySampleComponent implements OnInit {
 				this.barCode = null
 				this.searchMsg = null
 				this.isShowMove = true
-				if(type=='search'){
+				if(type=='search' || type=='load'){
 					this.leftIndex = null
 					this.detailsData = null
 					this.statusValue = 1
 					this.pathologyLogs = []
+					this.adviceList = null
 					this.stepLength = 0
 					this.viewType = 'no';
 				}
 				if(res.list.length>0){
 					this.adviceList = res.list[0]
+					this.patientId = this.adviceList.patientId
 				}else{
-					this.adviceList = []
+					this.adviceList = null
 					this.viewType = 'no';
 				}
-				this.patientId = this.adviceList.patientId
 			}else{
 				this.barCode = null
 				this.searchMsg = res.msg
@@ -364,6 +419,7 @@ export class PathologySampleComponent implements OnInit {
 					}
 					that.printLoading = false;
 					that.printData = arr;
+					this.searchSpecimen(this.adviceList.patientNo,'load');
 					setTimeout(() => {
 					  const printContent = document.getElementById("report");
 					  const WindowPrt = window.open("", "", "width=100,height=1000");
@@ -397,12 +453,14 @@ export class PathologySampleComponent implements OnInit {
 	}
 	
 	medicalRecordsLength:any = 0;
+	syncFlag: any = 0;
 	fetchDataList(id){
 		this.isSpinning = true;
 		this.mainService.getFetchData("data", "pathologyForm", id)
 		.subscribe((data) => {
 			this.isSpinning = false;
 			this.detailsData = data.data;
+			this.syncFlag = data.data.syncFlag;
 			this.surgeryId = data.data.surgeryId;
 			if(this.detailsData.status && this.detailsData.status.value==5){
 				this.viewType = 'view'
@@ -439,10 +497,19 @@ export class PathologySampleComponent implements OnInit {
 			}else{
 				let str = null
 				if(this.detailsData.pathologyInspectDTOS){
-					str = this.detailsData.pathologyInspectDTOS[0].inspectProject.id
-					this.validateForm.controls.project.setValue(str);
+					if(this.syncFlag==1){
+						str = this.detailsData.pathologyInspectDTOS[0].inspectProject.name
+						this.project = str
+					}else{
+						str = this.detailsData.pathologyInspectDTOS[0].inspectProject.id
+						this.validateForm.controls.project.setValue(str);
+					}
 				}else{
-					this.validateForm.controls.project.setValue(str);
+					if(this.syncFlag==1){
+						this.project = ''
+					}else{
+						this.validateForm.controls.project.setValue(str);
+					}
 				}
 			}
 
@@ -476,7 +543,7 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 获取检验项目
 	getProDicData(){
-		this.mainService.getDictionary("list", "outpatient_pathology_inspect_type").subscribe((res) => {
+		this.mainService.getDictionary("list", "pathology_inspect_type").subscribe((res) => {
 			this.projectData = res
 		});
 	}
@@ -616,6 +683,7 @@ export class PathologySampleComponent implements OnInit {
 	coopId:any;
 	specimenDel(e,item,index){
 		this.delModal = true
+		this.itemDataType = 2
 		this.coopId = item.id
 	}
 	
@@ -959,7 +1027,9 @@ export class PathologySampleComponent implements OnInit {
 	
 	specimenModal:any = false;
 	hideSpecimenModal(){
-		this.getSampleData('')
+		if(this.itemDataType==2){
+			this.getSampleData('')
+		}
 		this.specimenModal = false
 	}
 	
@@ -1003,6 +1073,8 @@ export class PathologySampleComponent implements OnInit {
 						jobNumber: [null, [Validators.required]],
 						name:[null, [Validators.required]],
 					});
+					let item = this.fixativeData.find(i=>i.value==1)
+					this.validatePrintForm.controls.fixative.setValue(item.id);
 					this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
 					this.validatePrintForm.controls.fixationTimes.setValue(date);
 					this.fixationData = inVitroDate;
@@ -1019,10 +1091,10 @@ export class PathologySampleComponent implements OnInit {
 				this.validatePrintForm.controls.inVitroTimes.setValue(date);
 				this.inVitroData = inVitroDate;
 				this.inVitroTimeSelect = format(date, 'HH:mm');
-				if(this.detailsData.surgeryDoctorDTO){
-					this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
-					this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
-				}
+				// if(this.detailsData.surgeryDoctorDTO){
+				// 	this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
+				// 	this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
+				// }
 			}else{
 				this.message.info('无新标本需要打印')
 			}
@@ -1070,6 +1142,8 @@ export class PathologySampleComponent implements OnInit {
 							jobNumber: [null, [Validators.required]],
 							name:[null, [Validators.required]],
 						});
+						let item = this.fixativeData.find(i=>i.value==1)
+						this.validatePrintForm.controls.fixative.setValue(item.id);
 						this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
 						this.validatePrintForm.controls.fixationTimes.setValue(date);
 						this.fixationData = inVitroDate;
@@ -1086,10 +1160,10 @@ export class PathologySampleComponent implements OnInit {
 					this.validatePrintForm.controls.inVitroTimes.setValue(date);
 					this.inVitroData = inVitroDate;
 					this.inVitroTimeSelect = format(date, 'HH:mm');
-					if(this.detailsData.surgeryDoctorDTO){
-						this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
-						this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
-					}
+					// if(this.detailsData.surgeryDoctorDTO){
+					// 	this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
+					// 	this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
+					// }
 				}else{
 					let data: any = {
 						pathologyForm:{
@@ -1144,6 +1218,8 @@ export class PathologySampleComponent implements OnInit {
 							jobNumber: [null, [Validators.required]],
 							name:[null, [Validators.required]],
 						});
+						let item = this.fixativeData.find(i=>i.value==1)
+						this.validatePrintForm.controls.fixative.setValue(item.id);
 						this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
 						this.validatePrintForm.controls.fixationTimes.setValue(date);
 						this.fixationData = inVitroDate;
@@ -1160,10 +1236,10 @@ export class PathologySampleComponent implements OnInit {
 					this.validatePrintForm.controls.inVitroTimes.setValue(date);
 					this.inVitroData = inVitroDate;
 					this.inVitroTimeSelect = format(date, 'HH:mm');
-					if(this.detailsData.surgeryDoctorDTO){
-						this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
-						this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
-					}
+					// if(this.detailsData.surgeryDoctorDTO){
+					// 	this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
+					// 	this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
+					// }
 				})
 				return
 			}
@@ -1206,6 +1282,7 @@ export class PathologySampleComponent implements OnInit {
 					}
 					this.btnLoading = false;
 					this.printData = arr;
+					this.searchSpecimen(this.adviceList.patientNo,'load');
 					setTimeout(() => {
 						const printContent = document.getElementById("report");
 						const WindowPrt = window.open("", "", "width=100,height=1000");

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

@@ -477,21 +477,21 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		};
 		this.mainService.changeHospital(postData).subscribe((result) => {
 		  if (result.status == 200) {
-		    let dataObj = {
-		      user: {
-		        dept: {
-		          id: this.validateForm.value.specimen,
-		        },
-		        id: JSON.parse(localStorage.getItem("user")).user.id,
-		      },
-		    };
-		    this.mainService
-		      .coopData("updData", "user", dataObj)
-		      .subscribe((data) => {
-		        if (data.status == 200) {
-		          this.getCurrentUserNow();
-		        }
-		      });
+				this.getCurrentUserNow();
+		    // let dataObj = {
+		    //   user: {
+		    //     dept: {
+		    //       id: this.validateForm.value.specimen,
+		    //     },
+		    //     id: JSON.parse(localStorage.getItem("user")).user.id,
+		    //   },
+		    // };
+		    // this.mainService
+		    //   .coopData("updData", "user", dataObj)
+		    //   .subscribe((data) => {
+		    //     if (data.status == 200) {
+		    //     }
+		    //   });
 		  }
 		});
 	}