标本快捷方式开发

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

@@ -51,7 +51,7 @@
 						</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 class="specimen-list" [title]="item.specimenName" *ngFor="let item of specimenNameData; let index = index" (click)="fastSpecimenClick($event,item,index)"><span class="red" *ngIf="item.containPosition==0">*&nbsp; </span><span class="specimenName">{{item.specimenName}}</span></div>
 					</div>
 					<!-- <nz-form-item class="form-item">
 						<nz-form-label nzRequired nzFor="surgicalPlan" [nzSm]="24" [nzXs]="24">手术方案</nz-form-label>

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

@@ -150,6 +150,27 @@
 						padding-top: 10px;
 					}
 					
+					.specimen-list{
+						display: flex;
+						flex-wrap: wrap;
+						.specimen-item{
+							display: flex;
+							width: 50%;
+							margin-bottom: 10px;
+							.specimen-name{
+								cursor: pointer;
+							}
+							.specimen-icon{
+								color: #64BD7B;
+								cursor: pointer;
+								font-size: 20px;
+								position: relative;
+								top: -4px;
+								left: 2px;
+							}
+						}
+					}
+					
 					.specimen-box{
 						display: flex;
 						// justify-content: space-between;
@@ -159,6 +180,8 @@
 							width: 25%;
 							margin-top: 10px;
 							cursor: pointer;
+						}
+						.specimenName{
 							text-decoration: underline;
 							color: #64BD7B;
 						}
@@ -199,21 +222,6 @@
 					border-right: 1px solid #e5e9ed;
 					margin-top: 10px;
 				}
-				.specimen-item{
-					display: flex;
-					margin-bottom: 10px;
-					.specimen-name{
-						cursor: pointer;
-					}
-					.specimen-icon{
-						color: #64BD7B;
-						cursor: pointer;
-						font-size: 20px;
-						position: relative;
-						top: -4px;
-						left: 2px;
-					}
-				}
 			}
 		}
 		.mask-style{

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

@@ -69,7 +69,6 @@ export class PathologyAddComponent implements OnInit {
 		this.initForm()
 		this.getTaskTypesId()
 		this.fetchDataList()
-		this.getSpecimenName()
 		this.getStationaryLiquid()
   }
 	
@@ -171,6 +170,7 @@ export class PathologyAddComponent implements OnInit {
 				if(this.detailsData.intraoperativeFindings){
 					this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
 				}
+				this.getSpecimenName()
 				this.getProDicData()
 				this.getDicData()
 				this.getSampleData('load')
@@ -186,7 +186,7 @@ export class PathologyAddComponent implements OnInit {
 	    idx: 0,
 	    sum: 999,
 	    pathologySpecimenName: {
-	
+				deptId:this.detailsData.patientDTO.department.id
 	    }
 	  };
 	  this.mainService
@@ -233,6 +233,7 @@ export class PathologyAddComponent implements OnInit {
 			    }
 			  });
 		}else{
+			this.placeIndex = null
 			this.specimenEditType = 'fast'
 			this.specimenEdit(e, item, index, 'fast')
 		}

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

@@ -237,6 +237,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 
 	//tab切换
 	tabClick(type){
+		this.pageReceptionIndex = 1;
 		this.activeIndex = type
 		localStorage.setItem("pathologyActiveIndex",type)
 		this.getJsData(1)
@@ -583,6 +584,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 				}else{
 					this.notification.create('success','提示',res.msg);
 					this.activeIndex = 0
+					this.pageReceptionIndex = 1;
 					this.codeData = []
 					this.getJsData(1)
 				}
@@ -599,6 +601,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		this.multiModal = false;
 		this.errorMultiMsg = null;
 		this.muArr = [];
