stash

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

@@ -0,0 +1,48 @@
+<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="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>
+
+      <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()"
+          (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,201 @@
+@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;
+      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__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .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 {
+    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 {
+        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;
+        }
+      }
+    }
+
+    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/businessData-detail-info-modal/businessData-detail-info-modal.component.ts

@@ -0,0 +1,422 @@
+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',
+  styleUrls: ['./businessData-detail-info-modal.component.less']
+})
+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;//表格总数据量
+  searchCriteria:any = {
+    stype: 0,
+    specimenDesc: 0,
+  }
+  @Input() show: Boolean;
+  @Input() orderId: String;
+  @Input() type: String = '';
+  @Input() dataInfo: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  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;
+      case 'drugsWestern':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsReturn':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsPoison':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsHerbal':
+        this.getNewDrugConfig(1);
+        break;
+
+    }
+  }
+  // 关闭弹窗
+  hideModal() {
+    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;
+      case 'drugsWestern':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsReturn':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsPoison':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsHerbal':
+        this.getDrugsBugList(1);
+        break;
+    }
+  }
+
+  // 获取列表数据
+  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;
+    }
+    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.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,
+      }
+    }
+    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);
+    }
+  }
+
+  // 获取新药品配置
+  configs:any = {};
+  getNewDrugConfig(idx?) {
+    this.hsLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 1,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: this.type,
+          }
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let list = result.list || [];
+          this.configs = list[0] || {};
+          this.getDrugsBugList(idx);
+        }else{
+          this.hsLoading = false;
+        }
+      });
+  }
+
+  // 获取科室检查率统计-详情列表
+  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

@@ -32,6 +32,52 @@
           </tr>
         </tbody>
       </nz-table>
+      <!-- 新药品-一单一码 -->
+      <nz-table *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" 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 bloodList;let i = index;" (click)="viewDetail(type)">
+            <td>{{i+1}}</td>
+            <td><span>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></span></td>
+            <td>{{ data.patientNo||'' }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <!-- 新药品-一单多码 -->
+      <nz-table *ngIf="configs.drugsModel === 2 && (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="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>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of bloodList;let i = index;" (click)="viewDetail(type)">
+            <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>
+          </tr>
+        </tbody>
+      </nz-table>
       <!-- 标本 -->
       <div class="list-template w100" *ngIf="type === 'specimen'">
         <div class="list-template__content">
@@ -155,7 +201,7 @@
         </tbody>
       </nz-table>
 
-      <div class="pagination" *ngIf="type !== 'blood'">
+      <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()"
@@ -168,3 +214,12 @@
     </div>
   </div>
 </div>
+
+<!-- 业务数据-二级信息查看 -->
+<app-businessData-detail-info-modal
+  *ngIf="businessDataModalShow"
+  [show]="businessDataModalShow"
+  [type]="businessDataModalType"
+  [orderId]="orderId"
+  (closeModelHs)="closeModelBlood($event)"
+></app-businessData-detail-info-modal>

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

@@ -39,19 +39,35 @@ export class BusinessDataDetailModalComponent implements OnInit {
         this.getBlood(1);
         break;
       case 'specimen':
-          this.getSpecimen(1);
-          this.getSpecimenType();
-          this.getSpecimenDesc();
-          break;
+        this.getSpecimen(1);
+        this.getSpecimenType();
+        this.getSpecimenDesc();
+        break;
       case 'deptInspectionRateStatistics':
-          this.getDeptInspectionRateStatistics(1);
-          break;
+        this.getDeptInspectionRateStatistics(1);
+        break;
       case 'deptInspectionStatistics':
         this.getDeptInspectionStatistics(1);
         break;
       case 'washingException':
-          this.getWashingException(1);
-          break;
+        this.getWashingException(1);
+        break;
+      case 'drugsJpbag':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsWestern':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsReturn':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsPoison':
+        this.getNewDrugConfig(1);
+        break;
+      case 'drugsHerbal':
+        this.getNewDrugConfig(1);
+        break;
+
     }
   }
   // 关闭弹窗
