拉取代码

src/app/services/main.service.ts

@@ -150,7 +150,16 @@ export class MainService {
       headers: this.headers,
     });
   }
-
+	
+	// 通用操作configuration信息 有操作类型（新增/更新/删除）//coop:操作类型addData:新增，updData更新，rmvData删除
+	apiPublicData(coop, type, data): any {
+	  return this.http.post(
+	    host.host + "/data/" + coop + "/" + type,
+	    data,
+	    { headers: this.headers }
+	  );
+	}
+	
   // 权限相关
   getPermission(type): any {
     return this.http.get(host.host + "/permission/roleMenu/" + type, {
@@ -406,6 +415,14 @@ export class MainService {
       { headers: this.headers }
     );
   }
+	//data增删改查
+	dataPost(coop, type, data): any {
+	  return this.http.post(
+	    host.host + "/data/" + coop + "/" + type,
+	    data,
+	    { headers: this.headers }
+	  );
+	}
   //获取工单详情里的历史记录
   getWorkOrderRecord(data): any {
     return this.http.post(host.host + "/workerOrder/getWorkOrderRecord", data, {
@@ -1049,5 +1066,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-
+	// 门诊病理采样端单点登录查询
+	registerOutpatient(name, value, data) {
+	  return this.http.post(host.host + `/pathology/outpatient/${name}/${value}`,data, {
+	    headers: this.headers,
+	  });
+	}
+	
 }

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

@@ -26,23 +26,33 @@
 						<div class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender?detailsData.patientDTO.gender.name:'-'}}</div>
 						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
 					</nz-form-item>
-					<nz-form-item>
-						<div class="form-title width-100 font-weight-500">诊断：</div>
-						<div>
-							{{detailsData.diagnose||'无'}}
+					<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)">快捷标本填写</div>
 						</div>
-					</nz-form-item>
-					
-					<nz-form-item>
-						<div class="form-title width-100 font-weight-500">病历摘要：</div>
-						<div>{{detailsData.medicalRecords||'无'}}</div>
-					</nz-form-item>
-					
-					<nz-form-item>
-						<div class="form-title width-100 font-weight-500">手术方案：</div>
-						<div>{{detailsData.surgicalPlan||'无'}}</div>
-					</nz-form-item>
-					
+					</div>
+					<div *ngIf="activeIndex==0" class="padding-top-10">
+						<nz-form-item>
+							<div class="form-title width-100 font-weight-500">诊断：</div>
+							<div>
+								{{detailsData.diagnose||'无'}}
+							</div>
+						</nz-form-item>
+						
+						<nz-form-item>
+							<div class="form-title width-100 font-weight-500">病历摘要：</div>
+							<div>{{detailsData.medicalRecords||'无'}}</div>
+						</nz-form-item>
+						
+						<nz-form-item>
+							<div class="form-title width-100 font-weight-500">手术方案：</div>
+							<div>{{detailsData.surgicalPlan||'无'}}</div>
+						</nz-form-item>
+					</div>
+					<div class="specimen-box" *ngIf="activeIndex==1">
+						<div class="specimen-list" [title]="item.specimenName" *ngFor="let item of specimenNameData; let index = index" (click)="fastSpecimenClick($event,item,index)">{{item.specimenName}}</div>
+					</div>
 					<!-- <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">
@@ -122,7 +132,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)">
+							<div class="specimen-name" (click)="specimenEdit($event,item,index,'direct')">
 								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 							</div>
 							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>

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

@@ -145,6 +145,55 @@
 							
 						}
 					}
+					
+					.padding-top-10{
+						padding-top: 10px;
+					}
+					
+					.specimen-box{
+						display: flex;
+						// justify-content: space-between;
+						overflow-y: auto;
+						flex-wrap: wrap;
+						.specimen-list{
+							width: 25%;
+							margin-top: 10px;
+							cursor: pointer;
+							text-decoration: underline;
+							color: #64BD7B;
+						}
+					}
+					.tabs{
+						display: flex;
+						// justify-content: space-between;
+						font-size: 14px;
+						background: #fff;
+						.tabs-item{
+							display: flex;
+							align-items: center;
+							width: 100%;
+							.tabs-item-item{
+								width:50%;
+								border: 1px solid #D9D9D9;
+								height: 50px;
+								line-height: 50px;
+								cursor: pointer;
+								text-align: center;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+							.tabs-item-item:first-child{
+								border-right:none;
+							}
+							.red{
+								color: red;
+							}
+							.activeClass{
+								background: #F0F6ED;
+							}
+						}
+					}
 				}
 				.boder-right{
 					border-right: 1px solid #e5e9ed;

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

@@ -69,6 +69,7 @@ export class PathologyAddComponent implements OnInit {
 		this.initForm()
 		this.getTaskTypesId()
 		this.fetchDataList()
+		this.getSpecimenName()
 		this.getStationaryLiquid()
   }
 	
@@ -178,6 +179,65 @@ export class PathologyAddComponent implements OnInit {
 		  });
 	}
 	
