增加万能交接服务得血制品

src/app/services/main.service.ts

@@ -644,4 +644,14 @@ export class MainService {
       }
     );
   }
+  //查看工单里的血制品信息
+  checkData(data) {
+    return this.http.post(
+      host.host + "/transflow/checkData",
+      data,
+      {
+        headers: this.headers,
+      }
+    );
+  }
 }

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

@@ -0,0 +1,45 @@
+<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 class="hospitalTable" [nzData]="historySpecimenList" 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 bloodDTO of historySpecimenList;let i = index;">
+            <td>{{i+1}}</td>
+            <td><span>{{ bloodDTO.patientName }}<span *ngIf="bloodDTO.bedNum">({{ bloodDTO.bedNum }})</span></span></td>
+            <td>{{ bloodDTO.patientNo||'' }}</td>
+            <td>{{ bloodDTO.type ? bloodDTO.type.name : "" }}</td>
+            <td>{{ bloodDTO.bloodCode||'' }}</td>
+            <td>{{ bloodDTO.arriverDTO?bloodDTO.arriverDTO.name:'' }}</td>
+            <td>{{ bloodDTO.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
+            <td></td>
+            <td>{{ bloodDTO.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</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 know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,163 @@
+@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;
+      }
+    }
+  }
+
+  .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;
+          }
+        }
+
+        &: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/blood-detail-modal/blood-detail-modal.component.ts

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

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

