|
|
@@ -180,6 +180,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
180
|
180
|
}
|
|
181
|
181
|
|
|
182
|
182
|
// 标本条码搜索
|
|
|
183
|
+ codeDataSpecimenList:any = null;
|
|
183
|
184
|
searchSpecimen(e){
|
|
184
|
185
|
if(!this.barCode){
|
|
185
|
186
|
return
|
|
|
@@ -201,6 +202,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
201
|
202
|
if(!item.fixationTime && this.codeData.pathologyFormType==0){
|
|
202
|
203
|
if(this.codeData.status.value==2 || this.codeData.status.value==3 ||
|
|
203
|
204
|
this.codeData.status.value==4){
|
|
|
205
|
+ this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList.filter(i=>!i.fixationTime)
|
|
204
|
206
|
if(this.codeData.pathologyInspectDTOS){
|
|
205
|
207
|
this.project = this.codeData.pathologyInspectDTOS.map(i=>{
|
|
206
|
208
|
return i.inspectProject.name
|
|
|
@@ -270,6 +272,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
270
|
272
|
fixationDate: [null, [Validators.required]],
|
|
271
|
273
|
jobNumber: [null, [Validators.required]],
|
|
272
|
274
|
name:[null, [Validators.required]],
|
|
|
275
|
+ // nurseJobNumber: [null, [Validators.required]],
|
|
|
276
|
+ // nurseName:[null, [Validators.required]],
|
|
273
|
277
|
fixative:[null, [Validators.required]],
|
|
274
|
278
|
});
|
|
275
|
279
|
let date = new Date();
|
|
|
@@ -303,7 +307,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
303
|
307
|
|
|
304
|
308
|
cancelSpecimenModal(){
|
|
305
|
309
|
let ids = []
|
|
306
|
|
- for(let i of this.codeData.pathologySpecimenDTOList){
|
|
|
310
|
+ for(let i of this.codeDataSpecimenList){
|
|
307
|
311
|
ids.push(i.id)
|
|
308
|
312
|
}
|
|
309
|
313
|
let data = {
|
|
|
@@ -510,8 +514,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
510
|
514
|
}
|
|
511
|
515
|
|
|
512
|
516
|
// 输入工号查询姓名
|
|
513
|
|
- handoverUserId:any = null;
|
|
514
|
|
- numberChange(e){
|
|
|
517
|
+ handoverUserId:any = null; //医生工号
|
|
|
518
|
+ handoverNurseUserId:any = null; //护士工号
|
|
|
519
|
+ numberChange(e,type){
|
|
515
|
520
|
if(e.length < 3) {
|
|
516
|
521
|
this.validateVerificationForm.controls.name.setValue('');
|
|
517
|
522
|
return
|
|
|
@@ -523,12 +528,21 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
523
|
528
|
.jobSearch(query)
|
|
524
|
529
|
.subscribe((data:any) => {
|
|
525
|
530
|
if(data.status==200){
|
|
526
|
|
- this.validateVerificationForm.controls.name.setValue(data.userName);
|
|
527
|
|
- this.handoverUserId = data.userId
|
|
|
531
|
+ if(type==1){
|
|
|
532
|
+ this.validateVerificationForm.controls.name.setValue(data.userName);
|
|
|
533
|
+ this.handoverUserId = data.userId
|
|
|
534
|
+ }else{
|
|
|
535
|
+ this.validateVerificationForm.controls.nurseName.setValue(data.userName);
|
|
|
536
|
+ this.handoverNurseUserId = data.userId
|
|
|
537
|
+ }
|
|
528
|
538
|
}else{
|
|
529
|
|
- this.validateVerificationForm.controls.name.setValue('');
|
|
530
|
|
- this.handoverUserId =null
|
|
531
|
|
- // this.message.error(data.data)
|
|
|
539
|
+ if(type==1){
|
|
|
540
|
+ this.validateVerificationForm.controls.name.setValue('');
|
|
|
541
|
+ this.handoverUserId = null
|
|
|
542
|
+ }else{
|
|
|
543
|
+ this.validateVerificationForm.controls.nurseName.setValue('');
|
|
|
544
|
+ this.handoverNurseUserId = null
|
|
|
545
|
+ }
|
|
532
|
546
|
}
|
|
533
|
547
|
});
|
|
534
|
548
|
}
|
|
|
@@ -540,7 +554,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
|
|
540
|
554
|
this.validateVerificationForm.controls[i].updateValueAndValidity();
|
|
541
|
555
|
}
|
|
542
|
556
|
if (this.validateVerificationForm.invalid) return;
|
|
543
|
|
- let str = this.codeData.pathologySpecimenDTOList.map(i=>{
|
|
|
557
|
+ let str = this.codeDataSpecimenList.map(i=>{
|
|
544
|
558
|
return i.specimenCode
|
|
545
|
559
|
})
|
|
546
|
560
|
let data: any = {
|
