Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/app-routing.module.ts

@@ -206,6 +206,11 @@ const routes: Routes = [
     loadChildren: () => import('./views/inspect-closed-loop-view/inspect-closed-loop-view.module').then(m => m.InspectClosedLoopViewModule),
     canActivate: [InspectClosedLoopViewGuard]
   },
+  // 标本打包
+  {
+    path: 'batchSpecimen',
+    loadChildren: () => import('./views/batch-specimen/batch-specimen.module').then(m => m.BatchSpecimenModule),
+  },
   // 临时路由
   {
     path: "redirect",

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -49,13 +49,13 @@
                   <nz-form-label class="label">必须扫描动态二维码</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="arriveScanDynamicCode"></nz-checkbox-group>
                 </div>
-								
+
 								<!-- 输入动态数字密钥 -->
 								<div class="display_flex align-items_center mb8" *ngIf="arriveScanCode[0].checked">
 								  <nz-form-label class="label">输入动态数字密钥</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="enterDynamicDigitalKey"></nz-checkbox-group>
 								</div>
-								
+
                 <!-- 退回标本是否填写交接人 -->
                 <div class="display_flex align-items_center mb8">
                   <nz-form-label class="label">退回标本是否填写交接人</nz-form-label>
@@ -209,7 +209,7 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 手术病理标签样式 -->
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">手术病理标签样式</nz-form-label>
@@ -219,7 +219,7 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 速冻标本数量控制 -->
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">速冻标本数量控制</nz-form-label>
@@ -228,7 +228,7 @@
 										<label nz-radio [nzValue]="0">多只</label>
 									</nz-radio-group>
 								</div>
-								
+
 								<!-- 提示语 -->
 								<div class="display_flex align-items_center mb8" *ngIf="pathologyFrozenSpecimenNum==1">
 									<nz-form-label class="label">提示语</nz-form-label>
@@ -251,6 +251,167 @@
 						</div>
 					</div>
 				</div>
+        <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='specimenPackage'">
+					<div class="taskTypeInfo">
+            <div class="top">
+              <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+                特性配置
+              </div>
+              <div class="item" (click)="tabModal('nursePackage')" [ngClass]="{'items':tabModalName=='nursePackage'}">
+                护士打包配置
+              </div>
+              <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+                自动建单配置
+              </div>
+            </div>
+            <div class="list" *ngIf="!loading">
+              <!-- 特性配置 -->
+              <div *ngIf="tabModalName=='characteristics'">
+                <!-- 是否联合标本收取 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">是否联合标本收取</nz-form-label>
+                  <nz-radio-group [(ngModel)]="spePackageUnionReceive">
+                    <label nz-radio [nzValue]="1">是</label>
+                    <label nz-radio [nzValue]="0">否</label>
+                  </nz-radio-group>
+                </div>
+                <!-- 关联任务类型 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">关联任务类型</nz-form-label>
+                  {{tasktype.taskName}}
+                </div>
+                <!-- 工单模式 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label" nzRequired>工单模式</nz-form-label>
+                  <nz-radio-group [(ngModel)]="spePackageModel">
+                    <label nz-radio [nzValue]="item.value" *ngFor="let item of spePackageModelList">{{ item.label }}</label>
+                  </nz-radio-group>
+                </div>
+                <!-- 支持建单并签到 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">支持建单并签到</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="drugsCreateSign"></nz-checkbox-group>
+                </div>
+                <!-- 支持接单并签到 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">支持接单并签到</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="drugsReceiveSign"></nz-checkbox-group>
+                </div>
+
+                <!-- 起点科室支持核对 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">起点科室支持核对</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="drugsStartCheck" (ngModelChange)="changeDrugsStartCheck($event)"></nz-checkbox-group>
+                </div>
+                <ng-container *ngIf="drugsStartCheck[0].checked">
+                  <!-- 核对方式 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="drugsStartCheckScanIds"></nz-checkbox-group>
+                  </div>
+                  <!-- 手动填写 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">手动填写</nz-form-label>
+                    <nz-select class="w320px" nzPlaceHolder="请选择手动填写" [(ngModel)]="drugsStartManual" nzAllowClear>
+                      <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                    </nz-select>
+                  </div>
+                </ng-container>
+
+                <!-- 终点科室支持核对 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">终点科室支持核对</nz-form-label>
+                  <nz-checkbox-group [nzDisabled]="true" [(ngModel)]="drugsEndCheck" (ngModelChange)="changeDrugsEndCheck($event)"></nz-checkbox-group>
+                </div>
+                <ng-container *ngIf="drugsEndCheck[0].checked">
+                  <!-- 核对方式 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label" nzRequired>核对方式</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="drugsEndCheckScanIds"></nz-checkbox-group>
+                  </div>
+                  <!-- 手动填写 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">手动填写</nz-form-label>
+                    <nz-select class="w320px" nzPlaceHolder="请选择手动填写" [(ngModel)]="drugsEndManual" nzAllowClear>
+                      <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                    </nz-select>
+                  </div>
+                </ng-container>
+              </div>
+              <!-- 护士打包配置 -->
+              <div *ngIf="tabModalName=='nursePackage'">
+                <!-- 是否自动打包 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">自动打包</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePackageAutoPack" (ngModelChange)="changeSpePackageAutoPack($event)"></nz-checkbox-group>
+                </div>
+
+                <ng-container *ngIf="spePackageAutoPack[0].checked">
+                  <!-- 自动关联普标急标 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">自动关联普标急标</nz-form-label>
+                    <nz-checkbox-group [(ngModel)]="spePackageUrgents"></nz-checkbox-group>
+                  </div>
+                  <!-- 自动关联科室 -->
+                  <div class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">自动关联科室</nz-form-label>
+                    <nz-select nzMode="multiple" style="width: 500px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
+                    (nzOnSearch)="changeDept($event)" nzPlaceHolder="请选择自动关联科室" [(ngModel)]="spePackageDeptIds" (nzOpenChange)="openDeptList($event)">
+                      <ng-container *ngFor="let option of deptList">
+                        <nz-option *ngIf="!isLoading" [nzLabel]="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 class="display_flex align-items_center mb8">
+                    <nz-form-label class="label">自动关联试管类型</nz-form-label>
+                    <nz-select nzMode="multiple" style="width: 500px;" nzPlaceHolder="请选择自动关联试管类型" [(ngModel)]="spePackageTubeIds" nzAllowClear>
+                      <nz-option *ngFor="let item of spePackageTubeList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
+                    </nz-select>
+                  </div>
+                </ng-container>
+
+                <!-- 清点方式 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">清点方式</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePackageInventoryTypes"></nz-checkbox-group>
+                </div>
+
+                <!-- 是否生成配送工单 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">生成配送工单</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePackageCreateOrder"></nz-checkbox-group>
+                </div>
+
+                <!-- 条码打印尺寸 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">条码打印尺寸</nz-form-label>
+                  <nz-select class="w320px" nzPlaceHolder="请选择条码打印尺寸" [(ngModel)]="spePackageCodeSize" nzAllowClear>
+                    <nz-option nzLabel="80*80" [nzValue]="1"></nz-option>
+                  </nz-select>
+                </div>
+              </div>
+              <!-- 自动建单配置 -->
+              <div *ngIf="tabModalName=='automaticOrderCreation'">
+                <!-- 自动建单 -->
+              </div>
+              <div class="bottom">
+                <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitSpecimenPackageForm()">保存</button>
+              </div>
+            </div>
+            <div class="list" *ngIf="loading">
+              <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+                <div class="loadingFullInner">
+                  <img src="../../../assets/images/loading.gif" alt="">
+                  <div>加载中...</div>
+                </div>
+              </div>
+            </div>
+          </div>
+				</div>
       </div>
     </div>
   </div>

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { MainService } from "../../../services/main.service";
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
-import { Subject } from 'rxjs';
+import { Subject, forkJoin } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 
 @Component({
@@ -15,22 +15,51 @@ export class ConfigurationSpecimenComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
-	
+
 	// tab类型
 	dictionaryKeyList:any[] = [
 		{
-			name:'检查标本',key:'examine'
+			name:'检验标本',key:'examine'
 		},
 		{
 			name:'病理标本',key:'pathology'
-		}
+		},
+    {
+      name:'标本打包',key:'specimenPackage'
+    }
 	];
-	
+
+  spePackageUnionReceive:any = undefined;//是否联合标本收取
+  spePackageModel:any = undefined;//工单模式
+  drugsCreateSign:any = [{ label:'是否开启', value: 0 }];//支持建单并签到
+  drugsReceiveSign:any = [{ label:'是否开启', value: 0 }];//支持接单并签到
+  drugsStartCheck:any = [{ label:'是否开启', value: 0 }];//起点科室支持核对
+  drugsStartCheckScanIds:any = [];//起点核对方式
+  drugsStartManual:any = undefined;//起点科室手动填写
+  drugsEndCheck:any = [{ label:'是否开启', value: 1 }];//终点科室支持核对
+  drugsEndCheckScanIds:any = [];//终点核对方式
+  drugsEndManual:any = undefined;//终点科室手动填写
+  spePackageAutoPack:any = [{ label:'是否开启', value: 0 }];//自动打包
+  spePackageUrgents:any[] = [{label: '急标', value: 1}, {label: '普标', value: 0}];//自动关联急标普标急标
+  spePackageTubeIds:any[] = [];// 自动关联试管类型
+  spePackageTubeList:any[] = [];// 自动关联试管类型列表
+  spePackageInventoryTypes:any[] = [{label: '患者', value: 1, disabled: true, checked: true}, {label: '试管', value: 2}];//清点方式
+  spePackageCreateOrder:any = [{ label:'是否开启', value: 0 }];//生成配送工单
+  spePackageCodeSize:any = undefined;//条码打印尺寸
+
+  // 工单模式
+  spePackageModelList:any[] = [
+    { label: '一单一包', value: 1 },
+  ];
+
+  // 手动填写
+  drugsManualList:any[] = [];
+
 	// 是否支持根据手术新建申请单
 	autoCreate:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 是否是否支持门诊新增申请单
 	outpatientCreatePathologyForm:any[] = [
 	  {label:'是否开启',value: 0}
@@ -41,7 +70,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	outpatientInVitroFixation:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
   // 扫描时指定科室不提醒勾选项
   deptNotAlert:any[] = [
     {label:'是否开启',value: 0}
@@ -56,12 +85,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
   arriveScanDynamicCode:any[] = [
     {label:'是否开启',value: 0}
   ];
-	
+
 	// 必须扫描动态二维码
 	enterDynamicDigitalKey:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
   // 退回标本是否填写交接人
   returnSpecimenWhetherHandover:any[] = [
     {label:'是否开启',value: 0}
@@ -86,48 +115,48 @@ export class ConfigurationSpecimenComponent implements OnInit {
   defaultScanSpe:any[] = [
     {label:'是否开启',value: 0}
   ];
-	
+
 	// 是否开通收取限制
 	speCollectLimit:any[] = [
     {label:'是否开启',value: 0}
   ];
-	
+
 	// 是否支持非起点科室收取
 	speCollectSupportNotStartDept:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 限制标本状态收取
 	speCollectLimitState:any = [];
-	
+
 	// 限制终点科室收取
 	speCollectLimitEndDept:any = [];
-	
+
 	// 限制普通或紧急收取
 	speCollectLimitUrgent:any = [];
-	
+
 	// 是否限制重复收取标本
 	speCollectLimitRepeat:any[]= [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 是否限制试管类型收取标本
 	speCollectLimitTubeType:any[];
-	
+
 	// 是否开始收取前进入配置页
 	speStartCollectShowConfig:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-	
+
 	// 速冻标本数量控制
 	pathologyFrozenSpecimenNum:any = '0';
-	
+
 	// 提示语
 	prompt:any;
-	
+
 	//申请单条码设置
 	pathologyBarCode:any;
-	
+
   // 配置
   configs:any = {};
   // 任务类型
@@ -152,7 +181,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
     this.getDeptList();
     this.getTaskType();
   }
-	
+
+
 	// 获取科室类型
 	deptItem:any;
 	getDeptDic(e:string = ''){
@@ -180,7 +210,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			  });
 		})
 	}
-	
+
 	getEndDeptData(e){
 		let data1 = {
 		  idx: 0,
@@ -198,31 +228,51 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		    this.endDeptData = res.list;
 		  });
 	}
-	
+
 	// 搜索起点科室
 	changeEndDept(e){
 		this.searchTimer(this.getEndDeptData, e);
 	}
-	
+
 	// 点击数据字典key
 	activeDictionaryKey:any = 'examine';
 	clickDictionaryKey(item){
 	  this.activeDictionaryKey = item.key;
+    this.tabModal('characteristics');
 		if(item.key=='examine'){
 			this.getDeptList();
 			this.getTaskType();
-		}else{
+		}else if(item.key=='pathology'){
 			this.getLabelDic()
 			this.getTaskTypesId()
+		}else if(item.key=='specimenPackage'){
+      this.getDeptList();
+      this.loading = true;
+      let drugs_bag_check_scan_type$ = this.mainService.getDictionary('list', 'drugs_bag_check_scan_type', true);
+      let drugs_bag_manual_type$ = this.mainService.getDictionary('list', 'drugs_bag_manual_type', true);
+      let specimen_tube_type$ = this.mainService.getDictionary('list', 'specimen_tube_type', true);
+      forkJoin(drugs_bag_check_scan_type$, drugs_bag_manual_type$, specimen_tube_type$).subscribe((data:any[]) => {
+        let drugs_bag_check_scan_type = data[0] || [];
+        let drugs_bag_manual_type = data[1] || [];
+        let specimen_tube_type = data[2] || [];
+
+        this.drugsStartCheckScanIds = drugs_bag_check_scan_type.map(v => ({ label:v.name, value: v.id }));
+        this.drugsEndCheckScanIds = drugs_bag_check_scan_type.map(v => ({ label:v.name, value: v.id }));
+        this.drugsManualList = drugs_bag_manual_type.map(v => ({ label:v.name, value: v.id }));
+
+        this.spePackageTubeList = specimen_tube_type.map(v => ({ label:v.name, value: v.id }));
+
+        this.getTaskTypeByOrdinary('specimenPackage')
+      })
 		}
 	}
-	
+
 	changeSpeCollect(e){
 		if(!e[0].checked){
-		  
+
 		}
 	}
-	
+
   // 扫描时指定科室不提醒勾选项
   changeDeptNotAlert(e){
     console.log(e);
@@ -241,6 +291,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
   // 用户输入搜索
   isLoading: boolean = false;
   deptNotAlertIds:any[] = [];
+  spePackageDeptIds:any[] = [];
   deptList:any[] = [];
   changeDept(e) {
     this.searchTimer(this.getDeptList, e);
@@ -280,7 +331,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
   tabModal(tabModalName:string){
     this.tabModalName = tabModalName;
   }
-	
+
 	//病理标本保存
 	submitPathologyForm(){
 		let postData:any = {
@@ -298,7 +349,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			},
 			surgeryPathologyLabelSize:{
 				id:this.surgeryPathologyLabelSize
-			}, 
+			},
 		};
 		this.btnLoading = true;
 		this.mainService
@@ -310,8 +361,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		    }
 		  });
 	}