@@ -0,0 +1,172 @@
+<!-- 标本 -->
+<div class="detail" *ngIf="!maskFlag">
+  <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
+  <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
+    <div class="content">
+      <div class="top" *ngIf="amplificationShow">
+        <div class="num">
+          <span class="left">单号：{{orderInfo.gdcode}}</span>
+          <span class="right">{{orderInfo.gdState.name}}</span>
+        </div>
+        <div class="info" nz-row>
+          <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
+          <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
+          <div nz-col nzSpan="8">
+            申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+          </div>
+          <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>
+          <div nz-col nzSpan="8">预计接收：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
+          <div nz-col nzSpan="8">实际接收：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
+          </div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
+            特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+          </div>
+        </div>
+      </div>
+      <div class="center" *ngIf="amplificationShow">
+        <div class="box display_flex justify-content_flex-center">
+          <div class="steps" *ngFor="let step of logList;let i=index;">
+            <div class="step">
+              <div class="info">
+                <i
+                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+                <p>{{step.operationName}}</p>
+                <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+                <p *ngIf="step.record[0]&&step.record[0].dept">
+                  <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
+                </p>
+                <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
+              </div>
+              <div class="line"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom">
+        <div class="urgent">
+          <div>
+            <ng-container *ngIf="amplificationShow&&orderInfo.urgentDetails&&showCoop">
+                加急原因：{{orderInfo.urgentDetails.urgentReason}}
+              <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" class=" btn default" nz-button nzType="primary"
+                [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
+            </ng-container>
+          </div>
+          <!-- <div class="amplification">
+            <button
+              nz-button
+              nzType="primary"
+              class="btn default"
+              (click)="amplification()"
+            >
+              {{ amplificationShow ? "放大" : "还原" }}
+            </button>
+          </div> -->
+        </div>
+
+        <!-- <div class="table">
+          <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="4%">序号</th>
+                <th nzWidth="8%">申请科室</th>
+                <th nzWidth="7%">患者姓名</th>
+                <th nzWidth="5%">标本编码</th>
+                <th nzWidth="8%">检验项目</th>
+                <th nzWidth="8%">标本类型</th>
+                <th nzWidth="5%">状态</th>
+                <th nzWidth="8%">收取时间</th>
+                <th nzWidth="8%">收取人</th>
+                <th nzWidth="8%">中转时间</th>
+                <th nzWidth="8%">送达时间</th>
+                <th nzWidth="8%">送达人</th>
+                <th nzWidth="8%">终点科室</th>
+              </tr>
+            </thead>
+            <tbody *ngIf="orderInfo.specimenSet">
+              <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
+                <td>{{ i + 1 }}</td>
+                <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+                <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+                <td>{{ data.scode || "-" }}</td>
+                <td>{{ data.specimenDesc || "-" }}</td>
+                <td>{{ data.stype ? data.stype.name : "-" }}</td>
+                <td>{{ data.speState ? data.speState.name : "-" }}</td>
+                <td>{{ data.arriveTime || "-" }}</td>
+                <td>{{ data.receiverName || "-" }}</td>
+                <td>{{ data.transTime || '-' }}</td>
+                <td>{{ data.sendTime || '-' }}</td>
+                <td>{{ data.delivererName || "-" }}</td>
+                <td>
+                  {{ data.checkDept ? (!showCoop&&deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept) : "-" }}
+                  <img *ngIf="data.urgent == 1"
+                  src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div> -->
+      </div>
+    </div>
+  </overlay-scrollbars>
+  <div class="btns display_flex justify-content_flex-center align-items_center">
+    <!-- <button *ngIf="showCoop&&orderInfo.gdState.value==2" nz-button nzType="primary" (click)='allotWorker()'>派单</button>
+    <button *ngIf="showCoop&&(orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button nzType="primary" nzGhost
+      (click)="openRecallModal()">撤回</button>
+    <button *ngIf="showCoop&&(orderInfo.gdState.value==2||orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button
+      nzType="danger" (click)="openDelModal()">删除</button> -->
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo)">
+      业务数据
+    </button>
+    <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
+  </div>
+</div>
+<!-- 撤回工单 -->
+<div class="recallOrder display_flex justify-content_flex-center align-items_center" *ngIf="recallOrderShow">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
+    <div class="content">
+      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+      <div class="defeat">您确认要撤回此工单吗？</div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center align-items_center">
+      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">确认</button>
+      <button nz-button nzType="primary" [nzLoading]='recLoading' nzGhost (click)="recAndDel()">撤回并删除</button>
+      <button class=" btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">关闭</button>
+    </div>
+  </div>
+</div>
+
+<!-- 删除工单 -->
+<div class="recallOrder display_flex justify-content_flex-center align-items_center delModel" *ngIf="delOrderShow">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeDelOrderModal()"></i></div>
+    <div class="content">
+      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+      <div class="defeat">您确认要删除此工单吗？</div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmDel()">确认</button>
+      <!-- <button class="candelBtn btn display_flex justify-content_flex-center" nz-button nzType="primary" nzGhost>撤回并删除</button> -->
+      <button class=" btn cancel" nz-button nzType="default" (click)="closeDelOrderModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 业务数据查看 -->
+<app-blood-detail-modal
+  *ngIf="bloodModalShow"
+  [show]="bloodModalShow"
+  [orderId]="orderId"
+  (closeModelHs)="closeModelBlood($event)"
+></app-blood-detail-modal>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="close()">
+  <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
+</app-prompt-modal>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,308 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 9;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.detail {
+  width: 1200px;
+  height: calc(100vh - 100px);
+  min-height: 580px;
+  border-radius: 5px;
+  background: #fff;
+  color: #333;
+  font-size: 14px;
+  padding: 12px 20px;
+  position: relative;
+  padding-bottom: 70px;
+
+  .title {
+    font-size: 18px;
+    text-align: center;
+    line-height: 24px;
+    margin: 0;
+    margin-bottom: 12px;
+    position: relative;
+
+    i {
+      position: absolute;
+      right: 0;
+      top: 0;
+      font-size: 20px;
+      color: #666;
+      cursor: pointer;
+      padding: 0 5px;
+    }
+  }
+
+  .content {
+    width: 1160px;
+    // height: 474px;
+    border: 1px solid #e5e9ed;
+    border-radius: 5px;
+    overflow: hidden;
+
+    & > .top {
+      padding: 10px 32px;
+      border-bottom: 1px solid #e5e9ed;
+
+      .num {
+        font-size: 16px;
+        overflow: hidden;
+        margin-bottom: 6px;
+
+        .left {
+          float: left;
+          font-weight: 600;
+        }
+
+        .right {
+          float: right;
+        }
+      }
+
+      .info {
+        color: #666;
+
+        & > div {
+          margin: 4px 0;
+        }
+      }
+    }
+
+    & > .center {
+      padding: 27px 0 17px 0;
+      border-bottom: 1px solid #e5e9ed;
+      font-size: 12px;
+
+      .box {
+        // display: flex;
+        // justify-content: center;
+
+        .steps {
+          &:nth-last-child(1) {
+            .line {
+              display: none !important;
+            }
+          }
+
+          .step {
+            .info {
+              width: 90px;
+              text-align: center;
+              display: inline-block;
+              vertical-align: top;
+
+              i {
+                color: #e5e9ed;
+
+                &.green {
+                  color: @primary-color;
+                }
+              }
+            }
+
+            p {
+              margin: 0;
+            }
+
+            .line {
+              display: inline-block;
+              width: 60px;
+              height: 2px;
+              background: #e5e9ed;
+            }
+          }
+        }
+      }
+    }
+
+    & > .bottom {
+      padding: 28px 32px;
+      background: #f9fafb;
+
+      .urgent {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 8px;
+        input {
+          width: 600px;
+        }
+
+        .candelBtn {
+          margin-left: 20px;
+        }
+      }
+
+      .table {
+        width: 100%;
+        background: #fff;
+        border-radius: 5px;
+
+        .thead {
+          background: linear-gradient(to right, @bg-start, @bg-end) !important;
+          th {
+            color: #fff !important;
+            text-align: center;
+            font-size: 12px;
+            border: none;
+          }
+        }
+
+        .ant-table-tbody {
+          tr {
+            text-align: center;
+            font-size: 12px;
+            border: none;
+
+            td {
+              border: none;
+              position: relative;
+            }
+          }
+
+          tr:nth-child(2n) {
+            background: #f9fafb;
+          }
+        }
+      }
+    }
+  }
+
+  .btns {
+    // display: flex;
+    // justify-content: center;
+    // align-items: center;
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 20px;
+
+    button {
+      margin: 9px;
+      margin-bottom: 0;
+    }
+  }
+
+  .ant-table {
+    border: none !important;
+  }
+}
+
+// 撤回工单
+.recallOrder {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  // display: flex;
+  // justify-content: center;
+  // align-items: center;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    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;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #ff3b53;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+
+      .conditions {
+        padding: 16px 20px;
+
+        div {
+          text-align: left;
+        }
+      }
+    }
+
+    .btns {
+      // display: flex;
+      // justify-content: center;
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          width: 80px;
+          margin-left: 8px;
+        }
+      }
+    }
+  }
+}
+
+.txtC {
+  text-align: center;
+}
+.ji {
+  position: absolute;
+  right: 0px;
+  top: -3px;
+  width: 30px;
+}

