标本打包打印字段修改

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

@@ -83,7 +83,8 @@
         </div>
       </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;">打包科室：{{package.packDeptDTO?.dept}}</div>
+      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.endDeptNames}}</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/share/specimen-package-list-modal/specimen-package-list-modal.component.ts

@@ -104,7 +104,14 @@ export class SpecimenPackageListModalComponent implements OnInit {
         if (data.state == 200) {
           this.typeSpecimentList = data.tube || [];
           this.patientSpecimentList = data.patient || [];
-          this.package = data.package || {};
+          let packageDTO:any = data.package || {};
+          if(packageDTO.endDeptList){
+            packageDTO.endDeptNames = packageDTO.endDeptList.map(v => v.dept).toString();
+          }else{
+            packageDTO.endDeptNames = "";
+          }
+          this.package = packageDTO;
+
           this.base64 = data.base64 || '';
 
           this.message.success("操作成功");

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

@@ -87,7 +87,8 @@
         </div>
       </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;">打包科室：{{package.packDeptDTO?.dept}}</div>
+      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.endDeptNames}}</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,7 +105,13 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           this.total = result.totalCount;
           this.typeSpecimentList = result.tube || [];
           this.patientSpecimentList = result.patient || [];
-          this.package = result.package || {};
+          let packageDTO:any = result.package || {};
+          if(packageDTO.endDeptList){
+            packageDTO.endDeptNames = packageDTO.endDeptList.map(v => v.dept).toString();
+          }else{
+            packageDTO.endDeptNames = "";
+          }
+          this.package = packageDTO;
 
           this.getList();
         }

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

@@ -18,9 +18,9 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label">收取人</span>：
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择收取人" [(ngModel)]="searchDto.receiveUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
-            <ng-container *ngFor="let option of receiveUserList">
+          <span class="label">配送人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择配送人" [(ngModel)]="searchDto.deliveryUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
+            <ng-container *ngFor="let option of deliveryUserList">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

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

@@ -99,7 +99,7 @@ export class SpecimenPackageComponent implements OnInit {
         hosId: this.currentHospital.id,
         busiType: 'specimen',//标本打包
         status: this.searchDto.status ? { id: this.searchDto.status } : undefined,
-        receiveUser: this.searchDto.receiveUser || undefined,
+        deliveryUser: this.searchDto.deliveryUser || undefined,
         packDept: this.searchDto.packDept || undefined,
         startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
         endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
@@ -144,7 +144,7 @@ export class SpecimenPackageComponent implements OnInit {
     if(type === 'department'){
       this.searchTimer(this.getDeptList, e);
     }else if(type === 'patient'){
-      this.searchTimer(this.getReceiveUserList, e);
+      this.searchTimer(this.getDeliveryUserList, e);
     }
   }
 
@@ -181,12 +181,12 @@ export class SpecimenPackageComponent implements OnInit {
 
   openChangePatient(flag){
     flag && this.setIsSelecting(false);
-    flag && this.getReceiveUserList();
+    flag && this.getDeliveryUserList();
   }
 
-  // 获取收取人
-  receiveUserList: any = [];
-  getReceiveUserList(e = undefined) {
+  // 获取配送人
+  deliveryUserList: any = [];
+  getDeliveryUserList(e = undefined) {
     let postData = {
       idx: 0,
       sum: 20,
@@ -200,7 +200,7 @@ export class SpecimenPackageComponent implements OnInit {
       .getFetchDataList("simple/data", "user", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.receiveUserList = data.list || [];
+        this.deliveryUserList = data.list || [];
       });
   }