-	
-  // 检查标本保存
+
+  // 检验标本保存
   submitForm() {
     if(!this.tasktype.id){
       this.msg.create("warning", "请先配置患者陪检任务类型！");
@@ -371,7 +422,61 @@ export class ConfigurationSpecimenComponent implements OnInit {
         }
       });
   }
-	
+
+  // 标本打包保存
+  submitSpecimenPackageForm() {
+    if(!this.tasktype.id){
+      this.msg.create("warning", "请先配置关联任务类型！");
+      return;
+    }
+    if(!this.spePackageModel){
+      this.msg.create("warning", "请选择工单模式！");
+      return;
+    }
+
+    if(this.drugsStartCheck[0].checked && !this.drugsStartCheckScanIds.filter(v => v.checked).length){
+      this.msg.create("warning", "请选择起点科室的核对方式！");
+      return;
+    }
+
+    if(this.drugsEndCheck[0].checked && !this.drugsEndCheckScanIds.filter(v => v.checked).length){
+      this.msg.create("warning", "请选择终点科室的核对方式！");
+      return;
+    }
+
+    let postData:any = {
+      id: this.configs.id,
+      taskType: this.tasktype.id,
+      hosId: this.hosId,
+      spePackageUnionReceive: this.spePackageUnionReceive,
+      spePackageModel: this.spePackageModel || undefined,
+      drugsCreateSign: this.drugsCreateSign[0].checked ? 1 : 0,
+      drugsReceiveSign: this.drugsReceiveSign[0].checked ? 1 : 0,
+      drugsStartCheck: this.drugsStartCheck[0].checked ? 1 : 0,
+      drugsStartCheckScanIds: this.drugsStartCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      drugsStartManual: this.drugsStartManual ? { id: this.drugsStartManual } : undefined,
+      drugsEndCheck: this.drugsEndCheck[0].checked ? 1 : 0,
+      drugsEndCheckScanIds: this.drugsEndCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      drugsEndManual: this.drugsEndManual ? { id: this.drugsEndManual } : undefined,
+      spePackageAutoPack: this.spePackageAutoPack[0].checked ? 1 : 0,
+      spePackageUrgents: this.spePackageUrgents.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      spePackageDeptIds: this.spePackageDeptIds.length ? this.spePackageDeptIds.toString() : undefined,
+      spePackageTubeIds: this.spePackageTubeIds.length ? this.spePackageTubeIds.toString() : undefined,
+      spePackageInventoryTypes: this.spePackageInventoryTypes.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      spePackageCreateOrder: this.spePackageCreateOrder[0].checked ? 1 : 0,
+      spePackageCodeSize: this.spePackageCodeSize || undefined,
+    };
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
 	// 获取标本字典
 	labelData:any = [];
 	getLabelDic(){
@@ -379,7 +484,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			this.labelData = data
 		});
 	}
-	
+
 	// 获取任务类型（病理标本）
 	taskTypeData:any;
 	getTaskTypesId() {
@@ -388,7 +493,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			this.getConfig();
 		});
 	}