src/app/share/detail-blood/detail-blood.component.ts

@@ -0,0 +1,255 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MainService } from "../../services/main.service";
+import { forkJoin } from "rxjs";
+import { NzMessageService } from "ng-zorro-antd";
+import { ToolService } from "src/app/services/tool.service";
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+
+@Component({
+  selector: "app-detail-blood",
+  templateUrl: "./detail-blood.component.html",
+  styleUrls: ["./detail-blood.component.less"],
+})
+export class DetailBloodComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private mainService: MainService
+  ) {}
+
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  endDepts = ""; //工单详情目标科室
+  showCoop: boolean = true; //是否展示详情页操作按钮
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
+  maskFlag: any = false;
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  amplificationShow = true;
+  ngOnInit() {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+    if (this.route.snapshot.parent.parent.routeConfig.path == "nurse") {
+      this.showCoop = false;
+    }
+    this.id = +this.route.snapshot.paramMap.get("id");
+    let log$ = this.getLog();
+    let detail$ = this.getDetail();
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(log$, detail$).subscribe((res) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      // getLog
+      this.logList = res[0]["data"];
+      // getDetail
+      this.orderInfo = res[1]["data"];
+      this.endDepts = res[1]["data"].endDepts
+        .map((item) =>
+          !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept
+        )
+        .join();
+    });
+  }
+
+  // 查看业务数据
+  bloodModalShow = false; //业务数据弹窗开关
+  orderId = ""; //查看业务数据携带
+  viewDetail(data) {
+    this.orderId = data.id;
+    this.bloodModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelBlood(e) {
+    this.bloodModalShow = JSON.parse(e).show;
+  }
+
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
+
+  // 获取工单详情
+  getDetail() {
+    return this.mainService.getFetchData("api", "workOrder", this.id);
+  }
+
+  // 确认加急
+  urgent() {
+    let that = this;
+    that.urgentLoading = true;
+    let postData = {
+      urgentDetails: {
+        workerOrder: this.orderInfo["id"],
+        checkStatus: {
+          id: 330,
+        },
+        urgentReason: this.orderInfo["urgentDetails"].urgentReason,
+        id: this.orderInfo["urgentDetails"].id,
+      },
+    };
+    that.mainService.coopWorkerOrder("urge", postData).subscribe((data) => {
+      that.urgentLoading = false;
+      if (data.status == 200) {
+        that.showPromptModal("加急", true, "");
+      } else {
+        that.showPromptModal("加急", false, data.msg);
+      }
+    });
+  }
+  // 获取工单历史记录
+  logList = []; //工单历史记录
+  getLog() {
+    return this.mainService.getWorkOrderLog(this.id);
+  }
+
+  // 派单
+  allotWorker() {
+    this.router.navigateByUrl(
+      "dispatchingDesk/allotWorker/" +
+        this.id +
+        "/" +
+        this.orderInfo["gdState"]["id"]
+    );
+  }
+
+  // 撤回
+  recallOrderShow: boolean = false;
+  openRecallModal(): void {
+    this.recallOrderShow = true;
+  }
+  // 确认撤回
+  confirmRec() {
+    let that = this;
+    that.btnLoading = true;
+    let postData = {
+      workOrder: {
+        id: that.id,
+      },
+    };
+    that.mainService
+      .coopWorkerOrder("excuteWorkOrder/recall", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.closeRecallOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("撤回", true, "");
+        } else {
+          that.showPromptModal("撤回", false, data.msg);
+        }
+      });
+  }
+  // 撤回并删除
+  recAndDel() {
+    let that = this;
+    that.recLoading = true;
+    that.mainService.delOrder(that.id).subscribe((data) => {
+      console.log(data);
+      that.recLoading = false;
+      that.closeDelOrderModal();
+      if (data.status == 200) {
+        that.showPromptModal("删除", true, "");
+      } else {
+        that.showPromptModal("删除", false, data.msg);
+      }
+    });
+  }
+  // 关闭撤回弹框
+  closeRecallOrderModal() {
+    this.recallOrderShow = false;
+  }
+
+  // 关闭弹框
+  close() {
+    // this.router.navigateByUrl('dispatchingDesk');
+    history.go(-1);
+  }
+
+  // 删除
+  // 打开模态框
+  delOrderShow: boolean = false;
+  openDelModal() {
+    this.delOrderShow = true;
+  }
+  // 确认删除
+  confirmDel() {
+    let that = this;
+    that.btnLoading = true;
+    that.mainService.delOrder(that.id).subscribe((data) => {
+      that.btnLoading = false;
+      that.closeDelOrderModal();
+      if (data.status == 200) {
+        that.showPromptModal("删除", true, "");
+      } else {
+        that.showPromptModal("删除", false, data.msg);
+      }
+    });
+  }
+
+  // 关闭模态框
+  closeDelOrderModal() {
+    this.delOrderShow = false;
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
+  // 格式化时分秒
+  // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
+  formatTime(time) {
+    let timeStr = "";
+    if (time >= 0 && time < 60) {
+      // 秒
+      timeStr = time + "秒";
+    } else if (time >= 60 && time < 3600) {
+      // 分钟
+      timeStr = Math.floor(time / 60) + "分钟";
+    } else if (time >= 3600) {
+      // 时 + 分
+      let h = "";
+      let m = "";
+      h = Math.floor(time / 3600) + "小时";
+      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
+      timeStr = h + m;
+    }
+    return timeStr;
+  }
+
+  // 计算历史记录耗时
+  filterTime(step) {
+    // step = [{ difTime: 2 }, { difTime: 6 }]
+    let num = 0;
+    step.forEach((e) => {
+      num += e.difTime;
+    });
+    return this.formatTime(num / 1000);
+  }
+}
+

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

