新药品

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.html

@@ -1,39 +1,37 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" style="width: 1200px;">
-    <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">药品详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <ng-template #elseTpl>
+      <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    </ng-template>
+    <div class="drugsBag" *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+      <div>单号：{{drugsBag.batchNo}}</div>
+      <div>申请科室：{{drugsBag.target ? drugsBag.target.dept : ''}}</div>
+      <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
+    </div>
     <div class="content">
-      <!-- 新药品 -->
-      <nz-table *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'" class="hospitalTable" [nzData]="drugsBugMultipleList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
-        <thead>
-          <tr class="thead">
-            <th nzWidth="5%">序号</th>
-            <th nzWidth="13%">患者姓名</th>
-            <th nzWidth="11%">患者ID</th>
-            <th nzWidth="11%">血液类型</th>
-            <th nzWidth="14%">血袋号</th>
-            <th nzWidth="11%">取血人</th>
-            <th nzWidth="12%">取血时间</th>
-            <th nzWidth="11%">接收人</th>
-            <th nzWidth="12%">接收时间</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let data of bloodList;let i = index;">
-            <td>{{i+1}}</td>
-            <td><span>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></span></td>
-            <td>{{ data.patientNo||'' }}</td>
-            <td>{{ data.type ? data.type.name : "" }}</td>
-            <td>{{ data.bloodCode||'' }}</td>
-            <td>{{ data.arriverDTO?data.arriverDTO.name:'' }}</td>
-            <td>{{ data.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-            <td>{{ data.receiverDTO ? data.receiverDTO.name : '' }}</td>
-            <td>{{ data.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-          </tr>
-        </tbody>
-      </nz-table>
+      <ng-container *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+        <!-- 新药品 -->
+        <nz-table class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
+          [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="5%">序号</th>
+              <th nzWidth="85%">药品名称+规格</th>
+              <th nzWidth="10%">数量</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of drugsBugSingleList;let i = index;">
+              <td>{{i+1}}</td>
+              <td>{{ data.drugsInfo }} {{ data.model }}</td>
+              <td>{{ data.drugsNum }}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </ng-container>
 
-      <div class="pagination" *ngIf="type !== 'drugsJpbag' || type !== 'drugsWestern' || type !== 'drugsReturn' || type !== 'drugsPoison' || type !== 'drugsHerbal'">
+      <div class="pagination" *ngIf="type !== 'drugsJpbag' && type !== 'drugsWestern' && type !== 'drugsReturn' && type !== 'drugsPoison' && type !== 'drugsHerbal'">
         <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
           [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.less

@@ -7,6 +7,14 @@
   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 {
@@ -61,10 +69,8 @@
 
   .modalBody {
     width: 700px;
-    min-height: 220px;
     background: #fff;
     border-radius: 5px;
-    padding: 10px 20px;
     color: #333;
     &.modalBody-search {
       width: 480px;
@@ -73,13 +79,17 @@
 
     .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: 0;
+        right: 28px;
         top: 0;
         font-size: 20px;
         color: #666;
@@ -89,12 +99,11 @@
     }
 
     .content {
-      min-height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
       overflow: hidden;
-      margin-top: 12px;
+      margin: 16px 24px 0;
       display: flex;
       flex-direction: column;
       justify-content: center;
@@ -152,6 +161,7 @@
 
     button {
       margin-top: 10px;
+      margin-bottom: 10px;
 
       &.btn {
         margin-left: 8px;

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { MainService } from '../../services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
-import { format, startOfDay, endOfDay } from 'date-fns';
 @Component({
   selector: 'app-businessData-detail-info-modal',
   templateUrl: './businessData-detail-info-modal.component.html',
@@ -11,10 +10,6 @@ export class BusinessDataDetailInfoModalComponent implements OnInit {
   // 切换科室，切换弹窗
   hosId;
   hsLoading = false;
-  bloodList: any = [];// 血制品列表
-  washingExceptionList: any = [];// 被服洗涤异常列表
-  specimenList: any = [];// 标本列表
-  inspectionRateStatisticsList: any = [];// 科室检查率统计列表
   pageIndex: number = 1;//表格当前页码
   pageSize: number = 10;//表格每页展示条数
   total: number = 0;//表格总数据量
@@ -23,7 +18,7 @@ export class BusinessDataDetailInfoModalComponent implements OnInit {
     specimenDesc: 0,
   }
   @Input() show: Boolean;
-  @Input() orderId: String;
+  @Input() infoId: String;
   @Input() type: String = '';
   @Input() dataInfo: any;
 
@@ -33,25 +28,7 @@ export class BusinessDataDetailInfoModalComponent implements OnInit {
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
-    this.tabType = 1;
     switch(this.type){
-      case 'blood':
-        this.getBlood(1);
-        break;
-      case 'specimen':
-        this.getSpecimen(1);
-        this.getSpecimenType();
-        this.getSpecimenDesc();
-        break;
-      case 'deptInspectionRateStatistics':
-        this.getDeptInspectionRateStatistics(1);
-        break;
-      case 'deptInspectionStatistics':
-        this.getDeptInspectionStatistics(1);
-        break;
-      case 'washingException':
-        this.getWashingException(1);
-        break;
       case 'drugsJpbag':
         this.getNewDrugConfig(1);
         break;
@@ -75,44 +52,9 @@ export class BusinessDataDetailInfoModalComponent implements OnInit {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
 
-  // 切换tab栏
-  tabType: number = 1; //tab栏
-  checkTab(type) {
-    this.tabType = type;
-  }
-
-  // 切换标本类型下拉框
-  selectStype(e){
-    console.log(e);
-    this.searchCriteria.specimenDesc = 0;
-    this.getSpecimenDesc();
-    this.getSpecimen(1);
-  }
-
-  // 切换标本类型下拉框
-  selectDesc(e){
-    console.log(e);
-    this.getSpecimen(1);
-  }
-
   // 分页获取数据
   getList(){
     switch(this.type){
-      case 'blood':
-        this.getBlood();
-        break;
-      case 'specimen':
-          this.getSpecimen();
-          break;
-      case 'deptInspectionRateStatistics':
-        this.getDeptInspectionRateStatistics();
-        break;
-      case 'deptInspectionStatistics':
-        this.getDeptInspectionStatistics();
-        break;
-      case 'washingException':
-        this.getWashingException();
-        break;
       case 'drugsJpbag':
         this.getDrugsBugList(1);
         break;
@@ -131,147 +73,30 @@ export class BusinessDataDetailInfoModalComponent implements OnInit {
     }
   }
 
-  // 获取列表数据
-  getBlood(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
-    let postData = {
-      "type": "blood",
-      "orderId": this.orderId
-    }
-    this.hsLoading = true;
-    this.mainService.checkData(postData).subscribe((data:any) => {
-      this.hsLoading = false;
-      this.bloodList = data.data ? data.data.all : [];
-      this.pageSize = this.total = data.data ? data.data.all.length : 0;
-    })
-  }
-
-  // 获取标本类型
-  specimentTypeList: any[] = [{ id: 0, name: '全部' }];
-  getSpecimenType() {
-    this.mainService.getDictionary("list", "specimen_type").subscribe((data:any) => {
-      let specimentTypeList = [{ id: 0, name: '全部' }];
-      this.specimentTypeList = specimentTypeList.concat(data);
-    })
-  }
-
-  // 获取检验项目
-  specimenDescList: any[] = [{ id: 0, name: '', nameNum: '全部' }];
-  id:number = 0;
-  getSpecimenDesc() {
-    let postData = {
-      "hosId": this.hosId,
-      "gdId": this.orderId,
-      "stype": this.searchCriteria.stype || undefined,
-    };
-    this.mainService.specimenCount(postData).subscribe((data:any) => {
-      data.data = data.data || [];
-      let specimenDescList:any = [{ id: 0, name: '全部', nameNum: '全部' }];
-      specimenDescList[0].nameNum = `全部(${data.total})`;
-      this.specimenDescList = specimenDescList.concat( data.data.map(v => ({id: --this.id, name: v[0] || '', nameNum: (v[0] ? v[0].slice(0, 15) + (v[0].length >= 15 ? '...' : '') : '') + `(${v[1]})`})));
-    })
-  }
-
-  // 获取标本列表
-  getSpecimen(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
-    let postData = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      specimen: {
-        orderBy: 'arrive_time desc',
-        hosId: this.hosId,
-        gdid: this.orderId,
-        stype: this.searchCriteria.stype ? { id: this.searchCriteria.stype } : undefined,
-        specimenDesc: this.searchCriteria.specimenDesc ? this.specimenDescList.find(v => v.id == this.searchCriteria.specimenDesc).name: undefined,
-      }
-    }
-    this.hsLoading = true;
-    this.mainService.getFetchDataList('simple/data','specimen',postData).subscribe(data => {
-      this.hsLoading = false;
-      this.specimenList = data.list || [];
-      this.total = data.totalNum || 0;
-    })
-  }
-
-  // 获取被服洗涤异常列表
-  getWashingException(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
-    let postData = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      clothesException: {
-        hosId: this.hosId,
-        batchId: this.orderId,
-      }
-    }
-    this.hsLoading = true;
-    this.mainService.getFetchDataList('simple/data','clothesException',postData).subscribe(data => {
-      this.hsLoading = false;
-      this.washingExceptionList = data.list || [];
-      this.total = data.totalNum || 0;
-    })
-  }
-
   // 获取新药品一单一码列表
   drugsBugSingleList: any = [];// 药品列表
-  getDrugsBugSingle(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
+  drugsBag:any = {};// 药包
+  getDrugsBugSingle(drugsBagId) {
     let postData = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      clothesException: {
-        hosId: this.hosId,
-        batchId: this.orderId,
-      }
+      type: this.type,
+      extraType: 'drugsInfo',
+      drugsBagId,
     }
     this.hsLoading = true;
-    this.mainService.getFetchDataList('simple/data','clothesException',postData).subscribe(data => {
+    this.mainService.transflow(postData, 'extra').subscribe(res => {
       this.hsLoading = false;
-      this.drugsBugSingleList = data.list || [];
-      this.total = data.totalNum || 0;
-    })
-  }
-
-  // 获取新药品一单多码列表
-  drugsBugMultipleList: any = [];// 药包列表
-  getDrugsBugMultiple(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
-    let postData = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      clothesException: {
-        hosId: this.hosId,
-        batchId: this.orderId,
+      if(res.state == 200){
+        if(res.data){
+          this.drugsBugSingleList = res.data.drugsList || [];
+          this.drugsBag = res.data.drugsBag || {};
+        }
       }
-    }
-    this.hsLoading = true;
-    this.mainService.getFetchDataList('simple/data','clothesException',postData).subscribe(data => {
-      this.hsLoading = false;
-      this.drugsBugMultipleList = data.list || [];
-      this.total = data.totalNum || 0;
     })
   }
 
   // 获取新药品列表
   getDrugsBugList(idx?){
-    if(this.configs.drugsModel === 1){
-      // 一单一码
-      this.getDrugsBugSingle(idx);
-    }else if(this.configs.drugsModel === 2){
-      // 一单多码
-      this.getDrugsBugMultiple(idx);
-    }
+    this.getDrugsBugSingle(this.infoId);
   }
 
   // 获取新药品配置
@@ -306,116 +131,6 @@ export class BusinessDataDetailInfoModalComponent implements OnInit {
       });
   }
 
-  // 获取科室检查率统计-详情列表
-  getDeptInspectionRateStatistics(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
-    let postData:any = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      canceled: this.dataInfo.canceled ? true : undefined,
-      priority: this.dataInfo.priority ? 0 : undefined,
-    }
-    switch(this.dataInfo.type){
-      case 'total':
-        postData.deptId = this.dataInfo.data.id;
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        break;
-      case 'noCheckCount':
-        postData.deptId = this.dataInfo.data.id;
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.reportInsState = 'noCheck';
-        break;
-      case 'checkCount':
-        postData.deptId = this.dataInfo.data.id;
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.reportInsState = 'check';
-        break;
-      case 'insCount':
-        postData.deptId = this.dataInfo.data.id;
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.reportInsState = 'inspect';
-        break;
-    }
-    this.hsLoading = true;
-    this.mainService.listMsgByMain("listInspect", postData).subscribe((data: any) => {
-      this.hsLoading = false;
-      this.inspectionRateStatisticsList = data.list || [];
-      this.total = data.totalNum || 0;
-    })
-
-  }
-
-  // 获取科室检查统计-详情列表
-  getDeptInspectionStatistics(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
-    let postData:any = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      znDeptInspect: true,
-    }
-    switch(this.dataInfo.type){
-      case 'total':
-        postData.deptId = this.dataInfo.data[10];
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        break;
-      case 'cancel':
-        postData.deptId = this.dataInfo.data[10];
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.cancel = true;
-        break;
-      case 'priority':
-        postData.deptId = this.dataInfo.data[10];
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.priority = 1;
-        break;
-      case 'noneYY':
-        postData.deptId = this.dataInfo.data[10];
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.noneYY = true;
-        break;
-      case 'waitCheck':
-        postData.deptId = this.dataInfo.data[10];
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.waitCheck = true;
-        break;
-      case 'doCheck':
-        postData.deptId = this.dataInfo.data[10];
-        postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
-        postData.doCheck = true;
-        break;
-    }
-    this.hsLoading = true;
-    this.mainService.listMsgByMain("listInspect", postData).subscribe((data: any) => {
-      this.hsLoading = false;
-      this.inspectionRateStatisticsList = data.list || [];
-      this.total = data.totalNum || 0;
-    })
-
-  }
 }
 
 

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -1,6 +1,14 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" style="width: 1200px;">
-    <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">药品详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <ng-template #elseTpl>
+      <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    </ng-template>
+    <div class="drugsBag" *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')">
+      <div>单号：{{drugsBag.batchNo}}</div>
+      <div>申请科室：{{drugsBag.target ? drugsBag.target.dept : ''}}</div>
+      <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
+    </div>
     <div class="content">
       <!-- 血制品 -->
       <nz-table *ngIf="type === 'blood'" class="hospitalTable" [nzData]="bloodList" nzSize="middle" [nzShowPagination]="false"
@@ -43,10 +51,10 @@
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of bloodList;let i = index;" (click)="viewDetail(type)">
+          <tr *ngFor="let data of drugsBugSingleList;let i = index;">
             <td>{{i+1}}</td>
-            <td><span>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></span></td>
-            <td>{{ data.patientNo||'' }}</td>
+            <td>{{ data.drugsInfo }} {{ data.model }}</td>
+            <td>{{ data.drugsNum }}</td>
           </tr>
         </tbody>
       </nz-table>
@@ -56,25 +64,29 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="15%">单号</th>
-            <th nzWidth="10%">种类数</th>
-            <th nzWidth="10%">总数</th>
-            <th nzWidth="15%">收取时间</th>
-            <th nzWidth="15%">送达时间</th>
-            <th nzWidth="15%">送达人</th>
-            <th nzWidth="15%">交接人</th>
+            <th nzWidth="11%">单号</th>
+            <th nzWidth="8%">种类数</th>
+            <th nzWidth="8%">总数</th>
+            <th nzWidth="10%">收取人</th>
+            <th nzWidth="10%">收取交接人</th>
+            <th nzWidth="14%">收取时间</th>
+            <th nzWidth="10%">送达人</th>
+            <th nzWidth="14%">送达交接人</th>
+            <th nzWidth="10%">送达时间</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of bloodList;let i = index;" (click)="viewDetail(type)">
+          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)">
             <td>{{i+1}}</td>
-            <td><span>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></span></td>
-            <td>{{ data.patientNo||'' }}</td>
-            <td>{{ data.type ? data.type.name : "" }}</td>
-            <td>{{ data.bloodCode||'' }}</td>
-            <td>{{ data.arriverDTO?data.arriverDTO.name:'' }}</td>
-            <td>{{ data.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-            <td>{{ data.receiverDTO ? data.receiverDTO.name : '' }}</td>
+            <td>{{ data.batchNo }}</td>
+            <td>{{ data.drugsTypeCount }}</td>
+            <td>{{ data.drugsCount }}</td>
+            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.username}}</ng-container></td>
+            <td><ng-container *ngIf="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.handoverUserid.name}}</ng-container></td>
+            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.operationTime}}</ng-container></td>
+            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.username}}</ng-container></td>
+            <td><ng-container *ngIf="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.handoverUserid.name}}</ng-container></td>
+            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.operationTime}}</ng-container></td>
           </tr>
         </tbody>
       </nz-table>
@@ -201,7 +213,7 @@
         </tbody>
       </nz-table>
 
-      <div class="pagination" *ngIf="type !== 'blood' || type !== 'drugsJpbag' || type !== 'drugsWestern' || type !== 'drugsReturn' || type !== 'drugsPoison' || type !== 'drugsHerbal'">
+      <div class="pagination" *ngIf="type !== 'blood' && type !== 'drugsJpbag' && type !== 'drugsWestern' && type !== 'drugsReturn' && type !== 'drugsPoison' && type !== 'drugsHerbal'">
         <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
           [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
@@ -220,6 +232,6 @@
   *ngIf="businessDataModalShow"
   [show]="businessDataModalShow"
   [type]="businessDataModalType"
-  [orderId]="orderId"
+  [infoId]="infoId"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-info-modal>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -7,6 +7,14 @@
   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 {
@@ -61,10 +69,8 @@
 
   .modalBody {
     width: 700px;
-    min-height: 220px;
     background: #fff;
     border-radius: 5px;
-    padding: 10px 20px;
     color: #333;
     &.modalBody-search {
       width: 480px;
@@ -73,13 +79,17 @@
 
     .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: 0;
+        right: 28px;
         top: 0;
         font-size: 20px;
         color: #666;
@@ -89,12 +99,11 @@
     }
 
     .content {
-      min-height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
       overflow: hidden;
-      margin-top: 12px;
+      margin: 16px 24px 0;
       display: flex;
       flex-direction: column;
       justify-content: center;
@@ -152,6 +161,7 @@
 
     button {
       margin-top: 10px;
+      margin-bottom: 10px;
 
       &.btn {
         margin-left: 8px;

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, Input, Output, EventEmitter } 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';
 @Component({
   selector: 'app-businessData-detail-modal',
   templateUrl: './businessData-detail-modal.component.html',
@@ -29,7 +30,11 @@ export class BusinessDataDetailModalComponent implements OnInit {
 
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
-  constructor(private mainService: MainService, private tool: ToolService) { }
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
@@ -221,26 +226,31 @@ export class BusinessDataDetailModalComponent implements OnInit {
 
   // 获取新药品一单一码列表
   drugsBugSingleList: any = [];// 药品列表
-  getDrugsBugSingle(idx?) {
-    if (idx) {
-      this.pageIndex = 1;
-    }
+  drugsBag:any = {};// 药包
+  getDrugsBugSingle(drugsBagId) {
     let postData = {
       type: this.type,
       extraType: 'drugsInfo',
-      // drugsBagId,
+      drugsBagId,
     }
     this.hsLoading = true;
-    this.mainService.transflow(postData, 'extra').subscribe(data => {
+    this.mainService.transflow(postData, 'extra').subscribe(res => {
       this.hsLoading = false;
-      this.drugsBugSingleList = data.list || [];
-      this.total = data.totalNum || 0;
+      if(res.state == 200){
+        if(res.data){
+          this.drugsBugSingleList = res.data.drugsList || [];
+          this.drugsBag = res.data.drugsBag || {};
+        }
+      }
     })
   }
 
   // 获取新药品一单多码列表
   drugsBugMultipleList: any = [];// 药包列表
-  getDrugsBugMultiple(idx?) {
+  workOrder:any = {};// 工单
+  handoverStartObj:any = {};// 接收人
+  handoverEndObj:any = {};// 送达人
+  getDrugsBugMultiple(idx, drugsModel) {
     if (idx) {
       this.pageIndex = 1;
     }
@@ -250,22 +260,34 @@ export class BusinessDataDetailModalComponent implements OnInit {
       orderId: this.orderId,
     }
     this.hsLoading = true;
-    this.mainService.transflow(postData, 'extra').subscribe(data => {
+    this.mainService.transflow(postData, 'extra').subscribe(res => {
       this.hsLoading = false;
-      this.drugsBugMultipleList = data.list || [];
-      this.total = data.totalNum || 0;
+      if(res.state == 200){
+        if(res.data){
+          this.drugsBugMultipleList = res.data.drugsBagList || [];
+          this.workOrder = res.data.workOrder || {};
+          this.total = this.drugsBugMultipleList.length;
+
+          this.handoverStartObj = this.workOrder.record.find(v => v.operation.value == 8);
+          this.handoverEndObj = this.workOrder.record.find(v => v.operation.value == 10);
+
+          if(drugsModel === 1){
+            // 一单一码
+            if(this.drugsBugMultipleList.length){
+              this.getDrugsBugSingle(this.drugsBugMultipleList[0].id);
+            }else{
+              this.message.warning('未查询到药品！')
+            }
+          }
+
+        }
+      }
     })
   }
 
   // 获取新药品列表
   getDrugsBugList(idx?){
-    if(this.configs.drugsModel === 1){
-      // 一单一码
-      this.getDrugsBugSingle(idx);
-    }else if(this.configs.drugsModel === 2){
-      // 一单多码
-      this.getDrugsBugMultiple(idx);
-    }
+    this.getDrugsBugMultiple(idx, this.configs.drugsModel);
   }
 
   // 获取新药品配置
@@ -414,7 +436,9 @@ export class BusinessDataDetailModalComponent implements OnInit {
   // 查看业务数据
   businessDataModalShow = false; //业务数据弹窗开关
   businessDataModalType = ''; //业务数据类型
-  viewDetail(type) {
+  infoId = ''; //业务数据id
+  viewDetail(type, id) {
+    this.infoId = id;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;
   }