-	
+
   //获取任务类型
   getTaskType() {
     this.loading = true;
@@ -417,6 +522,34 @@ export class ConfigurationSpecimenComponent implements OnInit {
       });
   }
 
+  //获取任务类型
+  getTaskTypeByOrdinary(key) {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskType: {
+        simpleQuery: true,
+        hosId: {
+          id: this.hosId
+        },
+        ordinaryField: {
+          key:"ordinary_field",
+          value: key
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+          this.tasktype = result.list[0] || {};
+          this.getConfig();
+        }
+      });
+  }
+
   // 获取配置
   getConfig() {
     this.loading = true;
@@ -434,7 +567,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			    }
 			  }
 			};
-		}else{
+		}else if(this.activeDictionaryKey=='pathology'){
 			postData = {
 			  idx: 0,
 			  sum: 10,
@@ -443,8 +576,21 @@ export class ConfigurationSpecimenComponent implements OnInit {
 					taskType:this.taskTypeData.id
 			  }
 			};
+		}else if(this.activeDictionaryKey=='specimenPackage'){
+			postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+			    taskTypeDTO: {
+			      hosId: {
+			        id: this.hosId
+			      },
+			      ordinaryField: this.tasktype.ordinaryField
+			    }
+			  }
+			};
 		}
-    
+
     this.mainService
       .getFetchDataList("simple/data", "taskTypeConfig", postData)
       .subscribe((result) => {
@@ -452,7 +598,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
         if (result.status == 200) {
           this.configs = result.list[0] || {};
 					if(this.activeDictionaryKey=='examine'){
-						// 检查标本
+						// 检验标本
 						this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
 						this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
 						this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
@@ -464,29 +610,79 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
 						this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
 						this.deptList = this.configs.deptNotAlertList || [];
-						
-						this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
+            this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
 						if(this.configs.speCollectLimit == 1){
 							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
-							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1; 
+							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1;
 							this.speCollectLimitTubeType = this.configs.speCollectLimitTubeType ? this.configs.speCollectLimitTubeType.split(',').map(v => +v) : [];
 							this.speStartCollectShowConfig[0].checked = this.configs.speStartCollectShowConfig == 1;
 							this.speCollectLimitState = this.configs.speCollectLimitState ? this.configs.speCollectLimitState.split(',').map(v => +v) : [];
 							this.speCollectLimitEndDept = this.configs.speCollectLimitEndDept ? this.configs.speCollectLimitEndDept.split(',').map(v => +v) : [];
 							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => v) : [];
 						}
-					}else{
-						// 病理标本
+					}else if(this.activeDictionaryKey=='pathology'){
+            // 病理标本
 						this.autoCreate[0].checked = this.configs.autoCreate == 1;
 						this.outpatientCreatePathologyForm[0].checked = this.configs.outpatientCreatePathologyForm == 1;
 						this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
 						this.pathologyBarCode = this.configs.pathologyBarCode;
 						this.pathologyFrozenSpecimenNum = this.configs.pathologyFrozenSpecimenNum;
 						this.prompt = this.configs.prompt || '';
-						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize && this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
-						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize && this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
+            this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
+						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
+					}else if(this.activeDictionaryKey=='specimenPackage'){
+						// 标本打包
+						this.spePackageUnionReceive = this.configs.spePackageUnionReceive || 0;
+						this.spePackageModel = this.configs.spePackageModel || undefined;
+            this.drugsCreateSign[0].checked = this.configs.drugsCreateSign == 1;
+            this.drugsReceiveSign[0].checked = this.configs.drugsReceiveSign == 1;
+
+            this.drugsStartCheck[0].checked = this.configs.drugsStartCheck == 1;
+            this.drugsStartCheckScanIds = this.drugsStartCheckScanIds.map(v => ({...v, checked: (this.configs.drugsStartCheckScanIds || '').split(',').includes(v.value.toString())}));
+            this.drugsStartManual = this.configs.drugsStartManual ? this.configs.drugsStartManual.id : undefined;
+
+            this.drugsEndCheck[0].checked = true;
+            this.drugsEndCheckScanIds = this.drugsEndCheckScanIds.map(v => ({...v, checked: (this.configs.drugsEndCheckScanIds || '').split(',').includes(v.value.toString())}));
+            this.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
+
+            this.spePackageAutoPack[0].checked = this.configs.spePackageAutoPack == 1;
+            this.spePackageUrgents = this.spePackageUrgents.map(v => ({...v, checked: (this.configs.spePackageUrgents || '').split(',').includes(v.value.toString())}));
+            this.spePackageDeptIds = this.configs.spePackageDeptIds ? this.configs.spePackageDeptIds.split(',').map(v => +v) : [];
+            this.deptList = this.configs.spePackageDeptList || [];
+            this.spePackageTubeIds = this.configs.spePackageTubeIds ? this.configs.spePackageTubeIds.split(',').map(v => +v) : [];
+            this.spePackageInventoryTypes = this.spePackageInventoryTypes.map(v => ({...v, checked: (this.configs.spePackageInventoryTypes || '').split(',').includes(v.value.toString())}));
+            this.spePackageCreateOrder[0].checked = this.configs.spePackageCreateOrder == 1;
+            this.spePackageCodeSize = this.configs.spePackageCodeSize || undefined;
 					}
         }
       });
   }
+
+  // 修改起点科室支持核对
+  changeDrugsStartCheck(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.drugsStartCheckScanIds = this.drugsStartCheckScanIds.map(v => ({...v, checked: false}));
+      this.drugsStartManual = undefined;
+    }
+  }
+
+  // 修改终点科室支持核对
+  changeDrugsEndCheck(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.drugsEndCheckScanIds = this.drugsEndCheckScanIds.map(v => ({...v, checked: false}));
+      this.drugsEndManual = undefined;
+    }
+  }
+
+  // 修改自动打包
+  changeSpePackageAutoPack(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.spePackageUrgents = this.spePackageUrgents.map(v => ({...v, checked: false}));
+      this.spePackageDeptIds = [];
+      this.spePackageTubeIds = [];
+    }
+  }
 }

src/app/services/main.service.ts

@@ -1162,4 +1162,60 @@ export class MainService {
 		});
 	}
 