@@ -29,6 +29,7 @@
         历史记录
       </div>
     </div>
+
     <!-- 其他类型工单信息 -->
     <overlay-scrollbars
       #osComponentRef3
@@ -915,6 +916,132 @@
         </div>
       </div>
     </overlay-scrollbars>
+    <!-- 万能交接服务-血制品工单信息 -->
+    <overlay-scrollbars
+    #osComponentRef9
+    style="height: 90%; flex: 1"
+    *ngIf="
+      tabType == 1 && orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'
+    "
+  >
+    <div class="content orders">
+      <div class="top" *ngIf="amplificationShow">
+        <div class="num">
+          <span class="left">单号：{{ orderInfo.gdcode }}</span>
+          <span class="right">{{
+            orderInfo.gdState ? orderInfo.gdState.name : ""
+          }}</span>
+        </div>
+        <div class="info" nz-row>
+          <div nz-col nzSpan="6">
+            工单日期：{{ orderInfo.startTime | date: "yyyy-MM-dd HH:mm" }}
+          </div>
+          <div nz-col nzSpan="6">总耗时：{{ orderInfo.showTimeNum }}</div>
+          <div nz-col nzSpan="6">
+            申请类型：{{
+              orderInfo.taskType ? orderInfo.taskType.taskName : ""
+            }}<ng-container *ngIf="orderInfo.goodsRemark"
+              >-{{ orderInfo.goodsRemark }}</ng-container
+            >
+          </div>
+          <div nz-col nzSpan="6">
+            支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+          </div>
+        </div>
+        <div class="info" nz-row>
+          <div nz-col nzSpan="6">
+            预计接收：{{ orderInfo.expectReceiveNum }}
+          </div>
+          <div nz-col nzSpan="6">
+            送达：{{ orderInfo.deliveryNum || "无" }}
+          </div>
+          <div nz-col nzSpan="6">
+            实际接收：{{ orderInfo.actualReceiveNum || "无" }}
+          </div>
+        </div>
+        <div class="info" nz-row>
+          <div nz-col nzSpan="6">
+            申请科室：{{
+              orderInfo.createDeptDTO ? orderInfo.createDeptDTO.dept : ""
+            }}
+          </div>
+          <div nz-col nzSpan="6">
+            起点科室：{{
+              orderInfo.startDept ? orderInfo.startDept.dept : ""
+            }}
+          </div>
+          <div nz-col nzSpan="12">目标科室：{{ endDepts }}</div>
+        </div>
+        <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
+          <div nz-col nzSpan="8">
+            加急状态：{{ orderInfo.urgentDetails.checkStatus.name }}
+          </div>
+          <div nz-col nzSpan="24" class="jiaji">
+            加急原因：{{ orderInfo.urgentDetails.urgentReason }}
+          </div>
+        </div>
+        <div
+          class="info"
+          nz-row
+          *ngIf="orderInfo.workOrderRemark !== undefined"
+        >
+          <div nz-col nzSpan="24">
+            备注信息：{{ orderInfo.workOrderRemark || "-" }}
+          </div>
+        </div>
+        <div
+          class="info"
+          nz-row
+          *ngIf="orderInfo.specialCloseReason !== undefined"
+        >
+          <div nz-col nzSpan="24">
+            特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
+          </div>
+        </div>
+      </div>
+      <div class="center" *ngIf="amplificationShow">
+        <div class="box">
+          <div class="steps" *ngFor="let step of logList">
+            <div class="step">
+              <div class="info">
+                <i
+                  [ngClass]="{
+                    icon_transport: true,
+                    'transport-icon_liucheng': true,
+                    green:
+                      step.record &&
+                      step.record[0] &&
+                      step.record[0].operationTime
+                  }"
+                ></i>
+                <p>{{ step.operationName }}</p>
+                <p>{{ step.record ? step.record.operationtime : "" }}</p>
+                <p
+                  *ngIf="
+                    step.record && step.record.length && step.record[0].dept
+                  "
+                >
+                  <span *ngFor="let dept of step.record"
+                    >{{ dept.dept }},</span
+                  >
+                </p>
+                <p
+                  *ngIf="
+                    step.record &&
+                    step.record.length &&
+                    step.operationName != '申请'
+                  "
+                >
+                  耗时{{ filterTime(step.record) }}
+                </p>
+              </div>
+              <div class="line"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    </overlay-scrollbars>
     <!-- 评价内容 -->
     <overlay-scrollbars
       #osComponentRef7