@@ -97,6 +113,21 @@ export class BusinessDataDetailModalComponent implements OnInit {
       case 'washingException':
         this.getWashingException();
         break;
+      case 'drugsJpbag':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsWestern':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsReturn':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsPoison':
+        this.getDrugsBugList(1);
+        break;
+      case 'drugsHerbal':
+        this.getDrugsBugList(1);
+        break;
     }
   }
 
@@ -188,6 +219,87 @@ export class BusinessDataDetailModalComponent implements OnInit {
     })
   }
 
+  // 获取新药品一单一码列表
+  drugsBugSingleList: any = [];// 药品列表
+  getDrugsBugSingle(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      type: this.type,
+      extraType: 'drugsInfo',
+      // drugsBagId,
+    }
+    this.hsLoading = true;
+    this.mainService.transflow(postData, 'extra').subscribe(data => {
+      this.hsLoading = false;
+      this.drugsBugSingleList = data.list || [];
+      this.total = data.totalNum || 0;
+    })
+  }
+
+  // 获取新药品一单多码列表
+  drugsBugMultipleList: any = [];// 药包列表
+  getDrugsBugMultiple(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      type: this.type,
+      extraType: 'orderInfo',
+      orderId: this.orderId,
+    }
+    this.hsLoading = true;
+    this.mainService.transflow(postData, 'extra').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);
+    }
+  }
+
+  // 获取新药品配置
+  configs:any = {};
+  getNewDrugConfig(idx?) {
+    this.hsLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 1,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: this.type,
+          }
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let list = result.list || [];
+          this.configs = list[0] || {};
+          this.getDrugsBugList(idx);
+        }else{
+          this.hsLoading = false;
+        }
+      });
+  }
+
   // 获取科室检查率统计-详情列表
   getDeptInspectionRateStatistics(idx?) {
     if (idx) {
@@ -298,6 +410,18 @@ export class BusinessDataDetailModalComponent implements OnInit {
     })
 
   }
+
+  // 查看业务数据
+  businessDataModalShow = false; //业务数据弹窗开关
+  businessDataModalType = ''; //业务数据类型
+  viewDetail(type) {
+    this.businessDataModalType = type;
+    this.businessDataModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelBlood(e) {
+    this.businessDataModalShow = JSON.parse(e).show;
+  }
 }
 
 

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

@@ -1239,6 +1239,9 @@
     <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'blood')">
       业务数据
     </button>
+    <button *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')" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, orderInfo.taskType.ordinaryField.value)">
+      业务数据
+    </button>
     <button *ngIf="orderInfo.taskType.associationType.value == 'specimen' || orderInfo.taskType.associationType.value == 'specimenPlan'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'specimen')">
       业务数据
     </button>

src/app/share/share.module.ts

@@ -58,6 +58,7 @@ import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
 import { PathologyAddComponent } from './pathology-add/pathology-add.component';
 import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
 import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
+import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info-modal/businessData-detail-info-modal.component';
 
 @NgModule({
   declarations: [
@@ -81,6 +82,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
     InspectionAddressTagPromptModalComponent,
     InspectionExecuteAssignPromptModalComponent,
     BusinessDataDetailModalComponent,
+    BusinessDataDetailInfoModalComponent,
     RelationTransDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,
@@ -113,6 +115,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
     SpePromptModalComponent,
     OrderPromptModalComponent,
     BusinessDataDetailModalComponent,
+    BusinessDataDetailInfoModalComponent,
     RelationTransDetailModalComponent,
     DetailOrdinaryComponent,
     BloodHistoryPromptModalComponent,
@@ -148,6 +151,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
     InspectionAddressTagPromptModalComponent,
     InspectionExecuteAssignPromptModalComponent,
     BusinessDataDetailModalComponent,
+    BusinessDataDetailInfoModalComponent,
     RelationTransDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,