+	// 获取标本名称
+	specimenNameData:any = [];
+	getSpecimenName() {
+	  let data = {
+	    idx: 0,
+	    sum: 999,
+	    pathologySpecimenName: {
+	
+	    }
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "pathologySpecimenName", data)
+	    .subscribe((data) => {
+	      this.specimenNameData = data.list;
+	    });
+	}
+	
+	//tab切换
+	activeIndex:any = 1;
+	tabClick(type){
+		this.activeIndex = type
+	}
+	
+	// 快捷标本点击
+	specimenEditType:any = null;
+	fastSpecimenClick(e, item, index){
+		if(item.containPosition==1){
+			this.isSpinning = true
+			let data = {
+				pathologyFormId:this.detailsData.id,
+				partSource:{
+					id:item.position.id
+				},
+				system:{
+					id:item.system.id
+				},
+				organ:{
+					id:item.organ.id
+				},
+				hosId:this.hosId,
+				specimenName:item.specimenName,
+			};
+			this.mainService
+			  .simplePost('addData', "pathologySpecimen", data)
+			  .subscribe((res) => {
+					this.isSpinning = false;
+			    if (res.status == 200) {
+						this.message.success('操作成功')
+						this.getSampleData('')
+			    } else {
+						this.message.error(res.msg)
+			    }
+			  });
+		}else{
+			this.specimenEditType = 'fast'
+			this.specimenEdit(e, item, index, 'fast')
+		}
+	}
+	
 	// 固定液类型
 	fixativeData:any = [];
 	getStationaryLiquid(){
@@ -315,15 +375,26 @@ export class PathologyAddComponent implements OnInit {
 							this.specimenModal = true
 						},50)
 					}else{
-						setTimeout(_=>{
-							this.specimenNameIndex = null
-							this.specimenNameName = ''
-							this.specimenNameId = null
-							this.specimenNameLength = item.specimenName.length;
-							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-							this.validateSpecimenForm.controls.remark.setValue(item.remark);
-							this.specimenModal = true
-						},50)
+						if(this.specimenEditType=='direct'){
+							setTimeout(_=>{
+								this.specimenNameIndex = null
+								this.specimenNameName = ''
+								this.specimenNameId = null
+								this.specimenNameLength = item.specimenName.length;
+								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+								this.validateSpecimenForm.controls.remark.setValue(item.remark);
+								this.specimenModal = true
+							},50)
+						}else{
+							setTimeout(_=>{
+								this.specimenNameIndex = null
+								this.specimenNameName = ''
+								this.specimenNameId = null
+								this.specimenNameLength = item.specimenName.length;
+								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+								this.specimenModal = true
+							},50)
+						}
 					}
 				}
 			});
@@ -352,15 +423,26 @@ export class PathologyAddComponent implements OnInit {
 								this.specimenModal = true
 							},50)
 						}else{
-							setTimeout(_=>{
-								this.specimenNameIndex = null
-								this.specimenNameName = ''
-								this.specimenNameId = null
-								this.specimenNameLength = item.specimenName.length;
-								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-								this.validateSpecimenForm.controls.remark.setValue(item.remark);
-								this.specimenModal = true
-							},50)
+							if(this.specimenEditType=='direct'){
+								setTimeout(_=>{
+									this.specimenNameIndex = null
+									this.specimenNameName = ''
+									this.specimenNameId = null
+									this.specimenNameLength = item.specimenName.length;
+									this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+									this.validateSpecimenForm.controls.remark.setValue(item.remark);
+									this.specimenModal = true
+								},50)
+							}else{
+								setTimeout(_=>{
+									this.specimenNameIndex = null
+									this.specimenNameName = ''
+									this.specimenNameId = null
+									this.specimenNameLength = item.specimenName.length;
+									this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+									this.specimenModal = true
+								},50)
+							}
 						}
 					}
 			  });
@@ -401,16 +483,24 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 编辑标本
 	specimenDetailId:any = null;
