优化

src/app/services/main.service.ts

@@ -1211,4 +1211,11 @@ export class MainService {
 		});
 	}
 
+  // 标本打包-标本包里的标本的所有终点科室列表
+	getSpePackageEndDeptList(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/getSpePackageEndDeptList`, data, {
+		  headers: this.headers,
+		});
+	}
+
 }

src/app/share/dialog-delete/dialog-delete.component.html

@@ -1,5 +1,5 @@
 <!-- 删除模态框 -->
-<div class="dialog-delete" *ngIf="delModal" [ngStyle]="{'z-index': isSelected ? '9' : '9999999'}">
+<div class="dialog-delete" *ngIf="delModal" [ngStyle]="{'z-index': isSelected ? '9' : '999'}">
   <div class="modalBody" [ngStyle]="{'height': isSelected ? 'auto' : '220px'}">
     <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal('x')"></i></div>
     <div class="content">
@@ -21,6 +21,17 @@
           </nz-option>
         </nz-select>
       </div>
+      <div *ngIf="isShowEndDeptId" class="mt8 mb8 w100">
+        <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptId">
+          <ng-container *ngFor="let option of isShowEndDeptIdArr">
+            <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+          </ng-container>
+          <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+            <i nz-icon nzType="loading" class="loading-icon"></i>
+            搜索中...
+          </nz-option>
+        </nz-select>
+      </div>
     </div>
     <div class="operate">
       <button nz-button nzType="primary" (click)="cancel('cancel')" *ngIf="!isShowConfirm">知道了</button>

src/app/share/dialog-delete/dialog-delete.component.less

@@ -46,6 +46,7 @@
       flex-direction: column;
       align-items: center;
       justify-content: center;
+      padding: 0 16px;
 
       .defeat{
         width: 100%;

src/app/share/dialog-delete/dialog-delete.component.ts

@@ -22,11 +22,14 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
   @Input() deptDisplay: number = 0;
   @Input() isShowConfirm: boolean = true;
   @Input() isShowConfirmInfo: string = '';
+  @Input() isShowEndDeptId: boolean = false;
+  @Input() isShowEndDeptIdArr: any[] = [];
   constructor(private message: NzMessageService) {}
 
   isRemandClean:boolean = true;
   isLoading:boolean = false;
   recoveryRoom:any = null;
+  endDeptId:any = null;
 
   ngOnInit() {}
 
@@ -36,6 +39,9 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
       this.isLoading = false;
       // this.recoveryRoom = null;
     }
+    if(changes.isShowEndDeptId){
+      this.endDeptId = null;
+    }
     if(changes.isSelected && changes.isSelectedArr){
       if(changes.isSelectedArr.currentValue.length === 1){
         this.recoveryRoom = changes.isSelectedArr.currentValue[0].id;
@@ -55,6 +61,10 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
       this.message.info('请选择苏醒科室！');
       return;
     }
+    if(this.isShowEndDeptId && !this.endDeptId){
+      this.message.info('请选择终点科室！');
+      return;
+    }
     let data:any = {};
     if(this.isChecked){
       data.isRemandClean = this.isRemandClean;
@@ -62,6 +72,9 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
     if(this.isSelected){
       data.recoveryRoom = this.recoveryRoom;
     }
+    if(this.isShowEndDeptId){
+      data.endDeptId = this.endDeptId;
+    }
     this.confirmDelEvent.emit(data);
   }
 

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -84,7 +84,7 @@
       </div>
       <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
       <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
-      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.endDeptNames}}</div>
+      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
       <div style="display: flex;flex-wrap: wrap;">
         <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
       </div>

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

@@ -69,7 +69,7 @@
 
 <!-- 删除模态框 -->
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+(confirmDelEvent)="confirmDel($event)" [content]="tipsMsg1" [isShowEndDeptId]="isShowEndDeptId" [isShowEndDeptIdArr]="isShowEndDeptIdArr"></app-dialog-delete>
 
 <app-package-specimen-rule *ngIf="isShowPackageSpecimenRule" (cancelFlagHand)="closePackageSpecimenRule($event)"></app-package-specimen-rule>
 
@@ -88,7 +88,7 @@
       </div>
       <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
       <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
-      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.endDeptNames}}</div>
+      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
       <div style="display: flex;flex-wrap: wrap;">
         <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
       </div>

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

@@ -105,14 +105,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           this.total = result.totalCount;
           this.typeSpecimentList = result.tube || [];
           this.patientSpecimentList = result.patient || [];
-          let packageDTO:any = result.package || {};
-          if(packageDTO.endDeptList){
-            packageDTO.endDeptNames = packageDTO.endDeptList.map(v => v.dept).toString();
-          }else{
-            packageDTO.endDeptNames = "";
-          }
-          this.package = packageDTO;
-
+          this.package = result.package || {};
           this.getList();
         }
       })
@@ -143,9 +136,11 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
   // 隐藏删除框
   hideDelModal() {
     this.delModal = false;
+    this.isShowEndDeptId = false;
   }
   // 确认删除
-  confirmDel() {
+  confirmDel(e) {
+    console.log(e)
     this.btnLoading = true;
     if (this.confirmDelType === "del") {
       //删除-移除标本
@@ -184,29 +179,24 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
         });
     }else if (this.confirmDelType === "package") {
       //打包
-      if(this.configs.spePackageCreateOrder == 1){
-        // 生成配送工单
-        let postData = {
-          type: 'specimenPackage',
-          id: this.package.id,
-        }
-
-        this.mainService
-          .createOrTakeOrderSpecimen(postData)
-          .subscribe((data:any) => {
-            this.btnLoading = false;
-            this.delModal = false;
-            if (data.state == 200) {
-              this.printPackage();
-            } else {
-              this.message.error(data.msg || "操作失败");
-            }
-          });
-      }else{
-        this.btnLoading = false;
-        this.delModal = false;
-        this.printPackage();
+      let postData = {
+        type: 'specimenPackage',
+        id: this.package.id,
+        endDeptId: e.endDeptId,
       }
+
+      this.mainService
+        .createOrTakeOrderSpecimen(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          this.isShowEndDeptId = false;
+          if (data.state == 200) {
+            this.printPackage();
+          } else {
+            this.message.error(data.msg || "操作失败");
+          }
+        });
     }
   }
 
@@ -221,6 +211,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           this.typeSpecimentList = data.tube || [];
           this.patientSpecimentList = data.patient || [];
           this.package = data.package || {};
+
           this.base64 = data.base64 || '';
 
           this.message.success("操作成功");
@@ -235,8 +226,26 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
   }
 
   // 打包
+  isShowEndDeptId:boolean = false;
   packageHandler(){
-    this.showDelModal({}, `你确认要打包${this.total}只标本吗？`,'打包','package')
+    this.isShowEndDeptId = true;
+    this.getSpePackageEndDeptList();
+  }
+
+  // 查询标本包里的所有终点克是
+  isShowEndDeptIdArr:any[] = [];
+  getSpePackageEndDeptList(){
+    this.mainService
+      .getSpePackageEndDeptList({packageId: this.package.id})
+      .subscribe((data:any) => {
+        if (data.state == 200) {
+          this.isShowEndDeptIdArr = data.data;
+
+          this.showDelModal({}, `你确认要打包${this.total}只标本吗？`,'打包','package')
+        } else {
+          this.message.error(data.msg || "操作失败");
+        }
+      });
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）

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

@@ -53,7 +53,7 @@
             <th nzWidth="10%">包号</th>
             <th nzWidth="10%">打包人</th>
             <th nzWidth="10%">打包科室</th>
-            <th nzWidth="10%">终点科室</th>
+            <th nzWidth="10%">检验科室</th>
             <th nzWidth="10%">标本数</th>
             <th nzWidth="10%">配送人|配送时间</th>
             <th nzWidth="10%">接收人|接收时间</th>