+		this.pageReceptionIndex = 1;
 		this.getJsData(1);
 		setTimeout(_=>{
 			document.getElementById('specimen').focus();

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

@@ -54,7 +54,7 @@
 					<div class="list">开单时间：{{item.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</div>
 				</div>
 			</div>
-			<div *ngIf="ifAddapplication && adviceList" class="center-box">
+			<div *ngIf="!pathologyFormCode && ifAddapplication && adviceList" class="center-box">
 				<button nz-button nzType="primary" class="btn txtC mr8" (click)="addPathology(0)" [nzLoading]="addLoading">新增病理申请单</button>
 			</div>
 		</div>
@@ -253,7 +253,7 @@
 			</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 class="specimen-list" *ngFor="let item of specimenNameData; let index = index" (click)="fastSpecimenClick($event,item,index)"><span class="red" *ngIf="item.containPosition==0">* </span><span class="specimenName">{{item.specimenName}}</span></div>
 			</div>
 			<div class="padding-top-10" *ngIf="activeIndex==1">
 				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
@@ -508,7 +508,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization">
+				<nz-form-item *ngIf="ifImmobilization && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
 				  <nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择固定时间!">
 				    <nz-input-group style="display: flex;gap: 10px">

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

@@ -774,6 +774,8 @@
 				.specimen-list{
 					margin-top: 10px;
 					cursor: pointer;
+				}
+				.specimenName{
 					text-decoration: underline;
 					color: #64BD7B;
 				}

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

@@ -219,7 +219,7 @@ export class PathologySampleComponent implements OnInit {
 	    idx: 0,
 	    sum: 999,
 	    pathologySpecimenName: {
-
+				deptId:this.deptId
 	    }
 	  };
 	  this.mainService
@@ -265,6 +265,7 @@ export class PathologySampleComponent implements OnInit {
 			    }
 			  });
 		}else{
+			this.placeIndex = null
 			this.specimenEditType = 'fast'
 			this.specimenEdit(e, item, index, 'fast')
 		}
@@ -552,7 +553,7 @@ export class PathologySampleComponent implements OnInit {
 	printLoading:any = false;
 	submitVerificationForm(){
 		let that = this
-		if(!this.fixationTimeSelect || this.fixationTimeSelect == null){
+		if(this.ifImmobilization && this.detailsData.pathologyFormType==0 && (!this.fixationTimeSelect || this.fixationTimeSelect == null)){
 			this.message.error('请选择固定时间')
 			return
 		}

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

@@ -77,7 +77,7 @@
   <div class="modalBody">
     <div class="title">常用标本名称 - {{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
-    <overlay-scrollbars #osComponentRef1 class="content">
+    <div 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>
@@ -145,7 +145,7 @@
 				  <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()" />
+						    <input class="formItem addressFocus" (ngModelChange)="specimenNameChange($event)" 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>
@@ -161,7 +161,7 @@
 				  </nz-form-control>
 				</nz-form-item>
       </form>
-    </overlay-scrollbars>
+    </div>
     <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>

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

@@ -38,7 +38,7 @@
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
-      overflow: hidden;
+      // overflow: hidden;
       margin-top: 12px;
 
       div {
@@ -93,7 +93,7 @@
         width: 100%;
         height: auto;
         padding: 19px 14px 0 14px;
-        max-height: 500px;
+        // max-height: 500px;
         overflow-y: auto;
 
         .addForm {
@@ -114,7 +114,7 @@
 					  position: relative;
 					  .addressList{
 					    position: absolute;
-					    top: 100%;
+					    bottom: 100%;
 					    left: 0;
 					    width: 100%;
 					    max-height: 256px;

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

@@ -225,6 +225,21 @@ export class ShareSpecimenComponent implements OnInit {
 		});
 	}
 	
+	// 标本名称输入查询
+	specimenNameChange(keyword){
+		if(keyword!=''){
+			const data = this.specimenNameList; 
+			const results = data.filter(item => item.name.indexOf(keyword) !== -1)
+			if(results){
+				this.specimenNameList = results
+			}else{
+				this.getSpNameData(this.validateForm.value.organId,{},'select')
+			}
+		}else{
+			this.getSpNameData(this.validateForm.value.organId,{},'select')
+		}
+	}
+	
 	// 点击其他位置
 	clickExtra(e){
 	  if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){