-	specimenEdit(e,item,index){
-		this.specimenDetailId = item.id
+	specimenEdit(e,item,index,type){
+		this.specimenEditType = type
 		this.fastIndex = null
+		if(type=='fast'){
+			this.specimenDetailId = null
+		}else{
+			this.specimenDetailId = item.id
+		}
 		if(item.system && item.organ){
 			this.selectType = false
-			let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
-			this.placeIndex = index1
-			this.placeId = Number(item.partSource.id)
-			this.placeName = item.partSource.value==1?'':item.partSource.name
-			this.nzSmNum = item.partSource.value==1 ? 21 : 20
+			let index1 = null
+			if(item.partSource){
+				index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
+				this.placeIndex = index1
+				this.placeId = Number(item.partSource.id)
+				this.placeName = item.partSource.value==1?'':item.partSource.name
+				this.nzSmNum = item.partSource.value==1 ? 21 : 20
+			}
 			let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
 			this.systemIndex = index2
 			this.systemId = Number(item.system.id)

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

@@ -2628,7 +2628,7 @@
 		</div>
 		<div class="display_flex justify-content_flex-center mar-20 btns">
 			<button class="btn" style="margin-right: 0;" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(0)">新增普通病理</button>
-			<button class="btn" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(1)">新增术中快速</button>
+			<button class="btn" nzGhost *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(1)">新增术中快速</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">知道了</button>
 		</div>
 	</div>

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

@@ -256,13 +256,24 @@ export class LoginComponent implements OnInit {
     });
 		localStorage.setItem("bookBatchNo",'')
 		localStorage.setItem("specimenBatchNo",'')
-		if(this.paramsData.toPage1 && this.paramsData.cardNO1){
+		if(this.paramsData.toPage1 && (this.paramsData.cardNO1 || this.paramsData.pathologyFormCode1)){
 			this.msg.success("登录成功！", {
 			  nzDuration: 1000,
 			});
 			successLoginMsg = false;
 			localStorage.setItem("user", JSON.stringify(data.user));
-			this.router.navigate([`/${this.paramsData.toPage1}`, { param: this.paramsData.cardNO1 }])
+			let query = {
+				cardNO:'',
+				pathologyFormCode:''
+			}
+			if(this.paramsData.cardNO1){
+				query.cardNO = this.paramsData.cardNO1
+				delete query.pathologyFormCode
+			}else{
+				query.pathologyFormCode = this.paramsData.pathologyFormCode1
+				delete query.cardNO
+			}
+			this.router.navigate([`/${this.paramsData.toPage1}`, query])
 			return
 		}
     if (fwt) {

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

@@ -617,6 +617,11 @@ const routes: Routes = [
 			{
 			  path: "batchDistribution",
 			  loadChildren: () => import("../batch-distribution/batch-distribution.module").then((m) => m.BatchDistributionModule),
+			},
+			// 病理管理-常用标本名称
+			{
+			  path: "shareSpecimen",
+			  loadChildren: () => import("../share-specimen/share-specimen.module").then((m) => m.ShareSpecimenModule),
 			}
     ],
   },

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

@@ -109,7 +109,7 @@
 			      [nzLoading]="loading1">
 			      <thead>
 			        <tr class="thead">
-			          <th>申请单号</th>
+			          <th nzWidth="14%">申请单号</th>
 								<th>状态</th>
 			          <th>患者姓名</th>
 			          <th>住院号</th>
@@ -125,8 +125,8 @@
 			      </thead>
 			      <tbody>
 			        <tr *ngFor="let data of listOneData">
-			          <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
-								<td>{{ data.status?data.status.name : '-' }}</td>
+			          <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速 </span>{{ data.applyCode || '-' }}</td>
+								<td> <span *ngIf="data.deleteFlag==1" class="orange">删 </span>{{ data.status?data.status.name : '-' }}</td>
 								<td>{{ data.patientDTO.patientName}}</td>
 			          <td>{{ data.patientDTO.residenceNo}}</td>
 			          <td>{{ data.takePart}}</td>
@@ -163,7 +163,7 @@
 								[(nzChecked)]="isAllDisplayDataChecked"
 								[nzIndeterminate]="isIndeterminate"
 								(nzCheckedChange)="checkAll($event)"></th>
-				        <th>申请单号</th>
+				        <th nzWidth="14%">申请单号</th>
 								<th>状态</th>
 				        <th>患者姓名</th>
 				        <th>住院号</th>
@@ -185,8 +185,8 @@
 									[(nzChecked)]="mapOfCheckedId[data.id]"
 									(nzCheckedChange)="refreshStatus()"
 								></td>
-				        <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
-								<td>{{ data.status?data.status.name : '-' }}</td>
+				        <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速 </span>{{ data.applyCode || '-' }}</td>
+				        <td> <span *ngIf="data.deleteFlag==1" class="orange">删 </span>{{ data.status?data.status.name : '-' }}</td>
 								<td>{{ data.patientDTO.patientName}}</td>
 				        <td>{{ data.patientDTO.residenceNo}}</td>
 				        <td>{{ data.takePart}}</td>

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

@@ -14,7 +14,9 @@
     color: @primary-color!important;
     font-weight: bold !important;
   }
-
+	.orange{
+		color: #ff9e00;
+	}
   h1,
   h2,
   h3,

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

@@ -7,7 +7,7 @@
     <div class="pharmacy-name">
 			<div class="pharmacy-title">门诊病理采样端</div>
       <div class="pharmacy-name__total">
-				<nz-input-group nzSize="large">
+				<nz-input-group nzSize="large" *ngIf="!pathologyFormCode">
 					<input type="text" id="Binput" (keydown.enter)="onEnterPress()" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入患者信息" />
 				</nz-input-group>
 				<!-- <ng-template #suffixButton>
@@ -162,7 +162,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)">
+									<div class="specimen-name" (click)="specimenEdit($event,item,index,'direct')">
 										<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 									</div>
 									<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
@@ -245,25 +245,36 @@
 			</div>
 		
 		<div class="content-item-right" *ngIf="adviceList && adviceList.pathologyFormDTOS.length>0 && pathologyLogs.length && (viewType=='view' || viewType=='edit')">
-			<div class="step-title">病理闭环</div>
-			<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
-				<ng-container *ngFor="let item of pathologyLogs; let index = index">
-						<nz-step
-							[nzDescription]="tpl"
-						>
-						</nz-step>
-						<ng-template #tpl>
-							<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-								<div style="color: #49B856;">{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-								<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
-							</div>
-							<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
-								<div>{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-								<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
-							</div>
-						</ng-template>
-					</ng-container>
-			</nz-steps>
+			<div class="tabs">
+				<div class="tabs-item">
+					<div class="tabs-item-item" *ngIf="adviceItem.status.value < 7" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">快捷标本填写</div>
+					<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 1}" (click)="tabClick(1)">病理闭环</div>
+				</div>
+			</div>
+			
+			<div class="specimen" *ngIf="activeIndex==0">
+				<div class="specimen-list" *ngFor="let item of specimenNameData; let index = index" (click)="fastSpecimenClick($event,item,index)">{{item.specimenName}}</div>
+			</div>
+			<div class="padding-top-10" *ngIf="activeIndex==1">
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;">{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
 		</div>
 		<div class="pathology-content-btn" *ngIf="viewType=='add'">
 			<button class="btn" nz-button nzType="primary" (click)="addPathology(1)" [nzLoading]="addLoading">新增病理申请单</button>

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

@@ -736,20 +736,7 @@
 								height: 64px;
 								overflow: hidden;
 							}
-						}
-									
-						
-						.content-item-right{
-							// height: calc(100vh - 48px);
-							overflow-y: auto;
-							padding: 15px;
-							.step-title{
-								font-size: 16px;
-								font-weight: 500;
-								margin-bottom: 10px;
-							}
-						}
-						
+						}	
 						
 						.boder-right{
 							border-right: 1px solid #e5e9ed;
@@ -782,6 +769,47 @@
 			// height: calc(100vh - 48px);
 			overflow-y: auto;
 			padding: 15px;
+			.specimen{
+				overflow-y: auto;
+				.specimen-list{
+					margin-top: 10px;
+					cursor: pointer;
+					text-decoration: underline;
+					color: #64BD7B;
+				}
+			}
+			.tabs{
+				display: flex;
+				justify-content: space-between;
+				font-size: 14px;
+				background: #fff;
+				border-bottom: 1px solid #e5e9ed;
+				margin-right: 13px;
+				.tabs-item{
+					display: flex;
+					align-items: center;
+					width: 100%;
+					.tabs-item-item{
+						width:50%;
+						padding: 0px 10px 10px 10px;
+						border-bottom: 2px solid #f9fafb;
+						cursor: pointer;
+						text-align: center;
+					}
+					.red{
+						color: red;
+					}
+					.activeClass{
+						color: #64BD7B;
+						border-bottom: 2px solid #64BD7B;
+					}
+				}
+			}
+			
+			.padding-top-10{
+				padding-top: 10px;
+			}
+			
 			.step-title{
 				font-size: 16px;
 				font-weight: 500;
@@ -977,7 +1005,7 @@
 .spin-style{
 	z-index:9999;
 }
-
+	
 .look{
 	.save {
 	  position: fixed;

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

@@ -85,6 +85,10 @@ export class PathologySampleComponent implements OnInit {
 	mainRole:any;
 	deptId:any = null;
 	btnDelLoading:any = false;
+	activeIndex:any = 0;
+	pathologyFormCode:any = null;
+	cardNO:any = null;
+	
   ngOnInit() {
 		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.searchSpecimenData(v[0])
@@ -102,6 +106,7 @@ export class PathologySampleComponent implements OnInit {
 		this.getSysData()
 		this.getTaskTypesId();
 		this.getStationaryLiquid();
+		this.getSpecimenName();
 		this.validateForm = this.fb.group({
 			specimenGenre: [null, [Validators.required]],
 			intraoperativeFindings: [null, []],
@@ -110,9 +115,11 @@ export class PathologySampleComponent implements OnInit {
 			specimenNum: [{value: null, disabled: true},[Validators.required]],
 			takePart: [null, [Validators.required]]
 		});
-		if(this.route.snapshot.params && this.route.snapshot.params.param){
-			this.barCode = this.route.snapshot.params.param
-			this.searchSpecimen(this.barCode,'search','new')
+		if(this.route.snapshot.params && (this.route.snapshot.params.cardNO 
+			|| this.route.snapshot.params.pathologyFormCode)){
+			this.cardNO = this.route.snapshot.params.cardNO
+			this.pathologyFormCode = this.route.snapshot.params.pathologyFormCode
+			this.searchSpecimen('','load','new')
 		}
 		setTimeout(_=>{
 			document.getElementById('Binput').focus();
@@ -205,6 +212,64 @@ export class PathologySampleComponent implements OnInit {
 		},0)
 	}
 	
+	// 获取标本名称
+	specimenNameData:any = [];
+	getSpecimenName() {
+	  let data = {
+	    idx: 0,
+	    sum: 999,
+	    pathologySpecimenName: {
+
+	    }
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "pathologySpecimenName", data)
+	    .subscribe((data) => {
+	      this.specimenNameData = data.list;
+	    });
+	}
+	
+	//tab切换
+	tabClick(type){
+		this.activeIndex = type
+	}
+	
+	// 快捷标本点击
+	specimenEditType:any = null;
+	fastSpecimenClick(e, item, index){
+		if(item.containPosition==1){
+			this.isSpinning = true
+			let data = {
+				pathologyFormId:this.detailsData.id,
+				partSource:{
+					id:item.position.id
+				},
+				system:{
+					id:item.system.id
+				},
+				organ:{
+					id:item.organ.id
+				},
+				hosId:this.hosId,
+				specimenName:item.specimenName,
+			};
+			this.mainService
+			  .simplePost('addData', "pathologySpecimen", data)
+			  .subscribe((res) => {
+					this.isSpinning = false;
+			    if (res.status == 200) {
+						this.message.success('操作成功')
+						this.getSampleData('')
+			    } else {
+						this.message.error(res.msg)
+			    }
+			  });
+		}else{
+			this.specimenEditType = 'fast'
+			this.specimenEdit(e, item, index, 'fast')
+		}
+	}
+	
 	// 新增申请单
 	applicationType:any;
 	addLoading:any = false;
@@ -323,6 +388,9 @@ export class PathologySampleComponent implements OnInit {
 	listClick(item,index){
 		this.leftIndex = index
 		this.adviceItem = item
+		if(item.status.value > 6){
+			this.activeIndex = 1
+		}
 		if(item.id){
 			this.fetchDataList(item.id);
 		}else{
@@ -348,17 +416,33 @@ export class PathologySampleComponent implements OnInit {
 			}
 		}
 		let data:any = {
-			idx: 0,
-			sum: 10,
-			pathologyForm:{
+			// idx: 0,
+			// sum: 10,
+			// pathologyForm:{
 				order: "createTime desc",
-				patientNo:this.barCode?this.barCode:e,
+				// patientNo:this.barCode?this.barCode:e,
 				surgeryDeptId:this.deptId,
-				operationType:'outpatientPathologyForm'
-			}
+				// operationType:'outpatientPathologyForm'
+			// }
+		}
+		let name = null
+		let value = null
+		if(this.cardNO){
+			name = 'cardNO'
+			value = this.cardNO
+			delete data.surgeryDeptId
+		} else if (this.pathologyFormCode){
+			name = 'pathologyFormCode'
+			value = this.pathologyFormCode
+			delete data.surgeryDeptId
+		} else if (this.barCode || this.residenceNo){
+			name = 'patientNo'
+			value = this.barCode ? this.barCode : this.residenceNo
+			data.surgeryDeptId = this.deptId
 		}
 		this.isSpinning = true
-		this.mainService.getFetchDataList("data", "pathologyForm", data)
+		// this.mainService.getFetchDataList("data", "pathologyForm", data)
+		this.mainService.registerOutpatient(name, value, data)
 		.subscribe((res:any) => {
 			this.isSpinning = false
 			if(res.status==200){
@@ -374,16 +458,18 @@ export class PathologySampleComponent implements OnInit {
 					this.stepLength = 0
 					this.viewType = 'no';
 				}
-				if(res.list.length>0){
-					for(let i of res.list[0].pathologyFormDTOS){
-						i.project = []
-						if(i.pathologyInspectDTOS){
-							for(let x of i.pathologyInspectDTOS){
-								i.project.push(x.inspectProject.name)
+				if(res.data.length>0){
+					if(res.data[0].pathologyFormDTOS.length>0){
+						for(let i of res.data[0].pathologyFormDTOS){
+							i.project = []
+							if(i.pathologyInspectDTOS){
+								for(let x of i.pathologyInspectDTOS){
+									i.project.push(x.inspectProject.name)
+								}
 							}
 						}
 					}
-					this.adviceList = res.list[0]
+					this.adviceList = res.data[0]
 					this.residenceNo = this.adviceList.patientDTO.residenceNo?this.adviceList.patientDTO.residenceNo:this.adviceList.patientDTO.patientCode
 					this.patientId = this.adviceList.patientDTO.id
 					if(optType=='bottom'){
@@ -673,22 +759,23 @@ export class PathologySampleComponent implements OnInit {
 			this.mainService.getFetchDataList("simple/data", "dictionaryTree", postData).subscribe((res) => {
 				this.specimenNameList = res.list;
 				if(type=='edit'){
-					if(item.sample){
-						this.validateSpecimenForm = this.fb.group({
-						  remark: [null, []],
-							specimenName: [null, [Validators.required]]
-						});
-						setTimeout(_=>{
-							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
-							this.specimenNameIndex = index4
-							this.specimenNameName = item.sample.name
-							this.specimenNameId = Number(item.sample.id);
-							this.specimenNameLength = item.specimenName.length;
-							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-						},100)
+					this.validateSpecimenForm = this.fb.group({
+					  remark: [null, []],
+						specimenName: [null, [Validators.required]]
+					});
+					if(item.sample && this.specimenEditType=='direct'){
+						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.specimenNameLength = item.specimenName.length;
+						this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+						this.validateSpecimenForm.controls.remark.setValue(item.remark);
+					}else{
+						this.specimenNameLength = item.specimenName.length;
+						this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 					}
 					setTimeout(_=>{
-						this.validateSpecimenForm.controls.remark.setValue(item.remark);
 						this.specimenModal = true
 					},50)
 				}
@@ -702,22 +789,23 @@ export class PathologySampleComponent implements OnInit {
 			  .subscribe((data) => {
 			    this.specimenNameList = data.list;
 					if(type=='edit'){
-						if(item.sample){
-							this.validateSpecimenForm = this.fb.group({
-							  remark: [null, []],
-								specimenName: [null, [Validators.required]]
-							});
-							setTimeout(_=>{
-								let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
-								this.specimenNameIndex = index4
-								this.specimenNameName = item.sample.name
-								this.specimenNameId = Number(item.sample.id);
-								this.specimenNameLength = item.specimenName.length;
-								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-							},100)
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, []],
+							specimenName: [null, [Validators.required]]
+						});
+						if(item.sample && this.specimenEditType=='direct'){
+							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.specimenNameLength = item.specimenName.length;
+							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+							this.validateSpecimenForm.controls.remark.setValue(item.remark);
+						}else{
+							this.specimenNameLength = item.specimenName.length;
+							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 						}
 						setTimeout(_=>{
-							this.validateSpecimenForm.controls.remark.setValue(item.remark);
 							this.specimenModal = true
 						},50)
 					}
@@ -761,16 +849,24 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 编辑标本
 	specimenDetailId:any = null;
-	specimenEdit(e,item,index){
+	specimenEdit(e,item,index,type){
+		this.specimenEditType = type
 		this.fastIndex = null
-		this.specimenDetailId = item.id
+		if(type=='fast'){
+			this.specimenDetailId = null
+		}else{
+			this.specimenDetailId = item.id
+		}
 		if(item.system && item.organ){
 			this.selectType = false
-			let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
-			this.placeIndex = index1
-			this.placeId = Number(item.partSource.id)
-			this.placeName = item.partSource.value==1?'':item.partSource.name
-			this.nzSmNum = item.partSource.value==1 ? 21 : 20
+			let index1 = null
+			if(item.partSource){
+				index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
+				this.placeIndex = index1
+				this.placeId = Number(item.partSource.id)
+				this.placeName = item.partSource.value==1?'':item.partSource.name
+				this.nzSmNum = item.partSource.value==1 ? 21 : 20
+			}
 			let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
 			this.systemIndex = index2
 			this.systemId = Number(item.system.id)
@@ -973,6 +1069,11 @@ export class PathologySampleComponent implements OnInit {
 			id:'',
 			remark:this.validateSpecimenForm.value.remark
 		};
+		if(this.specimenNameId){
+			data.sample.id = this.specimenNameId
+		}else{
+			delete data.sample
+		}
 		let queryType = null
 		if(this.specimenDetailId){
 			queryType = 'updData'

src/app/views/share-specimen/share-specimen-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ShareSpecimenComponent } from './share-specimen.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: ShareSpecimenComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ShareSpecimenRoutingModule { }

src/app/views/share-specimen/share-specimen.component.html

@@ -0,0 +1,182 @@
+<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-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'dept')" nzServerSearch nzShowSearch nzPlaceHolder="请选择科室" [(ngModel)]="dept">
+            <ng-container *ngFor="let option of hospitals1">
+              <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>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">标本名称</span>：
+          <input nz-input class="formItem" [(ngModel)]="specimenName" placeholder="请输入标本名称" nzSize="default" />
+        </div>
+				<div class="list-template__searchItem">
+				  <span class="label label--big">是否包含位置</span>：
+					<nz-radio-group [(ngModel)]="containPosition">
+						<label nz-radio nzValue="1">是</label>
+						<label nz-radio nzValue="0">否</label>
+					</nz-radio-group>
+				</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 ml8 default" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn ml8 default" (click)="showModal()">新增</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="5%">序号</th>
+            <th>标本名称</th>
+            <th>位置</th>
+            <th>系统</th>
+            <th>部位</th>
+            <th>是否包含位置</th>
+            <th>关联科室</th>
+            <th nzWidth="120px">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.specimenName||'-' }}</td>
+            <td>{{ data.position && data.position.name||'-' }}</td>
+            <td>{{ data.system && data.system.name||'-'}}</td>
+            <td>{{ data.organ && data.organ.name||'-' }}</td>
+            <td>{{ data.containPosition==1?'是':'否' }}</td>
+            <td>{{ data.dept && data.dept.dept }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="del(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>
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal" (click)="clickExtra($event)">
+  <div class="modalBody">
+    <div class="title">常用标本名称 - {{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="deptId">关联科室</nz-form-label>
+          <nz-form-control nzErrorTip="请选择关联科室!">
+            <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'dept')" nzServerSearch nzShowSearch nzPlaceHolder="请选择关联科室" formControlName="deptId">
+							  <ng-container *ngFor="let option of hospitals1">
+							    <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>
+				<nz-form-item>
+          <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="containPosition">是否包含位置</nz-form-label>
+          <nz-form-control nzErrorTip="请选择是否包含位置!">
+            <nz-input-group>
+              <nz-radio-group formControlName="containPosition" (ngModelChange)="radioChange()">
+              	<label nz-radio nzValue="1">是</label>
+              	<label nz-radio nzValue="0">否</label>
+              </nz-radio-group>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item *ngIf="validateForm.value.containPosition==1">
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="positionId">位置</nz-form-label>
+				  <nz-form-control nzErrorTip="请填写位置!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择位置" formControlName="positionId">
+							  <ng-container *ngFor="let option of placeList">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="systemId">系统</nz-form-label>
+          <nz-form-control nzErrorTip="请填写系统!">
+            <nz-input-group>
+							<nz-select class="formItem" (ngModelChange)="systemChange()" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择系统" formControlName="systemId">
+							  <ng-container *ngFor="let option of systemList">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="organId">部位</nz-form-label>
+          <nz-form-control nzErrorTip="请填写部位!">
+            <nz-input-group>
+        			<nz-select class="formItem" (ngModelChange)="apparatusChange()" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择部位" formControlName="organId">
+        			  <ng-container *ngFor="let option of apparatusList">
+        			    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        			  </ng-container>
+        			</nz-select>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="specimenName">标本名称</nz-form-label>
+						<nz-form-control nzErrorTip="请填写标本名称!" style="display: inline-block;width:100%;" class="address">
+						  <nz-input-group>
+						    <input class="formItem addressFocus" nz-input formControlName="specimenName" placeholder="请选择标本名称" (focus)="focusAddress()" />
+						    <div class="addressList" *ngIf="validateForm.value.organId && isShowAddressList">
+						      <ng-container *ngIf="!addressLoading && specimenNameList.length">
+						        <div class="addressItem ellipsis-oneline" *ngFor="let item of specimenNameList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
+						      </ng-container>
+						      <div *ngIf="!addressLoading && !specimenNameList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+						        <nz-empty></nz-empty>
+						      </div>
+						      <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+						        <nz-spin nzSimple></nz-spin>
+						      </div>
+						    </div>
+						  </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+      </form>
+    </overlay-scrollbars>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
+  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="您确认要删除吗？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet (deactivate)="getList()"></router-outlet>
+

src/app/views/share-specimen/share-specimen.component.less

@@ -0,0 +1,155 @@
+@import "../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 60%;
+    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: 40%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+					.address{
+					  position: relative;
+					  .addressList{
+					    position: absolute;
+					    top: 100%;
+					    left: 0;
+					    width: 100%;
+					    max-height: 256px;
+					    z-index: 2;
+					    background: #fff;
+					    border: 1px solid #d9d9d9;
+					    border-radius: 4px;
+					    overflow: hidden auto;
+					    .addressItem{
+					      padding: 5px 12px;
+					      cursor: pointer;
+					      &:hover{
+					        background-color: #e9f7e9;
+					      }
+					    }
+					  }
+					}
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/share-specimen/share-specimen.component.ts

@@ -0,0 +1,420 @@
+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 { forkJoin, Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from "ng-zorro-antd";
+
+@Component({
+  selector: "app-share-specimen",
+  templateUrl: "./share-specimen.component.html",
+  styleUrls: ["./share-specimen.component.less"],
+})
+export class ShareSpecimenComponent 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
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  dept: any; //所属科室
+  drugCode; //编号
+  name; //名称
+  userType: any; //用户类型
+  hosId: any; //院区（搜索）
+  userGroup; //所属组
+  userGroup1; //所属组(搜索)
+  userTypes: Array<any>; //所有用户类型
+  alldepart: any = []; //所有所属科室
+  alldepart1: any = []; //所有所属科室(搜索)
+  hospitals1: any = []; //院区列表(搜索)
+	drugTypeData: any = []; //药品类型
+  allUserGroup: Array<any>; //所有用户组
+  allUserGroup1: Array<any>; //用户组(搜索)
+  allUserRole: Array<any>; //所有角色
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  wxRequired = false; //新增或编辑用户的时候，微信号是否必填
+  changeInpSubject = new Subject(); //防抖
+	searchParentDeptSubject = new Subject();
+	specimenName:any = null;
+	containPosition:any = null;
+	placeList:any = [];
+	systemList:any = [];
+	apparatusList:any = [];
+	specimenNameList:any = [];
+	addressLoading:any = false;
+	
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isDeptLoading = true;
+			this.getDeparts(e[0])
+		});
+    this.initForm();
+		this.getDeparts('');
+		this.getList();
+		this.getSourceData();
+		this.getSysData();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.dept = null;
+    this.containPosition = null;
+		this.specimenName = null
+    this.getList();
+  }
+	
+  // 表格数据
+  loading1 = false;
+  getList() {
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      pathologySpecimenName: {
+        deptId: this.dept,
+				specimenName: this.specimenName,
+        containPosition: this.containPosition
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "pathologySpecimenName", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+	
+	// 获取科室
+	getDeparts(dept) {
+	  let data:any = {
+	    department: {
+				dept,
+	      hosIds: this.hosId,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isDeptLoading = false
+				this.hospitals1 = data.list
+	    });
+	}
+	
+	// 搜索科室
+	isDeptLoading = false;
+	changeInp(e,type) {
+	  this.searchParentDeptSubject.next([e,type]);
+	}
+	
+	// 获取标本-位置来源
+	getSourceData(){
+		this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
+			this.placeList = res
+		});
+	}
+	
+	// 获取标本-系统
+	getSysData(){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 1,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+		    this.systemList = data.list;
+		  });
+	
+	}
+	
+	// 获取标本-器官
+	getApparatusData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 2,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("simple/data", "dictionaryTree", postData)
+		  .subscribe((data) => {
+				this.apparatusList = data.list;
+				if(type=='edit'){
+					this.validateForm.controls.organId.setValue(item.organ.id)
+					setTimeout(_=>{
+						this.loading1 = false
+						this.modal = true
+					},50)
+				}
+		  });
+	}
+	
+	// 获取标本-标本名称
+	getSpNameData(id,item,type){
+		let postData: any = {
+		  idx: 0,
+		  sum: 9999,
+		  dictionaryTree: {
+		    level: 3,
+				parent:id,
+		    key: 'pathology_specimen',
+		    deleted: 0,
+		  },
+		};
+		this.addressLoading = true;
+		postData.dictionaryTree.key = 'pathology_specimen'
+		postData.dictionaryTree.parent = id
+		postData.dictionaryTree.level = 3
+		this.mainService.getFetchDataList("simple/data", "dictionaryTree", postData)
+		.subscribe((data) => {
+			this.addressLoading = false;
+			this.specimenNameList = data.list;
+			if(type=='edit'){
+				this.validateForm.controls.specimenName.setValue(item.specimenName);
+			}
+		});
+	}
+	
+	// 点击其他位置
+	clickExtra(e){
+	  if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
+	    this.isShowAddressList = false;
+	  }
+	}
+	
+	// 标本名称获取焦点
+	isShowAddressList:boolean = false;
+	focusAddress(){
+	  this.isShowAddressList = true;
+	  this.getSpNameData(this.validateForm.value.organId,{},'select')
+	}
+	
+	// 选择标本名称
+	selectAddress(name){
+	  this.validateForm.controls.specimenName.setValue(name)
+	  this.isShowAddressList = false;
+	}
+	
+	// 编辑标本
+	specimenDetailId:any = null;
+	specimenEdit(e,item,index){
+		this.specimenDetailId = item.id
+		if(item.system && item.organ){
+			this.getApparatusData(item.system.id,item,'edit')
+			this.getSpNameData(item.organ.id,item,'edit')
+		}else{
+			this.getSpNameData(item.specimenId,item,'edit')
+		}
+	}
+	
+	// 选择系统
+	systemChange(){
+		if(this.validateForm.value.organId){
+			this.validateForm.controls.organId.reset()
+			this.validateForm.controls.organId.markAsPristine();
+			this.validateForm.controls.organId.updateValueAndValidity()
+		}
+		this.getApparatusData(this.validateForm.value.systemId,{},'select')
+	}
+	
+	// 选择器官
+	apparatusChange(){
+		if(this.validateForm.value.specimenName){
+			this.validateForm.controls.specimenName.reset()
+			this.validateForm.controls.specimenName.markAsPristine();
+			this.validateForm.controls.specimenName.updateValueAndValidity()
+		}
+		this.getSpNameData(this.validateForm.value.organId,{},'select')
+	}
+	
+  // 新增弹框
+  showModal() {
+    this.add = true;
+		this.modal = true
+    this.initForm();
+  }
+  hideModal() {
+    this.modal = false;
+    this.initForm();
+  }
+	
+	// 新增/编辑选择是否包含位置
+	radioChange(e:any){
+		if(this.validateForm.value.containPosition==1){
+			this.validateForm.addControl(
+				'positionId',
+				new FormControl('1', Validators.required)
+			);
+		}else{
+			this.validateForm.removeControl('positionId')
+		}
+	}
+	
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+			deptId: [null, [Validators.required]],
+			containPosition:['1', [Validators.required]],
+      specimenName: [null, [Validators.required]],
+      organId: [null, [Validators.required]],
+      systemId: [null, [Validators.required]],
+      positionId: [null, [Validators.required]],
+    });
+  }
+	
+  // 表单提交
+  submitForm(): void {
+    var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+    let data = {
+			pathologySpecimenName:{
+				...this.validateForm.value,
+				id:0,
+			}
+    };
+    if (!that.add) {
+      data.pathologySpecimenName.id = that.coopId;
+    }else{
+			delete data.pathologySpecimenName.id
+		}
+		that.btnLoading = true;
+    that.mainService
+      .dataPost("addData", "pathologySpecimenName", data)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideModal();
+        that.initForm();
+        if (data.status == 200) {
+          that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+        } else {
+          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
+  }
+
+  // 编辑
+  edit(data) {
+		this.add = false
+		this.loading1 = true
+		this.coopId = data.id;
+		if(data.containPosition==1){
+			this.validateForm.addControl(
+				'positionId',
+				new FormControl('1', Validators.required)
+			);
+			this.validateForm.controls.positionId.setValue(data.position.id);
+		}else{
+			this.validateForm.removeControl('positionId')
+		}
+		this.validateForm.controls.deptId.setValue(data.dept.id);
+    this.validateForm.controls.containPosition.setValue(data.containPosition + '');
+    this.validateForm.controls.specimenName.setValue(data.specimenName);
+		this.validateForm.controls.systemId.setValue(data.system.id)
+		if(data.system && data.organ){
+			this.getApparatusData(data.system.id,data,'edit')
+			this.getSpNameData(data.organ.id,data,'edit')
+		}
+  }
+
+  // 删除
+  delModal: boolean = false; //删除模态框
+  del(data) {
+    let that = this;
+    that.coopId = data.id;
+    that.delModal = true;
+  }
+	
+	// 取消删除弹框
+	cancelDel(){
+		this.hideDelModal();
+	}
+	
+  // 确认删除
+  confirmDel() {
+    let that = this;
+    that.btnLoading = true;
+    that.mainService
+      .apiPublicData('rmvData', 'pathologySpecimenName', [this.coopId])
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideDelModal();
+        if (data["status"] == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data["msg"]);
+        }
+      });
+  }
+	
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	  this.getList();
+	}
+	
+  // 关闭删除模态框
+  hideDelModal() {
+    this.delModal = false;
+  }
+}
+

src/app/views/share-specimen/share-specimen.module.ts

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