@@ -1134,6 +1261,9 @@
     </overlay-scrollbars>
   </div>
   <div class="btns">
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo)">
+      业务数据
+    </button>
     <button class="btn cancel" nz-button nzType="default" (click)="close()">
       关闭
     </button>
@@ -1151,6 +1281,14 @@
   <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
 </app-prompt-modal>
 
+<!-- 业务数据查看 -->
+<app-blood-detail-modal
+  *ngIf="bloodModalShow"
+  [show]="bloodModalShow"
+  [orderId]="orderId"
+  (closeModelHs)="closeModelBlood($event)"
+></app-blood-detail-modal>
+
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
 <app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>

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

@@ -56,6 +56,11 @@ export class OrderDetailComponent implements OnInit {
     static: false,
   })
   osComponentRef8: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef9", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef9: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private fb: FormBuilder,
@@ -151,6 +156,18 @@ export class OrderDetailComponent implements OnInit {
     history.go(-1);
   }
 
+  // 查看业务数据
+  bloodModalShow = false; //业务数据弹窗开关
+  orderId = ""; //查看业务数据携带
+  viewDetail(data) {
+    this.orderId = data.id;
+    this.bloodModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelBlood(e) {
+    this.bloodModalShow = JSON.parse(e).show;
+  }
+
   // 获取工单历史记录
   logList = []; //工单历史记录
   getLog() {

src/app/share/share.module.ts

@@ -35,10 +35,13 @@ import { DetailBxComponent } from './detail-bx/detail-bx.component';
 import { ImageViewerComponent } from './image-viewer/image-viewer.component';
 import { SpePromptModalComponent } from './spe-prompt-modal/spe-prompt-modal.component';
 import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-modal.component';
+import { BloodDetailModalComponent } from './blood-detail-modal/blood-detail-modal.component';
+import { DetailBloodComponent } from './detail-blood/detail-blood.component';
 
 @NgModule({
   declarations: [
     DetailSampleComponent,
+    DetailBloodComponent,
     DetailPatientsComponent,
     DetailDrugComponent,
     DetailOthersComponent,
@@ -49,6 +52,7 @@ import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-mod
     ReplicationSchemeComponent,
     HsPromptModalComponent,
     HistoryPromptModalComponent,
+    BloodDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,
@@ -68,6 +72,8 @@ import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-mod
     ImageViewerComponent,
     SpePromptModalComponent,
     OrderPromptModalComponent,
+    BloodDetailModalComponent,
+    DetailBloodComponent,
   ],
   imports: [
     CommonModule,
@@ -80,6 +86,7 @@ import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-mod
   ],
   exports: [
     DetailSampleComponent,
+    DetailBloodComponent,
     DetailPatientsComponent,
     DetailDrugComponent,
     DetailOthersComponent,
@@ -90,6 +97,7 @@ import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-mod
     ReplicationSchemeComponent,
     HsPromptModalComponent,
     HistoryPromptModalComponent,
+    BloodDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,

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

@@ -6,6 +6,7 @@ import { DetailDrugComponent } from '../../share/detail-drug/detail-drug.compone
 import { DetailOthersComponent } from '../../share/detail-others/detail-others.component';
 import { AllocationWorkerComponent } from '../../share/allocation-worker/allocation-worker.component';
 import { FuwutaiComponent } from './fuwutai.component';
+import { DetailBloodComponent } from 'src/app/share/detail-blood/detail-blood.component';
 
 
 const routes: Routes = [
@@ -19,6 +20,11 @@ const routes: Routes = [
         component: DetailSampleComponent
       },
       {
+        // 工单详情-万能交接服务-血制品
+        path: 'detailBlood/:id',
+        component: DetailBloodComponent
+      },
+      {
         // 工单详情-送患者
         path: 'detailPatients/:id',
         component: DetailPatientsComponent

src/app/views/fuwutai/fuwutai.component.html

@@ -236,7 +236,7 @@
                 <div
                   class="didian"
                   (click)="
-                    openDetails(data.id, data.taskType.associationType.id)
+                    openDetails(data)
                   "
                 >
                   <span
@@ -264,7 +264,7 @@
                 <div
                   class="shijian"
                   (click)="
-                    openDetails(data.id, data.taskType.associationType.id)
+                    openDetails(data)
                   "
                 >
                   <span
@@ -499,7 +499,7 @@
             >
               <div
                 class="left_cots"
-                (click)="openDetails(data.id, data.taskType.associationType.id)"
+                (click)="openDetails(data)"
               >
                 <!-- 工单 -->
                 <div class="gongdan">
@@ -655,7 +655,7 @@
                 <div
                   class="didian"
                   (click)="
-                    openDetails(data.id, data.taskType.associationType.id)
+                    openDetails(data)
                   "
                 >
                   <span
@@ -692,7 +692,7 @@
                 <div
                   class="shijian"
                   (click)="
-                    openDetails(data.id, data.taskType.associationType.id)
+                    openDetails(data)
                   "
                 >
                   <span
@@ -924,7 +924,7 @@
             <div class="list listsTypeColor" *ngFor="let data of arriveList">
               <div
                 class="left_cots"
-                (click)="openDetails(data.id, data.taskType.associationType.id)"
+                (click)="openDetails(data)"
               >
                 <!-- 工单 -->
                 <div class="gongdan">
@@ -1029,7 +1029,7 @@
             <div class="list" *ngFor="let data of executionList">
               <div
                 class="left_cots"
-                (click)="openDetails(data.id, data.taskType.associationType.id)"
+                (click)="openDetails(data)"
               >
                 <!-- 工单 -->
                 <div class="gongdan">
@@ -1281,7 +1281,7 @@
             <div class="list" *ngFor="let data of executionList">
               <div
                 class="left_cots"
-                (click)="openDetails(data.id, data.taskType.associationType.id)"
+                (click)="openDetails(data)"
               >
                 <!-- 工单 -->
                 <div class="gongdan">
@@ -2666,7 +2666,7 @@
                   <div
                     class="left_cots"
                     (click)="
-                      openDetails(data.id, data.taskType.associationType.id)
+                      openDetails(data)
                     "
                   >
                     <!-- 工单 -->

src/app/views/fuwutai/fuwutai.component.ts

@@ -1096,19 +1096,23 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 查看工单详情
-  openDetails(id, typeId) {
-    if (typeId == 256 || typeId == 380) {
+  openDetails(data) {
+    console.log(data);
+    if (data.taskType.associationType.value == 'specimen' || data.taskType.associationType.value == 'specimenPlan') {
       // 标本类
-      this.router.navigateByUrl("dispatchingDesk/detailSample/" + id);
-    } else if (typeId == 260 || typeId == 255) {
+      this.router.navigateByUrl("dispatchingDesk/detailSample/" + data.id);
+    } else if (data.taskType.associationType.value == 'inspect' || data.taskType.associationType.value == 'patientTransport') {
       // 送患者
-      this.router.navigateByUrl("dispatchingDesk/detailPatients/" + id);
-    } else if (typeId == 257 || typeId == 258) {
+      this.router.navigateByUrl("dispatchingDesk/detailPatients/" + data.id);
+    } else if (data.taskType.associationType.value == 'drugsBag' || data.taskType.associationType.value == 'jPBag') {
       // 药品配送/静配
-      this.router.navigateByUrl("dispatchingDesk/detailDrug/" + id);
+      this.router.navigateByUrl("dispatchingDesk/detailDrug/" + data.id);
+    } else if (data.taskType.associationType.value == 'ordinary' && data.taskType.ordinaryField.value == 'blood') {
+      // 万能交接服务&&血制品
+      this.router.navigateByUrl("dispatchingDesk/detailBlood/" + data.id);
     } else {
       // 其他
-      this.router.navigateByUrl("dispatchingDesk/detailOthers/" + id);
+      this.router.navigateByUrl("dispatchingDesk/detailOthers/" + data.id);
     }
   }
   // 选择楼栋

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

@@ -7,6 +7,7 @@ import { DetailDrugComponent } from '../../share/detail-drug/detail-drug.compone
 import { DetailOthersComponent } from '../../share/detail-others/detail-others.component';
 import { AllocationWorkerComponent } from '../../share/allocation-worker/allocation-worker.component';
 import { DetailBxComponent } from 'src/app/share/detail-bx/detail-bx.component';
+import { DetailBloodComponent } from 'src/app/share/detail-blood/detail-blood.component';
 
 
 const routes: Routes = [
@@ -20,6 +21,11 @@ const routes: Routes = [
         component: DetailSampleComponent
       },
       {
+        // 工单详情-万能交接服务-血制品
+        path: 'detailBlood/:id',
+        component: DetailBloodComponent
+      },
+      {
         // 工单详情-送患者
         path: 'detailPatients/:id',
         component: DetailPatientsComponent

src/app/views/main/main.component.html

@@ -104,15 +104,21 @@
       </ng-template>
     </label>
     <label>新密码:
-      <nz-input-group [nzSuffix]="suffixTemplate">
-        <input maxlength="16" minlength="6" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="新密码"
-          [(ngModel)]="upModalData.newPwd" />
-      </nz-input-group>
-      <ng-template #suffixTemplate>
-        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'"
-          (click)="passwordVisible = !passwordVisible"></i>
-      </ng-template>
+      <!-- <div style="display: flex;"> -->
+        <nz-input-group [nzSuffix]="suffixTemplate">
+          <input maxlength="16" minlength="6" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="新密码"
+            [(ngModel)]="upModalData.newPwd" />
+        </nz-input-group>
+        <ng-template #suffixTemplate>
+          <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'"
+            (click)="passwordVisible = !passwordVisible"></i>
+        </ng-template>
+        <!-- <div class="red" style="display: flex;justify-content: center;align-items: center;padding-left: 5px;">弱</div>
+        <div style="display: flex;justify-content: center;align-items: center;padding-left: 5px;">中</div>
+        <div class="green" style="display: flex;justify-content: center;align-items: center;padding-left: 5px;">强</div> -->
+      <!-- </div> -->
     </label>
+    <!-- <div class="red">强密码需包含大小写字母、数字、特殊字符，长度必须超过8个字符</div> -->
     <label>确认新密码:
       <nz-input-group [nzSuffix]="suffixTemplate">
         <input maxlength="16" minlength="6" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="确认新密码"

src/common.less

@@ -31,6 +31,9 @@
 .red {
   color: #d81e06 !important;
 }
+.green {
+  color: #49b856 !important;
+}
 // 加载中
 .loadingFull {
   height: 100%;

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.14');
+    console.info('v2.4.15');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)