门诊病理优化

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

@@ -456,7 +456,7 @@
 					 </div>
 					 <div style="width: 2%;"></div>
 					 <div style="width: 58%;">
-						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.patientNo}}</div>
+						<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>

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

@@ -280,7 +280,7 @@
 					 </div>
 					 <div style="width: 2%;"></div>
 					 <div style="width: 58%;">
-						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.patientNo}}</div>
+						<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>

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

@@ -43,7 +43,10 @@
 				<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="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>
@@ -56,7 +59,7 @@
 				<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">
@@ -100,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>
@@ -113,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>
@@ -236,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">
@@ -410,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">
@@ -544,7 +555,7 @@
 							<div>性别: {{data.patientGender}}</div>
 						</div>
 						<div style="margin-top:10px;">
-							<div>住院号: {{data.patientNo}}</div>
+							<div>门诊号: {{data.patientNo}}</div>
 						</div>
 						<div style="margin-top:10px;">
 							<div>科室: {{data.patientDept}}</div>
@@ -590,7 +601,7 @@
 				 </div>
 				 <div style="width: 2%;"></div>
 				 <div style="width: 58%;">
-					<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.patientNo}}</div>
+					<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>

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

@@ -451,6 +451,12 @@
 						overflow: hidden;
 						text-overflow: ellipsis;
 						white-space: nowrap;
+						position: relative;
+						.del-class{
+							position: absolute;
+							right: 0;
+							color: #49b856;
+						}
 						.code{
 							margin-right: 10px;
 						}

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

@@ -144,6 +144,9 @@ export class PathologySampleComponent implements OnInit {
 		.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');
 		});
@@ -194,6 +197,43 @@ export class PathologySampleComponent implements OnInit {
 	    });
 	}
 	
+	// 病理医嘱删除
+	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;
@@ -215,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
 			}
@@ -239,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
@@ -379,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");
@@ -412,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'
@@ -454,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);
+					}
 				}
 			}
 
@@ -491,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
 		});
 	}
@@ -631,6 +683,7 @@ export class PathologySampleComponent implements OnInit {
 	coopId:any;
 	specimenDel(e,item,index){
 		this.delModal = true
+		this.itemDataType = 2
 		this.coopId = item.id
 	}
 	
@@ -974,7 +1027,9 @@ export class PathologySampleComponent implements OnInit {
 	
 	specimenModal:any = false;
 	hideSpecimenModal(){
-		this.getSampleData('')
+		if(this.itemDataType==2){
+			this.getSampleData('')
+		}
 		this.specimenModal = false
 	}
 	
@@ -1227,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");