+  // 标本打包-获取患者、试管类型列表、标本总数
+	querySaveSpePackage(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/querySaveSpePackage`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-新增标本
+	addPackageSpe(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/addPackageSpe`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-移除标本
+	removePackageSpe(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/removePackageSpe`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-重置
+	resetPackageSpe(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/resetPackageSpe`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-建单
+	createOrTakeOrderSpecimen(data = {}){
+		return this.http.post(host.host + `/transflow/createOrTakeOrder`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-打印
+	makeQrCode(data = {}, code){
+		return this.http.post(host.host + `/workerOrder/makeQrCode/specimenPackage/${code}`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 护士端-标本打包图标下两个数字
+	getSpePackageCount(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/getSpePackageCount`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 标本打包-标本包里的标本的所有终点科室列表
+	getSpePackageEndDeptList(data = {}){
+		return this.http.post(host.host + `/nurse/specimen/getSpePackageEndDeptList`, data, {
+		  headers: this.headers,
+		});
+	}
+
 }

src/app/share/detail-ordinary/detail-ordinary.component.html

@@ -18,7 +18,7 @@
           <div nz-col nzSpan="8">起点科室：{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):''}}</div>
           <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
-          <ng-container *ngIf="!(orderInfo.taskType.ordinaryField.value === 'drugsJpbag' || orderInfo.taskType.ordinaryField.value === 'drugsWestern' || orderInfo.taskType.ordinaryField.value === 'drugsReturn' || orderInfo.taskType.ordinaryField.value === 'drugsPoison' || orderInfo.taskType.ordinaryField.value === 'drugsHerbal')">
+          <ng-container *ngIf="!(orderInfo.taskType.ordinaryField.value === 'drugsJpbag' || orderInfo.taskType.ordinaryField.value === 'drugsWestern' || orderInfo.taskType.ordinaryField.value === 'drugsReturn' || orderInfo.taskType.ordinaryField.value === 'drugsPoison' || orderInfo.taskType.ordinaryField.value === 'drugsHerbal' || orderInfo.taskType.ordinaryField.value === 'specimenPackage')">
             <div nz-col nzSpan="8">应收数量：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:'无'}}</div>
             <div nz-col nzSpan="8">实收数量：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:'无'}}</div>
             <div nz-col nzSpan="8">送达数量：{{orderInfo.deliveryNum?orderInfo.deliveryNum:'无'}}</div>
@@ -71,6 +71,24 @@
           </div> -->
         </div>
 
+        <!-- 标本打包 -->
+        <div class="info" *ngIf="orderInfo.taskType.ordinaryField.value == 'specimenPackage'">
+          <div nz-row class="top">
+            <div class="left" nz-col nzSpan="12">
+              <p>
+                <span class="label">打包码</span>
+                <span>{{orderInfo.pathologyPackInfoDTO?.packCode}}</span>
+              </p>
+            </div>
+            <div class="right" nz-col nzSpan="12">
+              <p>
+                <span class="label">标本数量</span>
+                <span>{{orderInfo.pathologyPackInfoDTO?.specimenNum}}</span>
+              </p>
+            </div>
+          </div>
+        </div>
+
         <!-- <div class="table">
           <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
             <thead>

src/app/share/detail-ordinary/detail-ordinary.component.less

@@ -174,6 +174,69 @@
           }
         }
       }
+
+      .info {
+        width: 100%;
+        height: 100%;
+        background: #fff;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 24px 28px 14px 28px;
+        margin-bottom: 8px;
+
+        .top {
+          .left {
+            border-right: 1px dashed #e5e9ed;
+
+            p {
+              padding: 0 70px 0 102px;
+              overflow: hidden;
+
+              & > span:nth-child(1) {
+                float: left;
+              }
+
+              & > span:nth-child(2) {
+                float: right;
+                color: #666;
+                text-align: right;
+                max-width: 175px;
+              }
+            }
+          }
+
+          .right {
+            p {
+              padding: 0 102px 0 70px;
+              overflow: hidden;
+
+              span:nth-child(1) {
+                float: left;
+              }
+
+              span:nth-child(2) {
+                float: right;
+                color: #666;
+                text-align: right;
+              }
+            }
+          }
+        }
+
+        .wait {
+          text-align: center;
+          margin-top: 7px;
+
+          i {
+            font-size: 24px;
+            color: #62c26d;
+          }
+
+          span {
+            color: #62c26d;
+          }
+        }
+      }
     }
   }
 

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 || isShowEndDeptId) ? '9' : '9999999'}">
   <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

@@ -12,7 +12,7 @@
 
   .modalBody {
     width: 350px;
-    height: 220px;
+    min-height: 220px;
     background: #fff;
     border-radius: 8px;
     padding: 8px 16px;
@@ -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/order-detail/order-detail.component.html

@@ -887,7 +887,7 @@
             配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
           </div>
         </div>
-        <div class="info" nz-row *ngIf="!(orderInfo.taskType.associationType.value === 'ordinary' && (orderInfo.taskType.ordinaryField.value === 'drugsJpbag' || orderInfo.taskType.ordinaryField.value === 'drugsWestern' || orderInfo.taskType.ordinaryField.value === 'drugsReturn' || orderInfo.taskType.ordinaryField.value === 'drugsPoison' || orderInfo.taskType.ordinaryField.value === 'drugsHerbal'))">
+        <div class="info" nz-row *ngIf="!(orderInfo.taskType.associationType.value === 'ordinary' && (orderInfo.taskType.ordinaryField.value === 'drugsJpbag' || orderInfo.taskType.ordinaryField.value === 'drugsWestern' || orderInfo.taskType.ordinaryField.value === 'drugsReturn' || orderInfo.taskType.ordinaryField.value === 'drugsPoison' || orderInfo.taskType.ordinaryField.value === 'drugsHerbal' || orderInfo.taskType.ordinaryField.value === 'specimenPackage'))">
           <div nz-col nzSpan="6">
             应收数量：{{ orderInfo.expectReceiveNum || "无" }}
           </div>
@@ -981,6 +981,25 @@
           </div>
         </div>
       </div>
+      <!-- 标本打包 -->
+      <div class="bottom">
+        <div class="info" *ngIf="orderInfo.taskType.ordinaryField.value == 'specimenPackage'">
+            <div nz-row class="top">
+              <div class="left" nz-col nzSpan="12">
+                <p>
+                  <span class="label">打包码</span>
+                  <span>{{orderInfo.pathologyPackInfoDTO?.packCode}}</span>
+                </p>
+              </div>
+              <div class="right" nz-col nzSpan="12">
+                <p>
+                  <span class="label">标本数量</span>
+                  <span>{{orderInfo.pathologyPackInfoDTO?.specimenNum}}</span>
+                </p>
+              </div>
+            </div>
+          </div>
+      </div>
     </div>
     </overlay-scrollbars>
     <!-- 评价内容 -->

src/app/share/package-specimen-rule/package-specimen-rule.component.html

@@ -0,0 +1,35 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">自动清点规则<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="block">
+        <div class="name">标本紧急度：</div>
+        <div class="value">
+          <ng-container *ngFor="let item of configs.spePackageUrgentsList;let last = last">
+            {{item.name}}<ng-container *ngIf="!last">、</ng-container>
+          </ng-container>
+        </div>
+      </div>
+      <div class="block">
+        <div class="name">关联检验科室：</div>
+        <div class="value">
+          <ng-container *ngFor="let item of configs.spePackageDeptList;let last = last">
+            {{item.dept}}<br *ngIf="!last">
+          </ng-container>
+        </div>
+      </div>
+      <div class="block">
+        <div class="name">关联试管类型：</div>
+        <div class="value">
+          <ng-container *ngFor="let item of configs.spePackageTubeList;let last = last">
+            {{item.name}}<ng-container *ngIf="!last">、</ng-container>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/package-specimen-rule/package-specimen-rule.component.less

@@ -0,0 +1,154 @@
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .block{
+    display: flex;
+    margin-top: 16px;
+    &:first-of-type{
+      margin-top: 0;
+    }
+    .name{
+      width: 114px;
+    }
+    .value{
+      flex: 1;
+    }
+  }
+
+  .modalBody {
+    width: 480px;
+    height: auto;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+    }
+  }
+
+  .modalBody {
+    width: 350px;
+    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;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px 24px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/package-specimen-rule/package-specimen-rule.component.ts

@@ -0,0 +1,70 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: 'app-package-specimen-rule',
+  templateUrl: './package-specimen-rule.component.html',
+  styleUrls: ['./package-specimen-rule.component.less']
+})
+export class PackageSpecimenRuleComponent implements OnInit {
+  @Output() cancelFlagHand = new EventEmitter();
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+  ) { }
+
+  hosId:any = this.tool.getCurrentHospital().id; //当前院区
+
+  ngOnInit() {
+    this.getConfig();
+  }
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 获取配置
+  configs:any = {};
+  spePackageUrgents = {
+    '0': '普标',
+    '1': '急标',
+  }
+  getConfig() {
+		let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key:"ordinary_field",
+            value: 'specimenPackage'
+          }
+        }
+      }
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let configs = result.list[0] || {};
+
+          configs.spePackageDeptList = configs.spePackageDeptList || [];
+          configs.spePackageTubeList = configs.spePackageTubeList || [];
+          if(configs.spePackageUrgents){
+            configs.spePackageUrgentsList = configs.spePackageUrgents.split(',').map(v => ({ name: this.spePackageUrgents[v] }));
+          }else{
+            configs.spePackageUrgentsList = [];
+          }
+
+          this.configs = configs;
+        }
+      });
+  }
+}
+

src/app/share/share.module.ts

@@ -62,6 +62,10 @@ import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info
 import { SelectDateComponent } from './select-date/select-date.component';
 import { AddInspectModalComponent } from './add-inspect-modal/add-inspect-modal.component';
 import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yytime.component';
+import { PackageSpecimenRuleComponent } from './package-specimen-rule/package-specimen-rule.component';
+import { SpecimenPackageListModalComponent } from './specimen-package-list-modal/specimen-package-list-modal.component';
+import { NgxPrintModule } from 'ngx-print';
+import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component';
 
 @NgModule({
   declarations: [
@@ -127,6 +131,9 @@ import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yyti
     SelectDateComponent,
     AddInspectModalComponent,
     SelectDateYytimeComponent,
+    PackageSpecimenRuleComponent,
+    SpecimenPackageListModalComponent,
+    SpecimenPackageLogPromptModalComponent,
   ],
   imports: [
     CommonModule,
@@ -135,6 +142,7 @@ import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yyti
     ReactiveFormsModule,
     OverlayscrollbarsModule,
     NzIconModule,
+    NgxPrintModule,
   ],
   exports: [
     DetailSampleComponent,
@@ -200,6 +208,9 @@ import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yyti
     SelectDateComponent,
     AddInspectModalComponent,
     SelectDateYytimeComponent,
+    PackageSpecimenRuleComponent,
+    SpecimenPackageListModalComponent,
+    SpecimenPackageLogPromptModalComponent,
   ]
 })
 export class ShareModule { }

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

@@ -0,0 +1,92 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">科室内打包信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="list-template w100">
+      <div class="list-template__content">
+        <div class="list-template__top" nz-row>
+          <div nz-col nzXl='24' class="list-template__searchBox">
+            <div class="list-template__searchItem">
+              <span class="label">状态</span>：
+              <nz-select class="formItem" nzAllowClear [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择状态" [(ngModel)]="searchCriteria.status" (ngModelChange)="selectStatus($event)">
+                <nz-option *ngFor="let option of specimentPackageTypeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <nz-table class="hospitalTable" [nzData]="packageList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="13%">包号</th>
+            <th nzWidth="6%">打包人</th>
+            <th nzWidth="15%">打包时间</th>
+            <th nzWidth="6%">标本数</th>
+            <th nzWidth="6%">配送人</th>
+            <th nzWidth="15%">配送时间</th>
+            <th nzWidth="6%">接收人</th>
+            <th nzWidth="15%">接收时间</th>
+            <th nzWidth="8%">状态</th>
+            <th nzWidth="10%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of packageList;let i = index;">
+            <td>{{ data.packCode }}</td>
+            <td>{{ data.packUserDTO?.name }}</td>
+            <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.specimenNum }}</td>
+            <td>{{ data.deliveryUserDTO?.name }}</td>
+            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.receiveUserDTO?.name }}</td>
+            <td>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.status?.name }}</td>
+            <td>
+              <div class="coop">
+                <span (click)="printPackageByConfig(data)" *ngIf="data.status.value !== '0'">补打</span>
+                <span (click)="toSpecimenPackage(data)" *ngIf="data.status.value === '0' || data.status.value === '1'">修改</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+
+      <div class="pagination">
+        <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+          [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+          (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center bottom-btn">
+      <button class="btn cancel know" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 打印的内容 -->
+<div id="print-section-package" hidden>
+  <!-- 80mm*80mm -->
+  <ng-container *ngIf="configs.spePackageCodeSize == 1">
+    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;">
+      <div style="display: flex;">
+        <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
+        <div style="flex: 1;">
+          <div>包号：{{package.packCode}}</div>
+          <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
+          <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
+        </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;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>
+    </div>
+  </ng-container>
+</div>
+<button ngxPrint printSectionId="print-section-package" #printBtnPackage hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

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

@@ -0,0 +1,261 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .drugsBag{
+    display: flex;
+    align-items: center;
+    font-size: 16px;
+    gap: 40px;
+    padding: 16px 24px 0;
+    border-top: 1px solid #E8EBEF;
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template{
+    padding: 0 24px;
+  }
+
+  .list-template__searchItem .label{
+    width: auto;
+    margin-left: 0;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .coop {
+    button{
+      color: #333;
+    }
+    span,button {
+      display: inline-block;
+      padding: 0 8px;
+      cursor: pointer;
+      position: relative;
+
+      &::after {
+        content: "|";
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+
+      &:hover,
+      &:active {
+        color: @primary-color;
+      }
+
+      &:nth-last-child(1) {
+        &::after {
+          content: "";
+        }
+      }
+    }
+  }
+
+  .tab {
+    width: 100%;
+    height: 60px;
+    border-bottom: 1px solid #e5e9ed;
+    background-color: #fff;
+
+    .item {
+      text-align: center;
+      line-height: 60px;
+      height: 100%;
+      border-right: 1px solid #e5e9ed;
+
+      &:nth-last-child(1) {
+        border: none;
+      }
+
+      &.checked {
+        background: #f0f6ed;
+      }
+    }
+  }
+
+  .modalBody {
+		min-height: 760px;
+    width: 700px;
+    background: #fff;
+    border-radius: 5px;
+    color: #333;
+		position: relative;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      height: 53px;
+      line-height: 53px;
+      border-bottom: 1px solid #E8EBEF;
+      padding: 0 28px;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 28px;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin: 0 24px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          margin-left: auto;
+          margin-right: 16px;
+        }
+      }
+    }
+
+		.bottom-btn{
+			.btn {
+				position: absolute;
+				bottom: 10px;
+			}
+		}
+
+    button {
+      margin-top: 10px;
+      margin-bottom: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,158 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild, ElementRef } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Router } from '@angular/router';
+@Component({
+  selector: 'app-specimen-package-list-modal',
+  templateUrl: './specimen-package-list-modal.component.html',
+  styleUrls: ['./specimen-package-list-modal.component.less']
+})
+export class SpecimenPackageListModalComponent implements OnInit {
+  @ViewChild('printBtnPackage', { static: false }) printBtnPackage: ElementRef<HTMLElement>;
+  // 切换科室，切换弹窗
+  hosId;
+  hsLoading = false;
+  packageList: any = [];// 标本列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+  searchCriteria:any = {}
+
+  deptId = this.tool.getCurrentUserDept().id;
+  @Input() specimenPackageStateValue = '';
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    public router: Router,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+
+    this.getStatusList();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 切换状态下拉框
+  selectStatus(e){
+    this.getSpecimenPackageList(1);
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getSpecimenPackageList();
+  }
+
+  // 获取状态
+  specimentPackageTypeList: any[] = [];
+  getStatusList() {
+    this.mainService.getDictionary("list", "pathology_pack_status").subscribe((data:any) => {
+      this.specimentPackageTypeList = data || [];
+
+      let obj = this.specimentPackageTypeList.find(v => v.value == this.specimenPackageStateValue);
+      if(obj){
+        this.searchCriteria.status = obj.id;
+      }
+      this.getSpecimenPackageList(1);
+    })
+  }
+
+  // 获取标本列表
+  getSpecimenPackageList(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      pathologyPackInfo: {
+        deptId: this.deptId,
+        busiType: 'specimen',//标本打包
+        status: this.searchCriteria.status ? { id: this.searchCriteria.status } : undefined,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','pathologyPackInfo',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.packageList = data.list || [];
+      this.total = data.totalNum || 0;
+    })
+  }
+
+  // 修改
+  toSpecimenPackage(data){
+    this.router.navigateByUrl(`/batchSpecimen?id=${data.id}`);
+  }
+
+  // 补打
+  base64:string = '';
+  typeSpecimentList:any[] = [];
+  patientSpecimentList:any[] = [];
+  package:any = {};
+  printPackage(item){
+    this.mainService
+      .makeQrCode({}, item.packCode)
+      .subscribe((data:any) => {
+        if (data.state == 200) {
+          this.typeSpecimentList = data.tube || [];
+          this.patientSpecimentList = data.patient || [];
+          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("操作成功");
+          setTimeout(()=>{
+            this.printBtnPackage.nativeElement.click();
+          },0)
+        } else {
+          this.message.error(data.msg || "操作失败");
+        }
+      });
+  }
+
+  // 获取配置
+  configs:any = {};
+  printPackageByConfig(data) {
+		let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key:"ordinary_field",
+            value: 'specimenPackage'
+          }
+        }
+      }
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.configs = result.list[0] || {};
+          this.printPackage(data);
+        }
+      });
+  }
+}
+
+
+

src/app/share/specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component.html

@@ -0,0 +1,56 @@
+<div
+  class="modal display_flex justify-content_flex-center align-items_center"
+  *ngIf="show"
+>
+  <div class="modalBody">
+    <div class="title">
+      流程信息查看<i
+        class="icon_transport transport-guanbi"
+        (click)="hideModal()"
+      ></i>
+    </div>
+    <div class="content">
+      <nz-table
+        class="hospitalTable"
+        [nzData]="historySpecimenList"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="hsLoading"
+      >
+        <thead>
+          <tr class="thead">
+            <th nzWidth="8%">序号</th>
+            <th nzWidth="23%">动作</th>
+            <th nzWidth="23%">时间</th>
+            <th nzWidth="23%">备注</th>
+            <th nzWidth="23%">操作人</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of historySpecimenList; let i = index">
+            <td>{{ i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1 }}</td>
+            <td>{{ data.operationType?.name }}</td>
+            <td>{{ data.createTime | date: "MM-dd HH:mm:ss" }}</td>
+            <td>{{ data.logRemarks }}</td>
+            <td>{{ data.operationUserDTO?.name }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination">
+        <nz-pagination
+          [(nzPageIndex)]="historySpecimenPageIndex"
+          [(nzTotal)]="historySpecimenListLength"
+          [(nzPageSize)]="historySpecimenPageSize"
+          (nzPageIndexChange)="getHistorySpecimen()"
+          (nzPageSizeChange)="getHistorySpecimen()"
+        >
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button (click)="hideModal()">
+        关闭
+      </button>
+    </div>
+  </div>
+</div>

src/app/share/specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component.less

@@ -0,0 +1,165 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .pagination{
+    padding: 8px;
+    margin-left: auto;
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+          padding-bottom: 10px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component.ts

@@ -0,0 +1,54 @@
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+
+@Component({
+  selector: "app-specimen-package-log-prompt-modal",
+  templateUrl: "./specimen-package-log-prompt-modal.component.html",
+  styleUrls: ["./specimen-package-log-prompt-modal.component.less"],
+})
+export class SpecimenPackageLogPromptModalComponent implements OnInit {
+  hosId;
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+  historySpecimenPageIndex: number = 1; //表格当前页码
+  historySpecimenPageSize: number = 5; //表格每页展示条数
+  historySpecimenListLength: number = 10; //表格总数据量
+  @Input() show: Boolean;
+  @Input() id: String;
+
+  @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) {}
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getHistorySpecimen();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false })); //emits(向上弹射)事件
+  }
+  // 获取列表数据
+  getHistorySpecimen(idx?) {
+    if (idx) {
+      this.historySpecimenPageIndex = 1;
+    }
+    let postData = {
+      idx: this.historySpecimenPageIndex - 1,
+      sum: this.historySpecimenPageSize,
+      pathologyPackLog: {
+        packId: this.id,
+      },
+    };
+    this.hsLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "pathologyPackLog", postData)
+      .subscribe((data) => {
+        this.hsLoading = false;
+        this.historySpecimenList = data.list || [];
+        this.historySpecimenListLength = data.totalNum || 0;
+      });
+  }
+}

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

@@ -57,10 +57,10 @@ export class BatchInspectionComponent implements OnInit {
     .subscribe((data) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
-      this.getList();
       if (data.status == 200) {
         this.message.success("修改陪检方式成功");
       } else {
+        this.getList();
         this.message.success(data.msg || "修改陪检方式失败");
       }
     });

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

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

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

@@ -0,0 +1,98 @@
+<div class="header">
+  <div class="display_flex align-items_center">
+    <div class="dept">标本打包-{{deptDisplay == 2 ? deptDTO.deptalias : deptDTO.dept}}</div>
+  </div>
+  <input class="specimenCode" #specimenCodeElement nz-input placeholder="可扫描标本条码快速添加" [(ngModel)]="specimenCode" (input)="inputChange($event)" />
+  <div class="display_flex align-items_center">
+    <button nz-button class="btn default" (click)="showDelModal({}, '您确认要重置标本吗，重置会先清空标本在根据规则自动清点？','重置标本','reset')">重置标本</button>
+    <button nz-button nzType="default" class="ml8" *ngIf="configs.spePackageAutoPack == 1" (click)='showPackageSpecimenRule()'>自动清点规则</button>
+  </div>
+</div>
+<div class="table display_flex">
+  <div class="filter display_flex flex-direction_column">
+    <div class="total">总标本数：{{total}}</div>
+    <div class="block display_flex flex-direction_column" *ngIf="typeSpecimentList.length">
+      <div class="block_title">试管类型</div>
+      <div class="block_content">
+        <div class="block_item" *ngFor="let item of typeSpecimentList" (click)="clickType(item)" [ngClass]="{'active': item.id == activeTypeId}">{{item.name}}：{{item.size}}</div>
+      </div>
+    </div>
+    <div class="block display_flex flex-direction_column patient" *ngIf="patientSpecimentList.length">
+      <div class="block_title">患者</div>
+      <div class="block_content">
+        <div class="block_item" *ngFor="let item of patientSpecimentList" (click)="clickPatient(item)" [ngClass]="{'active': item.no == activePatientNo}">{{item.name}}：{{item.size}}</div>
+      </div>
+    </div>
+  </div>
+  <nz-table class="list-template__nzTable filter_table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+    <thead>
+      <tr class="thead">
+        <th nzWidth="11%">患者姓名</th>
+        <th nzWidth="11%">住院号</th>
+        <th nzWidth="11%">标本条码</th>
+        <th nzWidth="11%">检验项目</th>
+        <th nzWidth="11%">类型</th>
+        <th nzWidth="11%">采集人</th>
+        <th nzWidth="11%">采集时间</th>
+        <th nzWidth="11%">检验科室</th>
+        <th nzWidth="12%">操作</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></td>
+        <td>{{ data.residenceNo }}</td>
+        <td>{{ data.scode }}</td>
+        <td>{{ data.specimenDesc }}</td>
+        <td>{{ data.stype?.name }}<span *ngIf="data.tubeType">({{ data.tubeType?.name }})</span></td>
+        <td>{{ data.collectNurseName }}</td>
+        <td>{{ data.printDate }}</td>
+        <td>{{ data.checkDept?.dept }}</td>
+        <td>
+          <div class="coop">
+            <span (click)="showDelModal(data, '您确认要移除吗？','移除','del')">移除</span>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </nz-table>
+</div>
+<div class="footer display_flex align-items_center justify-content_flex-center">
+  <button nzType="primary" class="btn" nz-button (click)='packageHandler()' *ngIf="this.total > 0">打包</button>
+  <button nzType="default" nz-button class="btn cancel ml8" (click)='goBack()'>取消</button>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(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>
+
+<!-- 打印的内容 -->
+<div id="print-section" hidden>
+  <!-- 80mm*80mm -->
+  <ng-container *ngIf="configs.spePackageCodeSize == 1">
+    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;">
+      <div style="display: flex;">
+        <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
+        <div style="flex: 1;">
+          <div>包号：{{package.packCode}}</div>
+          <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
+          <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
+        </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;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>
+    </div>
+  </ng-container>
+</div>
+<button ngxPrint printSectionId="print-section" #printBtn hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

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

@@ -0,0 +1,193 @@
+@import "../../../../src/theme.less";
+
+:host {
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  background-color: #D9D9D9;
+  display: flex;
+  flex-direction: column;
+  .header{
+    height: 73px;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 24px;
+    font-size: 20px;
+    .specimenCode{
+      width: 365px;
+      height: 40px;
+    }
+    .dept{
+      margin-right: 48px;
+      color: @primary-color;
+    }
+    .patient{
+      margin-left: 24px;
+    }
+    .label{
+      padding-right: 16px;
+      font-size: 14px;
+    }
+    .formItem{
+      width: 173px;
+    }
+    .info{
+      margin-left: 48px;
+    }
+  }
+  .table{
+    flex: 1;
+    min-height: 0;
+    margin-top: 1px;
+    background-color: #fff;
+    padding: 8px 16px;
+    .filter{
+      width: 176px;
+      margin-right: 10px;
+      .total{
+        height: 30px;
+        display: flex;
+        align-items: center;
+        font-size: 16px;
+        background: rgba(0,0,0,0.06);
+        font-weight: bold;
+        padding: 0 16px;
+      }
+      .block{
+        margin-top: 10px;
+        font-size: 14px;
+        &.patient{
+          flex: 1;
+          min-height: 0;
+          .block_content{
+            height: auto;
+            flex: 1;
+          }
+        }
+        .block_title{
+          border: 1px solid #D9D9D9;
+          font-weight: bold;
+          height: 40px;
+          display: flex;
+          align-items: center;
+          padding: 0 16px;
+        }
+        .block_content{
+          border: 1px solid #D9D9D9;
+          border-top: none;
+          overflow-y: auto;
+          height: 113px;
+          .block_item{
+            padding: 0 16px;
+            height: 28px;
+            display: flex;
+            align-items: center;
+            cursor: pointer;
+            &.active,
+            &:hover{
+              background: #F0F6ED;
+              color: @primary-color;
+            }
+          }
+        }
+      }
+    }
+    .filter_table{
+      flex: 1;
+      overflow-y: auto;
+    }
+    .patient{
+      position: relative;
+      .circle{
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+        background-color: @primary-color;
+        position: absolute;
+        top: 50%;
+        left: -8px;
+        transform: translate(-50%,-50%);
+        &.red{
+          background-color: red;
+        }
+      }
+    }
+    .transport-weibiaoti2010104{
+      font-size: 15px;
+      color: #999;
+      margin-left: 10px;
+      margin-top: 3px;
+      cursor: pointer;
+    }
+    .transport-shanchu1{
+      font-size: 15px;
+      color: #999;
+      margin-left: 5px;
+      margin-top: 3px;
+      cursor: pointer;
+    }
+    .thead{
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        background: transparent;
+        color: #fff;
+        text-align: center;
+      }
+    }
+    .ant-table-body {
+      border-bottom: 1px solid #e5e9ed;
+    }
+
+    .ant-table-tbody {
+      tr {
+        text-align: center;
+        color: #333;
+
+        td {
+          border: none;
+
+          &.tab_hover:hover{
+            text-decoration: underline;
+            cursor: pointer;
+          }
+
+          .coop {
+            button{
+              color: #333;
+            }
+            span,button {
+              display: inline-block;
+              padding: 0 8px;
+              cursor: pointer;
+              position: relative;
+
+              &::after {
+                content: "|";
+                position: absolute;
+                top: 0;
+                right: 0;
+              }
+
+              &:hover,
+              &:active {
+                color: @primary-color;
+              }
+
+              &:nth-last-child(1) {
+                &::after {
+                  content: "";
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .footer{
+    height: 60px;
+    background-color: #fff;
+  }
+}

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

@@ -0,0 +1,376 @@
+import { Component, OnInit, AfterViewInit, ElementRef, ViewChild } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Location } from '@angular/common';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Router, ActivatedRoute } from '@angular/router';
+@Component({
+  selector: 'app-batch-specimen',
+  templateUrl: './batch-specimen.component.html',
+  styleUrls: ['./batch-specimen.component.less']
+})
+export class BatchSpecimenComponent implements OnInit, AfterViewInit {
+  @ViewChild('printBtn', { static: false }) printBtn: ElementRef<HTMLElement>;
+  @ViewChild('specimenCodeElement', { static: false}) specimenCodeElementRef: ElementRef;
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private _location: Location,
+    public router: Router,
+    private route: ActivatedRoute,
+  ) { }
+
+  hosId:any = this.tool.getCurrentHospital().id; //当前院区
+  deptDTO:any = this.tool.getCurrentUserDept(); //当前科室
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  listOfData: any[] = []; //表格数据
+
+  searchTimerSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+
+    this.init();
+  }
+
+  ngAfterViewInit() {
+    this.specimenCodeElementRef.nativeElement.focus();
+  }
+
+  init(){
+    this.getConfig();
+  }
+
+  // 获取配置
+  configs:any = {};
+  getConfig() {
+		let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key:"ordinary_field",
+            value: 'specimenPackage'
+          }
+        }
+      }
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.configs = result.list[0] || {};
+          this.querySaveSpePackage();
+        }
+      });
+  }
+
+  // 获取患者、试管类型列表、标本总数
+  total:any;
+  typeSpecimentList:any[] = [];
+  patientSpecimentList:any[] = [];
+  package:any = {};
+  querySaveSpePackage(){
+    let postData:any = {
+      deptId: this.deptDTO.id,
+    };
+
+    if(this.route.snapshot.queryParams.id){
+      postData.packageId = +this.route.snapshot.queryParams.id;
+    }
+
+    this.mainService
+      .querySaveSpePackage(postData)
+      .subscribe((result:any) => {
+        if (result.state == 200) {
+          this.total = result.totalCount;
+          this.typeSpecimentList = result.tube || [];
+          this.patientSpecimentList = result.patient || [];
+          this.package = result.package || {};
+          this.getList();
+        }
+      })
+  }
+
+  inspectActiveList: any = [];//选中检查列表
+  patientActiveList: any = [];//选中患者列表
+
+  coopData: any = {}; //当前操作列
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+    this.isShowEndDeptId = false;
+  }
+  // 确认删除
+  confirmDel(e) {
+    console.log(e)
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除-移除标本
+      let postData = {
+        speIds: this.coopData.id.toString(),
+        packageId: this.package.id,
+      }
+
+      this.mainService
+        .removePackageSpe(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "reset") {
+      //先重置再自动清点
+      let postData = {
+        packageId: this.package.id,
+      }
+
+      this.mainService
+        .resetPackageSpe(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "package") {
+      //打包
+      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 || "操作失败");
+          }
+        });
+    }
+  }
+
+  // 打印
+  base64:string = '';
+  printPackage(){
+    this.mainService
+      .makeQrCode({}, this.package.packCode)
+      .subscribe((data:any) => {
+        if (data.state == 200) {
+          this.total = data.totalCount;
+          this.typeSpecimentList = data.tube || [];
+          this.patientSpecimentList = data.patient || [];
+          this.package = data.package || {};
+
+          this.base64 = data.base64 || '';
+
+          this.message.success("操作成功");
+          setTimeout(()=>{
+            this.printBtn.nativeElement.click();
+            this.goBack();
+          },0)
+        } else {
+          this.message.error(data.msg || "操作失败");
+        }
+      });
+  }
+
+  // 打包
+  isShowEndDeptId:boolean = false;
+  packageHandler(){
+    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:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.querySaveSpePackage();
+  }
+
+  loading1:boolean = false;
+
+  getList(){
+    let data = {
+      idx: 0,
+      sum: 99999,
+      specimen: {
+        packageId: this.package ? this.package.id : undefined,
+        patientNo: this.activePatientNo || undefined,
+        tubeType: this.activeTypeId ? { id: this.activeTypeId } : undefined,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "specimen", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 返回
+  goBack(){
+    this._location.back();
+  }
+
+  // 选择试管类型
+  activeTypeId:any;
+  clickType(item){
+    if(this.activeTypeId == item.id){
+      this.activeTypeId = undefined;
+    }else{
+      this.activeTypeId = item.id;
+    }
+
+    this.querySaveSpePackage();
+  }
+
+  // 选择患者
+  activePatientNo:any;
+  clickPatient(item){
+    if(this.activePatientNo == item.no){
+      this.activePatientNo = undefined;
+    }else{
+      this.activePatientNo = item.no;
+    }
+
+    this.querySaveSpePackage();
+  }
+
+  /**
+   * @description: PDA扫码复制到文本输入框
+   * @return {*}
+   * @author: seimin
+   */
+  specimenCode:string = '';
+  inputChange(e){
+    if(this.specimenCode.length >= 8){
+      this.searchTimer(this.addSpeciment, this.specimenCode);
+    }
+  }
+
+  // 添加标本
+  maskFlag: any = false;
+  addSpeciment(speCode){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      speCode,
+      packageId: this.package.id,
+    };
+
+    this.mainService
+      .addPackageSpe(postData)
+      .subscribe((result:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+
+        if(result.state == 200){
+          this.message.success('操作成功！');
+          this.specimenCode = '';//清空
+          this.querySaveSpePackage();
+        }else{
+          this.message.error(result.msg || '操作失败！');
+        }
+      });
+  }
+
+  // 防抖
+  searchTimer(fun, e) {
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 自动清点规则
+  isShowPackageSpecimenRule:boolean = false;
+  showPackageSpecimenRule(){
+    this.isShowPackageSpecimenRule = true;
+  }
+
+  // 关闭自动清点规则
+  closePackageSpecimenRule(e){
+    this.isShowPackageSpecimenRule = e;
+  }
+}

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BatchSpecimenRoutingModule } from './batch-specimen-routing.module';
+import { BatchSpecimenComponent } from './batch-specimen.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { NgxPrintModule } from 'ngx-print';
+
+
+@NgModule({
+  declarations: [BatchSpecimenComponent],
+  imports: [
+    CommonModule,
+    BatchSpecimenRoutingModule,
+    ShareModule,
+    NgxPrintModule,
+  ]
+})
+export class BatchSpecimenModule { }

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

@@ -361,6 +361,10 @@
                           <span (click)="changeInspectClosedLoopView($event, '2')">预:{{patientInspectCountMsg.data ? patientInspectCountMsg.data[0].yyCount : 0}}</span>
                           <span (click)="changeInspectClosedLoopView($event, '3,4')">检:{{patientInspectCountMsg.data ? patientInspectCountMsg.data[0].workingCount : 0}}</span>
                         </div>
+                        <div class="navSpecimen" *ngIf="item.icon.value === 'specimenPackage'">
+                          <span (click)="toSpecimenPackage($event, '1')">未:{{specimenPackageCountMsg.data ? specimenPackageCountMsg.data[0].waitCount : 0}}</span>
+                          <span (click)="toSpecimenPackage($event, '2')">送:{{specimenPackageCountMsg.data ? specimenPackageCountMsg.data[0].workingCount : 0}}</span>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -2753,3 +2757,6 @@
 
 <!-- 智能客服 -->
 <app-smart-dialogue *ngIf="smartShow" (cancelModal)="smartClose($event)"></app-smart-dialogue>
+
+<!-- 标本打包-数字点击 -->
+<app-specimen-package-list-modal *ngIf="isShowSpecimenPackageList" (closeModelHs)="closeSpecimenPackageList($event)" [specimenPackageStateValue]="specimenPackageStateValue"></app-specimen-package-list-modal>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1467,6 +1467,12 @@
                           font-size: 24px;
                         }
                       }
+                      &.specimenPackage{
+                        background: linear-gradient( 41deg, rgba(40,60,237,0.73) 0%, #0FBBE2 100%);
+                        .icon_transport{
+                          font-size: 24px;
+                        }
+                      }
                     }
                     h2{
                       font-size: 12px;

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -791,6 +791,8 @@ export class HushijiandanComponent implements OnInit {
       return 'incident';
     }else if(icon === 'transport-peihuguanli'){
       return 'inspect';
+    }else if(icon === 'transport-dabao'){
+      return 'specimenPackage';
     }else{
       return '';
     }
@@ -1248,6 +1250,7 @@ export class HushijiandanComponent implements OnInit {
     this.msgTimerId = setInterval(() => {
       this.getSpecimenWorkOrderMsg();
       this.getPatientInspectCountMsg();
+      this.getSpePackageCountMsg();
     }, 60000);
   }
 
@@ -1294,6 +1297,23 @@ export class HushijiandanComponent implements OnInit {
       });
   }
 
+  // 护士端-标本打包图标下两个数字
+  specimenPackageCountMsg: any = {};
+  getSpePackageCountMsg() {
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
+      return;
+    }
+    let that = this;
+
+    that.mainService
+      .getSpePackageCount({
+        deptId: JSON.parse(localStorage.getItem("user")).user.dept.id,
+      })
+      .subscribe((data) => {
+        that.specimenPackageCountMsg = data;
+      });
+  }
+
   // 手术提示信息
   surgeryLoading = false;
 	now:any = new Date();
@@ -1806,6 +1826,8 @@ export class HushijiandanComponent implements OnInit {
             // 药品静配权限
             that.getJpDrugsWKOMsg();
           }
+
+          that.getSpePackageCountMsg();
         }
 
         if(data.data.tabPermission && Array.isArray(data.data.tabPermission.data)){
@@ -4553,6 +4575,12 @@ export class HushijiandanComponent implements OnInit {
     }
     this.router.navigateByUrl(`/inspectClosedLoopView?queryParams=${JSON.stringify(queryParams)}`);
   }
+
+  // 标本打包弹窗
+  toSpecimenPackage(e, stateValue){
+    e.stopPropagation();
+    this.viewSpecimenPackageList(stateValue);
+  }
   // 隐藏查看标本详情弹层
   hideSpeDetailModel() {
     this.detailModel = false;
@@ -5284,6 +5312,9 @@ export class HushijiandanComponent implements OnInit {
     if(data.bussType.value === 'service'){
       // 运维报修
       this.showBxModal();
+    }else if(data.icon.value === 'specimenPackage'){
+      // 标本打包
+      this.router.navigateByUrl("/batchSpecimen");
     }else if(data.bussType.value === 'goods'){
       // 物品配送
       this.buildQuickConfirmData = data || {};
@@ -5442,4 +5473,16 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+
+  // 查看标本打包
+  specimenPackageStateValue;
+  isShowSpecimenPackageList = false; //业务数据弹窗开关
+  viewSpecimenPackageList(stateValue) {
+    this.specimenPackageStateValue = stateValue;
+    this.isShowSpecimenPackageList = true;
+  }
+  // 关闭标本打包弹窗
+  closeSpecimenPackageList(e) {
+    this.isShowSpecimenPackageList = JSON.parse(e).show;
+  }
 }

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

@@ -628,6 +628,11 @@ const routes: Routes = [
 			  path: "patientInspectLog",
 			  loadChildren: () => import("../patient-inspect-log/patient-inspect-log.module").then((m) => m.PatientInspectLogModule),
 			},
+      // 标本打包
+			{
+			  path: "specimenPackage",
+			  loadChildren: () => import("../specimen-package/specimen-package.module").then((m) => m.SpecimenPackageModule),
+      },
 			// 手术信息
 			{
 			  path: "operationSearch",

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

@@ -342,7 +342,8 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 			receiveUser:this.connectUserId,
 			deliveryUser:this.dispatchingUserId,
 			operationType:this.operationType,
-			id:this.scanCodeData.id
+			id:this.scanCodeData.id,
+      busiType: 'pathology',//病理打包
 		};
 		this.btnConnectLoading = true
 		this.mainService

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

@@ -219,7 +219,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.getToday()
 		},60000)
   }
-	
+
 	isShowNurseCode = false; //是否展开科室二维码
 	nurseCodeImg = ""; //图片
 	refreshQRCodeTime = 0; //刷新时间间隔
@@ -248,7 +248,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
   // 当前时间日期
   runTime() {
     clearTimeout(this.timer);
@@ -372,7 +372,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	    idx: that.pageThreeIndex - 1,
 	    sum: that.pageSize,
 	    pathologyPackInfo: {
-	  		deptId: this.deptId
+	  		deptId: this.deptId,
+        busiType: 'pathology',//病理打包
 	    },
 	  };
 	  this.loading3 = true;
@@ -478,7 +479,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			deliveryUser:this.handoverUserId,
 			receiveHos:this.validateForm.value.gurop,
 			targetDept:this.validateForm.value.department,
-			operationType:'bagDelivery'
+			operationType:'bagDelivery',
+      busiType: 'pathology',//病理打包
 		};
 		this.btnLoading = true
 		this.mainService
@@ -512,12 +514,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.isDeptLoading = true
 		this.changeInpSubjectDepartment.next([e]);
 	}
-	
+
 	// 关闭查看标本
 	closeSpecimenModal(){
 		this.specimenViewDialog = false
 	}
-	
+
 	// 查看标本
 	specimenViewDialog:any = false;
 	viewData:any = [];
@@ -528,7 +530,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.specimenItem = item;
 		this.viewData.push(item)
 	}
-	
+
 	// 获取院区
 	getHospitalData(){
 		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)

src/app/views/pathologyScan/pathologyScan.component.ts

@@ -431,7 +431,8 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			receiveUser:this.connectUserId,
 			deliveryUser:this.dispatchingUserId,
 			operationType:'bagReceive',
-			id:this.scanCodeData.id
+			id:this.scanCodeData.id,
+      busiType: 'pathology',//病理打包
 		};
 		this.btnConnectLoading = true
 		this.mainService

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

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

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

@@ -0,0 +1,103 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='19' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">时间区间</span>：
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">打包科室</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择打包科室" [(ngModel)]="searchDto.packDept" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('department', $event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+            <ng-container *ngFor="let option of deptList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="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 class="list-template__searchItem">
+          <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>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择状态" [(ngModel)]="searchDto.status">
+            <ng-container *ngFor="let option of stateList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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 nz-col nzLg="5" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</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="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>
+            <th nzWidth="10%">工单号</th>
+            <th nzWidth="10%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.packCode}}</td>
+            <td>{{ data.packUserDTO?.name }}<br>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{data.packDeptDTO?.dept}}</td>
+            <td>{{ data.endDeptNames }}</td>
+            <td>{{data.specimenNum}}</td>
+            <td>{{ data.deliveryUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.receiveUserDTO?.name }}<br>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.status?.name }}</td>
+            <td>{{ data.gdDTO?.gdcode }}</td>
+            <td>
+              <div class="coop">
+                <span (click)="showLogs(data)">查看日志</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 查看日志 -->
+<app-specimen-package-log-prompt-modal
+  *ngIf="logPromptModalShow"
+  [show]="logPromptModalShow"
+  [id]="packId"
+  (closeModelHs)="closeModelLog($event)"
+></app-specimen-package-log-prompt-modal>

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

@@ -0,0 +1,176 @@
+@import "../../../../src/theme.less";
+
+:host {
+  .list-template__top{
+    overflow: visible!important;
+    .label{
+      width: auto!important;
+    }
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    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: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > 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: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,240 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { startOfDay, endOfDay, format } from 'date-fns';
+@Component({
+  selector: "app-specimen-package",
+  templateUrl: "./specimen-package.component.html",
+  styleUrls: ["./specimen-package.component.less"],
+})
+export class SpecimenPackageComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modelName = ""; //模态框名称
+
+  searchTimerSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  dateRange: any = []; //发起时间
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getStatus();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl("/main/patientInspectLog/patientInspectLogDetail/" + id);
+  }
+
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.dateRange = [];
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      pathologyPackInfo: {
+        hosId: this.currentHospital.id,
+        busiType: 'specimen',//标本打包
+        status: this.searchDto.status ? { id: this.searchDto.status } : 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,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "pathologyPackInfo", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          let listOfData = data.list || [];
+          listOfData.forEach((v) => {
+            if(v.endDeptList){
+              v.endDeptNames = v.endDeptList.map(v => v.dept).toString();
+            }else{
+              v.endDeptNames = "";
+            }
+          })
+          this.listOfData = listOfData;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 搜索
+  changeInp(type, e) {
+    if(type === 'department'){
+      this.searchTimer(this.getDeptList, e);
+    }else if(type === 'patient'){
+      this.searchTimer(this.getDeliveryUserList, e);
+    }
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 获取科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.currentHospital.id,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  openChangePatient(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeliveryUserList();
+  }
+
+  // 获取配送人
+  deliveryUserList: any = [];
+  getDeliveryUserList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      user: {
+        hospital: { id: this.currentHospital.id },
+        name: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deliveryUserList = data.list || [];
+      });
+  }
+
+  //获取状态
+  stateList:any[] = [];
+  getStatus() {
+    this.mainService
+    .getDictionary('list', 'pathology_pack_status')
+    .subscribe((data) => {
+      this.stateList = data || [];
+    });
+  }
+
+  // 展示信息提示框（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(0);
+  }
+
+  // 查看日志弹窗
+  logPromptModalShow = false; //弹窗开关
+  packId = ""; //查看记录携带id
+  showLogs(data) {
+    this.packId = data.id;
+    this.logPromptModalShow = true;
+  }
+  // 关闭日志弹窗
+  closeModelLog(e) {
+    this.logPromptModalShow = JSON.parse(e).show;
+  }
+}

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

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

src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe674;</span>
+                <div class="name">打包</div>
+                <div class="code-name">&amp;#xe674;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe670;</span>
                 <div class="name">陪护管理</div>
                 <div class="code-name">&amp;#xe670;</div>
@@ -1074,9 +1080,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1743992402666') format('woff2'),
-       url('iconfont.woff?t=1743992402666') format('woff'),
-       url('iconfont.ttf?t=1743992402666') format('truetype');
+  src: url('iconfont.woff2?t=1746761473702') format('woff2'),
+       url('iconfont.woff?t=1746761473702') format('woff'),
+       url('iconfont.ttf?t=1746761473702') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1103,6 +1109,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-dabao"></span>
+            <div class="name">
+              打包
+            </div>
+            <div class="code-name">.transport-dabao
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-peihuguanli"></span>
             <div class="name">
               陪护管理
@@ -2634,6 +2649,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-dabao"></use>
+                </svg>
+                <div class="name">打包</div>
+                <div class="code-name">#transport-dabao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-peihuguanli"></use>
                 </svg>
                 <div class="name">陪护管理</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1743992402666') format('woff2'),
-       url('iconfont.woff?t=1743992402666') format('woff'),
-       url('iconfont.ttf?t=1743992402666') format('truetype');
+  src: url('iconfont.woff2?t=1746761473702') format('woff2'),
+       url('iconfont.woff?t=1746761473702') format('woff'),
+       url('iconfont.ttf?t=1746761473702') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-dabao:before {
+  content: "\e674";
+}
+
 .transport-peihuguanli:before {
   content: "\e670";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "9807812",
+      "name": "打包",
+      "font_class": "dabao",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
       "icon_id": "24101601",
       "name": "陪护管理",
       "font_class": "peihuguanli",