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

src/app/app-routing.module.ts

@@ -31,6 +31,7 @@ import { DataGenerateGuard } from './guard/DataGenerate.guard';
 import { SystemConfigGuard } from './guard/SystemConfig.guard';
 // 故障实时播报权限
 import { RealtimeBroadcastGuard } from './guard/realtimeBroadcast.guard';
+import { InspectClosedLoopViewGuard } from './guard/inspectClosedLoopView.guard';
 const routes: Routes = [
   // 默认
   {
@@ -194,6 +195,17 @@ const routes: Routes = [
     path: "newStatistics",
     loadChildren: () => import("./views/new-statistics/new-statistics.module").then((m) => m.NewStatisticsModule),
   },
+  // 批量发起陪检
+  {
+    path: 'batchInspection',
+    loadChildren: () => import('./views/batch-inspection/batch-inspection.module').then(m => m.BatchInspectionModule),
+  },
+  // 陪检闭环视图
+  {
+    path: 'inspectClosedLoopView',
+    loadChildren: () => import('./views/inspect-closed-loop-view/inspect-closed-loop-view.module').then(m => m.InspectClosedLoopViewModule),
+    canActivate: [InspectClosedLoopViewGuard]
+  },
   // 临时路由
   {
     path: "redirect",

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.html

@@ -0,0 +1,89 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <ng-container *ngFor="let item of dictionaryKeyList">
+      <div class="list" *ngIf="!loading && activeDictionaryKey.id === item.id">
+        <!-- 特性配置 -->
+        <div *ngIf="tabModalName=='characteristics'">
+          <div class="timeRange">
+            <div class="timeRangeTitle green">默认时间区间1</div>
+            <div class="timeRangeActive">
+              有效时间范围：
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveStartTime1" nzFormat="HH:mm" nzPlaceHolder="开始时间1"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveEndTime1" nzFormat="HH:mm" nzPlaceHolder="结束时间1"></nz-time-picker>
+              </span>
+              <span class="ml16">
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveStartTime2" nzFormat="HH:mm" nzPlaceHolder="开始时间2"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ibActiveEndTime2" nzFormat="HH:mm" nzPlaceHolder="结束时间2"></nz-time-picker>
+              </span>
+            </div>
+            <div class="timeRangeDefault">
+              默认时间：
+              <span style="visibility: hidden;">囧囧</span>
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ibDefaultStartTime" nzFormat="HH:mm" nzPlaceHolder="开始时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ibDefaultDayStart"></nz-checkbox-group>
+                ~
+                <nz-time-picker class="ml8" [(ngModel)]="item.postData.ibDefaultEndTime" nzFormat="HH:mm" nzPlaceHolder="结束时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ibDefaultDayEnd"></nz-checkbox-group>
+              </span>
+            </div>
+          </div>
+
+          <div class="timeRange">
+            <div class="timeRangeTitle green">默认时间区间2</div>
+            <div class="timeRangeActive">
+              有效时间范围：
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveStartTime1" nzFormat="HH:mm" nzPlaceHolder="开始时间1"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveEndTime1" nzFormat="HH:mm" nzPlaceHolder="结束时间1"></nz-time-picker>
+              </span>
+              <span class="ml16">
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveStartTime2" nzFormat="HH:mm" nzPlaceHolder="开始时间2"></nz-time-picker>
+                ~
+                <nz-time-picker [(ngModel)]="item.postData.ib2ActiveEndTime2" nzFormat="HH:mm" nzPlaceHolder="结束时间2"></nz-time-picker>
+              </span>
+            </div>
+            <div class="timeRangeDefault">
+              默认时间：
+              <span style="visibility: hidden;">囧囧</span>
+              <span>
+                <nz-time-picker [(ngModel)]="item.postData.ib2DefaultStartTime" nzFormat="HH:mm" nzPlaceHolder="开始时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ib2DefaultDayStart"></nz-checkbox-group>
+                ~
+                <nz-time-picker class="ml8" [(ngModel)]="item.postData.ib2DefaultEndTime" nzFormat="HH:mm" nzPlaceHolder="结束时间"></nz-time-picker>
+                <nz-checkbox-group class="timeRangeCheckbox" [(ngModel)]="item.postData.ib2DefaultDayEnd"></nz-checkbox-group>
+              </span>
+            </div>
+          </div>
+        </div>
+        <!-- 自动建单配置 -->
+        <div *ngIf="tabModalName=='automaticOrderCreation'">
+          <!-- 自动建单 -->
+        </div>
+        <div class="bottom">
+          <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+        </div>
+      </div>
+    </ng-container>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.less

@@ -0,0 +1,700 @@
+@import "../../../../../../src/theme.less";
+:host {
+  .TaskTypeManagement {
+    height: calc(100vh - 136px);
+    background: #f9fafb;
+    overflow: hidden;
+    padding: 16px 20px;
+
+    .pagination {
+      margin-top: 14px;
+      margin-bottom: 14px;
+      bottom: 12px;
+      right: 5px;
+    }
+
+    .taskType {
+      float: left;
+      width: 24%;
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      font-size: 14px;
+      position: relative;
+      overflow: hidden;
+
+      .title {
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 16px;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+      }
+
+      .operate {
+        width: 100%;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        background: #fff;
+        z-index: 2;
+        display: flex;
+
+        .item {
+          flex: 1;
+          height: 34px;
+          line-height: 34px;
+          border-right: 1px solid #e5e9ed;
+          text-align: center;
+          color: #666; // cursor: default;
+          cursor: pointer;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+      }
+
+      .taskTypes {
+        // width: 110%;
+        width: 100%;
+        height: 92%;
+        // padding-right: 10%;
+        overflow-y: auto;
+        z-index: 1;
+        padding-bottom: 30px;
+
+        .itemChoice {
+          color: @primary-color;
+          background: #f0f6ed;
+        }
+
+        .item {
+          width: 100%;
+          height: 34px;
+          line-height: 34px;
+          text-align: center;
+          cursor: pointer;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+
+          &:hover {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+
+          &.checked {
+            color: @primary-color;
+            background: #f0f6ed;
+          }
+        }
+      }
+    }
+
+    //任务类型管理-主体
+    .taskTypeInfo {
+      height: 100%;
+      border: 1px solid #e5e9ed;
+      background: #fff;
+      color: #333;
+      position: relative;
+
+      .top {
+        height: 61px;
+        line-height: 60px;
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid #e5e9ed;
+        position: relative;
+        z-index: 2;
+
+        .items {
+          background: #f0f6ed;
+        }
+
+        & > div {
+          border-right: 1px solid #e5e9ed;
+          width: 30%;
+          text-align: center; // display: flex;
+          // align-items: center;
+          cursor: pointer;
+
+          &:hover {
+            background: #f0f6ed;
+          }
+        }
+
+        &:nth-last-child(4) {
+          border: none;
+        }
+      }
+
+      .list {
+        width: 100%; // height: 100%;
+        padding: 16px; // position: absolute;
+        // top: 0;
+        // padding-top: 90px;
+        background: #fff;
+        height: 89%;
+        overflow: auto;
+
+        nz-form-label {
+          margin-left: 0px !important;
+        }
+
+        & > div {
+          background: #f9fafb;
+          border: 1px solid #e5e9ed;
+          border-radius: 10px 10px 0px 0px;
+          padding: 24px 120px;
+
+          .label {
+            margin-left: 16px;
+            font-size: 14px;
+            color: #333;
+          }
+        }
+
+        // 规则信息
+        .ruleList {
+          padding: 15px 15px 0px 15px;
+          background: #fff;
+
+          .table {
+            width: 100%;
+            height: 100%;
+
+            .box {
+              // background: #f9fafb;
+              // border: 1px solid #e5e9ed;
+              border-radius: 5px;
+              position: relative;
+
+              .table_title {
+                font-size: 18px;
+                margin: 14px 0px;
+                text-align: center;
+              }
+
+              .thead {
+                background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+                th {
+                  background: transparent;
+                  color: #fff;
+                  text-align: center;
+                  font-size: 14px;
+                }
+              }
+
+              .ant-table-body {
+                border-bottom: 1px solid #e5e9ed;
+                background: #f9fafb;
+              }
+
+              .ant-table-tbody {
+                background: #f9fafb;
+                border: 1px solid #e5e9ed;
+
+                .zzBontton {
+                  & > td {
+                    border-bottom: 1px solid #e5e9ed;
+                  }
+                }
+
+                tr {
+                  text-align: center;
+                  font-size: 14px;
+                  border: none;
+                  color: #333;
+                  overflow: hidden;
+
+                  .lin {
+                    width: 68.2%;
+                    height: 2rem;
+                    border-bottom: 0.1rem solid #e5e9ed;
+                    position: absolute;
+                    text-align: center;
+                    margin-left: 0%;
+                    margin-top: -0.8%;
+                    transform: rotate(6.5deg);
+                  }
+
+                  td {
+                    border: none;
+
+                    nz-input-number {
+                      width: 50px;
+                    }
+
+                    .coop {
+                      .line {
+                        margin: 10px;
+                      }
+
+                      span:nth-child(2n-1) {
+                        cursor: pointer;
+
+                        &:hover {
+                          color: @primary-color;
+                        }
+
+                        &:active {
+                          color: @primary-color;
+                        }
+                      }
+                    }
+                  }
+                }
+
+                tr:nth-child(even) {
+                  background: #fff;
+                }
+              }
+            }
+          }
+        }
+
+        //运送过程
+        .ysgcItem {
+          padding: 0px 0px 0px 0px; // background: #fff;
+
+          .ysgc_top {
+            height: 88px;
+            background: #fff;
+            border-radius: 10px 10px 0px 0px;
+            padding: 15px 22px 0px 22px;
+
+            .title {
+              span {
+                font-size: 18px;
+              }
+            }
+
+            .carrItems {
+              color: @primary-color;
+              border-color: @primary-color !important;
+            }
+
+            .process {
+              width: 80%;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              margin: 5px auto;
+              font-size: 14px;
+
+              .carrItem {
+                height: 40px;
+                line-height: 28px;
+                cursor: pointer;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+
+              .carrItem1 {
+                float: left;
+                width: 45%;
+                height: 40px;
+                line-height: 28px;
+                padding-left: 10%;
+                cursor: pointer;
+
+                .carrItem_icon {
+                  width: 35px;
+                  height: 35px;
+                  border: 1px solid #e5e9ed;
+                  border-radius: 50%;
+                  text-align: center;
+                  line-height: 35px;
+                  float: left;
+                  margin-right: 10px;
+
+                  i {
+                    font-size: 18px;
+                  }
+                }
+              }
+            }
+          }
+
+          .ysgc_cont {
+            padding: 0px 240px 24px 240px;
+
+            textarea {
+              padding-right: 10%;
+            }
+
+            .icon_btn {
+              cursor: pointer;
+              font-size: 18px;
+            }
+
+            .icon_text {
+              display: block;
+              cursor: pointer;
+              position: relative;
+              right: 5px;
+            }
+
+            .item_type_cont {
+              height: 70px;
+              padding-top: 4px;
+
+              & > div {
+                height: 65px;
+                border: 1px solid #e5e9ed;
+                border-radius: 5px;
+                background: #fff;
+
+                .item_type_cont_L {
+                  height: 100%;
+                  width: 90%;
+                  float: left;
+                  padding: 2px 12px;
+                  overflow: auto;
+
+                  .item_yq {
+                    width: 24%;
+                    height: 28px;
+                    display: inline-block;
+                    border: 1px solid #e5e9ed;
+                    border-radius: 20px;
+                    text-align: center;
+                    line-height: 26px;
+                    background: #f9fafb;
+                    margin-right: 1%;
+                    margin-bottom: 2px;
+                    font-size: 12px;
+                    padding-left: 8px;
+
+                    span {
+                      width: 75%;
+                      float: left;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                    }
+
+                    i {
+                      font-size: 14px;
+                      color: #999;
+                      cursor: pointer;
+                    }
+                  }
+                }
+
+                .item_type_cont_R {
+                  height: 100%;
+                  width: 10%;
+                  float: right;
+                  text-align: center;
+                  padding-top: 15px;
+                  border-left: 1px solid #e5e9ed;
+                  cursor: pointer;
+
+                  i {
+                    display: block;
+                    font-size: 16px;
+                  }
+
+                  i:hover {
+                    color: @primary-color;
+                  }
+
+                  .icon_text {
+                    right: 1px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        //关联信息
+        .glxxItem {
+          padding: 10px 15px 0px 15px;
+          background: #fff;
+
+          .tab_btn {
+            cursor: pointer;
+          }
+
+          .tab_btn:hover {
+            color: @primary-color;
+          }
+
+          .table_title {
+            font-size: 18px;
+            margin: 14px 0px;
+            text-align: center;
+          }
+
+          .thead {
+            background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+            th {
+              background: transparent;
+              color: #fff;
+              text-align: center;
+              font-size: 14px;
+            }
+          }
+
+          .ant-table-body {
+            // border-bottom: 1px solid #e5e9ed;
+            background: #f9fafb;
+          }
+
+          .ant-table-tbody {
+            background: #f9fafb;
+            border: 1px solid #e5e9ed;
+
+            tr {
+              text-align: center;
+              font-size: 14px;
+              border: none;
+              color: #333;
+
+              td {
+                border: none; // font-size: 14px;
+
+                nz-input-number {
+                  width: 40px;
+                }
+
+                .coop {
+                  .line {
+                    margin: 10px;
+                  }
+
+                  span:nth-child(2n-1) {
+                    cursor: pointer;
+
+                    &:hover {
+                      color: @primary-color;
+                    }
+
+                    &:active {
+                      color: @primary-color;
+                    }
+                  }
+                }
+              }
+            }
+
+            tr:nth-child(even) {
+              background: #fff;
+            }
+          }
+        }
+
+        // 开通科室
+        .ktksItem {
+          padding: 0px 0px 0px 0px;
+          background: #fff;
+
+          .top {
+            width: 100%; // padding-bottom: 7px;
+            // border-bottom: 1px solid #e5e9ed;
+            position: relative;
+            overflow: hidden;
+            z-index: 2;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .top_L {
+              width: 70%;
+              text-align: left;
+              display: flex;
+              flex-wrap: wrap;
+              align-items: center;
+              padding: 0 4px;
+              .top_L_item {
+                margin-left: 4px;
+              }
+
+              .label {
+                font-size: 14px;
+                color: #333;
+                margin-left: 0;
+              }
+
+              nz-select {
+                font-size: 12px;
+                width: 100px;
+              }
+
+              input {
+                font-size: 12px;
+                width: 100px;
+              }
+            }
+
+            .top_R {
+              border: 0px;
+
+              .btn {
+                margin-left: 10px;
+              }
+            }
+          }
+
+          .ktksItemList {
+            padding: 10px 15px 0px 15px;
+            .table {
+              min-height: 528px;
+            }
+
+            .operate {
+              float: right;
+              margin-bottom: 5px;
+
+              span {
+                font-size: 14px;
+              }
+
+              .num {
+                font-size: 18px;
+                color: @primary-color;
+              }
+            }
+
+            .thead {
+              background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+              th {
+                background: transparent;
+                color: #fff;
+                text-align: center;
+                font-size: 14px;
+              }
+            }
+
+            .ant-table-body {
+              border-bottom: 1px solid #e5e9ed;
+              background: #f9fafb;
+            }
+
+            .ant-table-tbody {
+              background: #f9fafb;
+              border: 1px solid #e5e9ed;
+
+              .zzBontton {
+                & > td {
+                  border-bottom: 1px solid #e5e9ed;
+                }
+              }
+
+              tr {
+                text-align: center;
+                font-size: 14px;
+                border: none;
+                color: #333;
+
+                td {
+                  border: none; // font-size: 14px;
+
+                  nz-input-number {
+                    width: 40px;
+                  }
+
+                  .coop {
+                    .line {
+                      margin: 10px;
+                    }
+
+                    span:nth-child(2n-1) {
+                      cursor: pointer;
+
+                      &:hover {
+                        color: @primary-color;
+                      }
+
+                      &:active {
+                        color: @primary-color;
+                      }
+                    }
+                  }
+                }
+              }
+
+              tr:nth-child(even) {
+                background: #fff;
+              }
+            }
+          }
+
+          .pagination {
+            margin-top: 25px;
+            margin-bottom: 14px;
+            bottom: 12px;
+            right: 5px;
+            position: relative;
+            height: 30px;
+            .page {
+              position: absolute;
+              right: 5px;
+            }
+          }
+        }
+
+        .bottom {
+          height: 60px;
+          border-radius: 0px 0px 10px 10px;
+          padding: 10px 240px 0px 240px;
+          border-top: 0px;
+
+          button {
+            width: 80px;
+            height: 34px;
+            display: block;
+            margin: 0 auto;
+          }
+        }
+      }
+    }
+  }
+  .timeRange{
+    margin-bottom: 56px;
+    &:last-of-type{
+      margin-bottom: 0;
+    }
+    .timeRangeActive{
+      margin-top: 16px;
+      padding-left: 60px;
+    }
+    .timeRangeDefault{
+      margin-top: 16px;
+      padding-left: 60px;
+    }
+    .timeRangeCheckbox{
+      margin-left: 16px;
+    }
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.ts

@@ -0,0 +1,226 @@
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+import { addDays, startOfMinute, endOfMinute, set, getYear, getMonth, getDate, format } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-inspect-batch",
+  templateUrl: "./configuration-inspect-batch.component.html",
+  styleUrls: ["./configuration-inspect-batch.component.less"],
+})
+export class ConfigurationInspectBatchComponent implements OnInit {
+  @Input() activeDictionaryKey: any;
+  @Input() dictionaryKeyList: any;
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  ngOnInit() {
+    this.tabModal('characteristics');
+    this.init();
+  }
+
+ tabModalName:string = 'characteristics'; //当前选中的tab
+ loading:boolean = false; //页面加载的loading
+ hosId = this.tool.getCurrentHospital().id; //当前院区
+ tasktype:any = {};// 任务类型
+ configs:any = {};// 配置
+ // 切换tab
+ tabModal(tabModalName:string){
+   this.tabModalName = tabModalName;
+ }
+ // 保存
+ btnLoading: boolean = false; //提交按钮loading状态
+ submitForm() {
+   if(!this.tasktype.id){
+     this.message.create("warning", "请先配置任务类型！");
+     return;
+   }
+
+   // 默认时间区间1
+
+   if(
+     (this.activeDictionaryKey.postData.ibActiveStartTime1 && !this.activeDictionaryKey.postData.ibActiveEndTime1) ||
+     (!this.activeDictionaryKey.postData.ibActiveStartTime1 && this.activeDictionaryKey.postData.ibActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ibActiveStartTime2 && !this.activeDictionaryKey.postData.ibActiveEndTime2) ||
+     (!this.activeDictionaryKey.postData.ibActiveStartTime2 && this.activeDictionaryKey.postData.ibActiveEndTime2)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【有效时间范围】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     (this.activeDictionaryKey.postData.ibActiveStartTime1 && this.activeDictionaryKey.postData.ibActiveEndTime1 && +this.activeDictionaryKey.postData.ibActiveStartTime1 > +this.activeDictionaryKey.postData.ibActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ibActiveStartTime2 && this.activeDictionaryKey.postData.ibActiveEndTime2 && +this.activeDictionaryKey.postData.ibActiveStartTime2 > +this.activeDictionaryKey.postData.ibActiveEndTime2)
+   ){
+    // 王满测试说有问题，要求去掉校验
+    // 开发无法复现问题，暂时注释
+    //  this.message.create("warning", "【默认时间区间1】的【有效时间范围】开始时间不能大于结束时间！");
+    //  return;
+   }
+
+   if(
+     (this.activeDictionaryKey.postData.ibDefaultStartTime && !this.activeDictionaryKey.postData.ibDefaultEndTime) ||
+     (!this.activeDictionaryKey.postData.ibDefaultStartTime && this.activeDictionaryKey.postData.ibDefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     this.activeDictionaryKey.postData.ibDefaultStartTime &&
+     this.activeDictionaryKey.postData.ibDefaultEndTime &&
+     (this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked ? +addDays(this.activeDictionaryKey.postData.ibDefaultStartTime, 1) : +this.activeDictionaryKey.postData.ibDefaultStartTime) > (this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked ? +addDays(this.activeDictionaryKey.postData.ibDefaultEndTime, 1) : +this.activeDictionaryKey.postData.ibDefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】开始时间不能大于结束时间！");
+     return;
+   }
+
+   // 默认时间区间2
+
+   if(
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime1 && !this.activeDictionaryKey.postData.ib2ActiveEndTime1) ||
+     (!this.activeDictionaryKey.postData.ib2ActiveStartTime1 && this.activeDictionaryKey.postData.ib2ActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime2 && !this.activeDictionaryKey.postData.ib2ActiveEndTime2) ||
+     (!this.activeDictionaryKey.postData.ib2ActiveStartTime2 && this.activeDictionaryKey.postData.ib2ActiveEndTime2)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【有效时间范围】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime1 && this.activeDictionaryKey.postData.ib2ActiveEndTime1 && +this.activeDictionaryKey.postData.ib2ActiveStartTime1 > +this.activeDictionaryKey.postData.ib2ActiveEndTime1) ||
+     (this.activeDictionaryKey.postData.ib2ActiveStartTime2 && this.activeDictionaryKey.postData.ib2ActiveEndTime2 && +this.activeDictionaryKey.postData.ib2ActiveStartTime2 > +this.activeDictionaryKey.postData.ib2ActiveEndTime2)
+   ){
+    // 王满测试说有问题，要求去掉校验
+    // 开发无法复现问题，暂时注释
+    //  this.message.create("warning", "【默认时间区间1】的【有效时间范围】开始时间不能大于结束时间！");
+    //  return;
+   }
+
+   if(
+     (this.activeDictionaryKey.postData.ib2DefaultStartTime && !this.activeDictionaryKey.postData.ib2DefaultEndTime) ||
+     (!this.activeDictionaryKey.postData.ib2DefaultStartTime && this.activeDictionaryKey.postData.ib2DefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】请完整填写开始时间与结束时间！");
+     return;
+   }else if(
+     this.activeDictionaryKey.postData.ib2DefaultStartTime &&
+     this.activeDictionaryKey.postData.ib2DefaultEndTime &&
+     (this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked ? +addDays(this.activeDictionaryKey.postData.ib2DefaultStartTime, 1) : +this.activeDictionaryKey.postData.ib2DefaultStartTime) > (this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked ? +addDays(this.activeDictionaryKey.postData.ib2DefaultEndTime, 1) : +this.activeDictionaryKey.postData.ib2DefaultEndTime)
+   ){
+     this.message.create("warning", "【默认时间区间1】的【默认时间】开始时间不能大于结束时间！");
+     return;
+   }
+
+   let postData:any = {
+     ...this.configs,
+     taskType: this.tasktype.id,
+     hosId: this.hosId,
+     ibActiveStartTime1: this.activeDictionaryKey.postData.ibActiveStartTime1 ? format(startOfMinute(this.activeDictionaryKey.postData.ibActiveStartTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibActiveEndTime1: this.activeDictionaryKey.postData.ibActiveEndTime1 ? format(endOfMinute(this.activeDictionaryKey.postData.ibActiveEndTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibActiveStartTime2: this.activeDictionaryKey.postData.ibActiveStartTime2 ? format(startOfMinute(this.activeDictionaryKey.postData.ibActiveStartTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibActiveEndTime2: this.activeDictionaryKey.postData.ibActiveEndTime2 ? format(endOfMinute(this.activeDictionaryKey.postData.ibActiveEndTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibDefaultStartTime: this.activeDictionaryKey.postData.ibDefaultStartTime ? format(startOfMinute(this.activeDictionaryKey.postData.ibDefaultStartTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibDefaultEndTime: this.activeDictionaryKey.postData.ibDefaultEndTime ? format(endOfMinute(this.activeDictionaryKey.postData.ibDefaultEndTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ibDefaultDayStart: this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked ? 1 : 0,
+     ibDefaultDayEnd: this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked ? 1 : 0,
+     ib2ActiveStartTime1: this.activeDictionaryKey.postData.ib2ActiveStartTime1 ? format(startOfMinute(this.activeDictionaryKey.postData.ib2ActiveStartTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2ActiveEndTime1: this.activeDictionaryKey.postData.ib2ActiveEndTime1 ? format(endOfMinute(this.activeDictionaryKey.postData.ib2ActiveEndTime1), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2ActiveStartTime2: this.activeDictionaryKey.postData.ib2ActiveStartTime2 ? format(startOfMinute(this.activeDictionaryKey.postData.ib2ActiveStartTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2ActiveEndTime2: this.activeDictionaryKey.postData.ib2ActiveEndTime2 ? format(endOfMinute(this.activeDictionaryKey.postData.ib2ActiveEndTime2), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2DefaultStartTime: this.activeDictionaryKey.postData.ib2DefaultStartTime ? format(startOfMinute(this.activeDictionaryKey.postData.ib2DefaultStartTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2DefaultEndTime: this.activeDictionaryKey.postData.ib2DefaultEndTime ? format(endOfMinute(this.activeDictionaryKey.postData.ib2DefaultEndTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+     ib2DefaultDayStart: this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked ? 1 : 0,
+     ib2DefaultDayEnd: this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked ? 1 : 0,
+   };
+   console.log(postData);
+   this.btnLoading = true;
+   this.mainService
+     .simplePost("addData", "taskTypeConfig", postData)
+     .subscribe((result) => {
+       this.btnLoading = false;
+       if (result.status == 200) {
+         this.message.success("保存成功！");
+         this.getConfig();
+       }else{
+         this.message.success("保存失败！");
+       }
+     });
+ }
+
+ //初始化
+ init() {
+   this.loading = true;
+   this.getTaskType();
+ }
+
+ //获取任务类型
+ getTaskType() {
+   this.loading = true;
+   let postData = {
+     idx: 0,
+     sum: 1,
+     taskType: {
+       simpleQuery: true,
+       hosId: {
+         id: this.hosId
+       },
+       associationType: {
+         key: 'association_types',
+         value: 'inspect',
+       }
+     }
+   };
+   this.mainService
+     .getFetchDataList("simple/data", "taskType", postData)
+     .subscribe((result) => {
+       this.loading = false;
+       if (result.status == 200) {
+         this.tasktype = result.list[0] || {};
+         this.getConfig();
+       }
+     });
+ }
+
+ // 获取配置
+ getConfig() {
+   this.loading = true;
+   let postData = {
+     idx: 0,
+     sum: 1,
+     taskTypeConfig: {
+       taskTypeDTO: {
+         hosId: {
+           id: this.hosId
+         },
+         associationType: this.tasktype.associationType,
+       }
+     }
+   };
+   this.mainService
+     .getFetchDataList("simple/data", "taskTypeConfig", postData)
+     .subscribe((result) => {
+       this.loading = false;
+       if (result.status == 200) {
+         this.configs = result.list[0] || {};
+         this.activeDictionaryKey.postData.ibActiveStartTime1 = this.configs.ibActiveStartTime1 ? new Date(this.configs.ibActiveStartTime1) : undefined;
+         this.activeDictionaryKey.postData.ibActiveEndTime1 = this.configs.ibActiveEndTime1 ? new Date(this.configs.ibActiveEndTime1) : undefined;
+         this.activeDictionaryKey.postData.ibActiveStartTime2 = this.configs.ibActiveStartTime2 ? new Date(this.configs.ibActiveStartTime2) : undefined;
+         this.activeDictionaryKey.postData.ibActiveEndTime2 = this.configs.ibActiveEndTime2 ? new Date(this.configs.ibActiveEndTime2) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultStartTime = this.configs.ibDefaultStartTime ? new Date(this.configs.ibDefaultStartTime) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultEndTime = this.configs.ibDefaultEndTime ? new Date(this.configs.ibDefaultEndTime) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked = this.configs.ibDefaultDayStart == 1;
+         this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked = this.configs.ibDefaultDayEnd == 1;
+
+         this.activeDictionaryKey.postData.ib2ActiveStartTime1 = this.configs.ib2ActiveStartTime1 ? new Date(this.configs.ib2ActiveStartTime1) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveEndTime1 = this.configs.ib2ActiveEndTime1 ? new Date(this.configs.ib2ActiveEndTime1) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveStartTime2 = this.configs.ib2ActiveStartTime2 ? new Date(this.configs.ib2ActiveStartTime2) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveEndTime2 = this.configs.ib2ActiveEndTime2 ? new Date(this.configs.ib2ActiveEndTime2) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultStartTime = this.configs.ib2DefaultStartTime ? new Date(this.configs.ib2DefaultStartTime) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultEndTime = this.configs.ib2DefaultEndTime ? new Date(this.configs.ib2DefaultEndTime) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked = this.configs.ib2DefaultDayStart == 1;
+         this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked = this.configs.ib2DefaultDayEnd == 1;
+       }
+     });
+ }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationInspectBatchComponent } from './configuration-inspect-batch.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationInspectBatchComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationInspectBatchComponent,
+  ]
+})
+export class ConfigurationInspectBatchModule { }

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -0,0 +1,132 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="wechatTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+          <div class="list-template__top" nz-row>
+            <div nz-col nzXl='17' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">检查类型</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择检查类型" [(ngModel)]="queryData.extra5" nzAllowClear nzServerSearch>
+                  <nz-option *ngFor="let option of typeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </nz-select>
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">检查科室</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择检查科室" [(ngModel)]="queryData.extra4" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+                  <ng-container *ngFor="let option of deptList">
+                    <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                  </ng-container>
+                  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                  </nz-option>
+                </nz-select>
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">项目名称</span>：
+                <input nz-input class="formItem" placeholder="请输入项目名称" [(ngModel)]="queryData.name" />
+              </div>
+            </div>
+            <div nz-col nzXl="7" class="list-template__btns">
+              <button nz-button class="btn default" (click)="addWechatModal()">新增</button>
+              <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+              <button nz-button class="btn default ml8" (click)='getList()'>搜索</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="dataList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tableWechatHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="20%">排序号</th>
+                <th nzWidth="20%">项目名称</th>
+                <th nzWidth="20%">检查科室</th>
+                <th nzWidth="20%">检查类型</th>
+                <th nzWidth="20%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList;let i = index">
+                <td>{{data.orders}}</td>
+                <td>{{data.name}}</td>
+                <td>{{data.extra4DTO?.dept}}</td>
+                <td>{{data.extra5DTO?.name}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                    <span (click)="editWechat(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalWechat">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideWechatModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="orders">排序号</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="name">项目名称</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入项目名称!">
+            <nz-input-group>
+              <input formControlName="name" nz-input placeholder="请输入项目名称">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">检查科室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra5">检查项目</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查项目!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查项目" nzServerSearch>
+              <ng-container *ngFor="let data of typeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitWechatForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWechatModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.less

@@ -0,0 +1,288 @@
+@import "../../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+    padding: 0!important;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      background-color: #fff;
+      .contentInner{
+        padding: 0 16px 16px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            // margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -0,0 +1,309 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-inspect-inspects",
+  templateUrl: "./configuration-inspect-inspects.component.html",
+  styleUrls: ["./configuration-inspect-inspects.component.less"],
+})
+export class ConfigurationInspectInspectsComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  hosId: any = this.tool.getCurrentHospital().id;
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    setTimeout(() => {
+      this.tableWechatHeight = document.querySelector('#wechatTable').clientHeight - document.querySelector('#wechatTable .list-template__top').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
+    }, 0)
+    this.getTypes();
+    this.getList();
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modalWechat: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addWechatModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalWechat = true;
+    this.initWechatForm();
+  }
+  //关闭新增/编辑弹框
+  hideWechatModal() {
+    this.modalWechat = false;
+  }
+
+  // 编辑
+  editWechat(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWechat = true;
+    this.initWechatForm();
+    this.coopData = data;
+    this.validateForm.controls.orders.setValue(data.orders);
+    this.validateForm.controls.name.setValue(data.name);
+    this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
+    this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
+
+    data.extra4DTO && (this.deptList = [data.extra4DTO]);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitWechatForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+    console.log(this.validateForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    let arr = this.dataList.filter(
+      (item) => item.name == this.validateForm.value.name && item.id != this.coopData.id
+    );
+
+    //有重复名称
+    if (arr.length > 0) {
+      this.btnLoading = false;
+      this.showPromptModal(
+        this.add ? "新增" : "编辑",
+        false,
+        `存在重复的检查项目名称【${this.validateForm.value.name}】请修改后再保存！`
+      );
+      return;
+    }
+
+    if (this.add) {
+      //增加
+      let n = 0;
+      if (this.dataList.length > 0) {
+        let sortArr = this.dataList.map((item) => Number(item.value));
+        n = Math.max.apply(null, sortArr);
+      } else {
+        n = 0;
+      }
+      postData = {
+        // dictionary: {
+          key: "inspect_check_type",
+          value: n + 1,
+          desc: "检查项目",
+          orders: this.validateForm.value.orders,
+          name: this.validateForm.value.name,
+          extra4: this.validateForm.value.extra4,
+          extra5: this.validateForm.value.extra5,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // dictionary: {
+          ...this.coopData,
+          ...{
+            orders: this.validateForm.value.orders,
+            name: this.validateForm.value.name,
+            extra4: this.validateForm.value.extra4,
+            extra5: this.validateForm.value.extra5,
+          }
+        // }
+      };
+    }
+    this.mainService
+      .simplePost("addData", "dictionary", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWechatModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initWechatForm() {
+    this.validateForm = this.fb.group({
+      orders: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      extra4: [null, [Validators.required]],
+      extra5: [null, [Validators.required]],
+    });
+  }
+
+  // 重置
+  queryData: any = {}
+  reset(){
+    this.queryData = {};
+    this.getList();
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  dataList: any[] = []; //表格数据
+  tableWechatHeight:number = 0;
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: "inspect_check_type",
+        name: this.queryData.name,
+        extra4: this.queryData.extra4,
+        extra5: this.queryData.extra5,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.dataList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
+  // 获取检查科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.hosId,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  // 获取检查类型
+  typeList: any = [];
+  getTypes() {
+    this.mainService.getDictionary('list', 'inspect_check_item').subscribe((data) => {
+      this.isLoading = false;
+      this.typeList = data || [];
+    });
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "dictionary", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationInspectInspectsComponent } from './configuration-inspect-inspects.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationInspectInspectsComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationInspectInspectsComponent,
+  ]
+})
+export class ConfigurationInspectInspectsModule { }

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

@@ -6,7 +6,8 @@
       </overlay-scrollbars>
     </div>
     <div class="addressAssign">
-      <div class="contentBody">
+      <!-- 注意事项 -->
+      <div class="contentBody" [hidden]="activeDictionaryKey.id != 1">
         <div class="dictionaryRow">
           <div class="orders">排序号</div>
           <div class="name">注意事项</div>
@@ -48,9 +49,21 @@
           </form>
         </overlay-scrollbars>
       </div>
-      <div class="contentBtns">
+      <div class="contentBtns" [hidden]="activeDictionaryKey.id != 1">
         <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()">保存</button>
       </div>
+      <!-- 批量建单设置 -->
+      <ng-container *ngIf="activeDictionaryKey.id == 2">
+        <div class="contentBody2">
+          <app-configuration-inspect-batch [activeDictionaryKey]="activeDictionaryKey" [dictionaryKeyList]="dictionaryKeyList"></app-configuration-inspect-batch>
+        </div>
+      </ng-container>
+      <!-- 检查项目 -->
+      <ng-container *ngIf="activeDictionaryKey.id == 3">
+        <div class="contentBody2">
+          <app-configuration-inspect-inspects></app-configuration-inspect-inspects>
+        </div>
+      </ng-container>
     </div>
   </div>
 </div>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.component.less

@@ -175,4 +175,6 @@
       align-items: center;
     }
   }
+
+
 }

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

@@ -6,6 +6,7 @@ import { ToolService } from 'src/app/services/tool.service';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { NzMessageService } from 'ng-zorro-antd';
 import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+import { addDays, startOfMinute, endOfMinute, set, getYear, getMonth, getDate, format } from 'date-fns';
 
 @Component({
   selector: "app-configuration-inspect",
@@ -41,13 +42,35 @@ export class ConfigurationInspectComponent implements OnInit {
   // 数据字典key列表
   dictionaryKeyList:any[] = [
     { id: 1, name: '注意事项', key: "inspect_notes"},
+    { id: 2, name: '批量建单配置', key: "", postData: {
+      ibActiveStartTime1: undefined,
+      ibActiveEndTime1: undefined,
+      ibActiveStartTime2: undefined,
+      ibActiveEndTime2: undefined,
+      ibDefaultStartTime: undefined,
+      ibDefaultEndTime: undefined,
+      ibDefaultDayStart: [{ label:'+1天', value: 0 }],
+      ibDefaultDayEnd: [{ label:'+1天', value: 0 }],
+      ib2ActiveStartTime1: undefined,
+      ib2ActiveEndTime1: undefined,
+      ib2ActiveStartTime2: undefined,
+      ib2ActiveEndTime2: undefined,
+      ib2DefaultStartTime: undefined,
+      ib2DefaultEndTime: undefined,
+      ib2DefaultDayStart: [{ label:'+1天', value: 0 }],
+      ib2DefaultDayEnd: [{ label:'+1天', value: 0 }],
+    }},
+    { id: 3, name: '检查项目', key: ""},
   ]
 
   // 点击数据字典key
   activeDictionaryKey:any;
   clickDictionaryKey(item){
     this.activeDictionaryKey = item;
-    this.getDictionaryList();
+    if(this.activeDictionaryKey.id == 1){
+      this.getDictionaryList();
+      this.initDictionaryForm();
+    }
   }
 
   btnLoading: boolean = false; //提交按钮loading状态
@@ -254,4 +277,7 @@ export class ConfigurationInspectComponent implements OnInit {
         }
       });
   }
+
+
+
 }

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.module.ts

@@ -3,6 +3,8 @@ import { CommonModule } from '@angular/common';
 
 import { ConfigurationInspectComponent } from './configuration-inspect.component';
 import { ShareModule } from '../../../share/share.module';
+import { ConfigurationInspectBatchModule } from './configuration-inspect-batch/configuration-inspect-batch.module';
+import { ConfigurationInspectInspectsModule } from './configuration-inspect-inspects/configuration-inspect-inspects.module';
 
 
 @NgModule({
@@ -12,6 +14,8 @@ import { ShareModule } from '../../../share/share.module';
   imports: [
     CommonModule,
     ShareModule,
+    ConfigurationInspectBatchModule,
+    ConfigurationInspectInspectsModule,
   ],
   exports: [
     ConfigurationInspectComponent,

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

@@ -125,6 +125,19 @@
 						</nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item *ngIf="validatePriorityForm.value.bussType === 'inspect'">
+          <nz-form-label nzFor="taskTypeInspectIds" nzRequired [nzSpan]="6">任务类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择任务类型!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择任务类型" formControlName="taskTypeInspectIds" (nzOnSearch)="changeCommonInp('taskTypeInspect', $event)">
+						  <ng-container *ngFor="let option of malfunctionInspectData">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
+						  </ng-container>
+						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+						  </nz-option>
+						</nz-select>
+          </nz-form-control>
+        </nz-form-item>
         <nz-form-item *ngIf="validatePriorityForm.value.bussType === 'goods' && hasSpecimen">
           <nz-form-label nzFor="urgentIds" [nzSpan]="8">是否显示标本数量</nz-form-label>
           <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否显示标本数量!">

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

@@ -28,6 +28,7 @@ export class ConfigurationQuickComponent implements OnInit {
 
 	currentHospital:any;
 	malfunctionData:any = [];
+	malfunctionInspectData:any = [];
 	allUserGroup:any = [];
 	userData:any = [];
 
@@ -37,6 +38,8 @@ export class ConfigurationQuickComponent implements OnInit {
 		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       if(v[0] === 'taskType'){
         this.getTaskTypeList(v[1]);
+      }else if(v[0] === 'taskTypeInspect'){
+        this.getTaskTypeInspectList(v[1]);
       }
     });
 
@@ -48,6 +51,7 @@ export class ConfigurationQuickComponent implements OnInit {
 		this.currentHospital = this.tool.getCurrentHospital();
     this.getCommonFaultsList();
 		this.getTaskTypeList();
+		this.getTaskTypeInspectList();
     this.getPagePermissionIcon();
     this.getPagePermissionBussType();
     this.getPagePermissionQuickOperation();
@@ -72,7 +76,7 @@ export class ConfigurationQuickComponent implements OnInit {
     this.changeCommonInpSubject.next([type, e]);
   }
 
-	// 获取故障现象数据
+	// 获取任务类型数据-标本，其他，万能
   isLoading:boolean = false;
 	getTaskTypeList(keyWord?){
 		let postData = {
@@ -94,6 +98,27 @@ export class ConfigurationQuickComponent implements OnInit {
 		})
 	}
 
+	// 获取任务类型数据-陪检
+	getTaskTypeInspectList(keyWord?){
+		let postData = {
+      idx: 0,
+      sum: 9999,
+		  taskType: {
+        taskName: keyWord,
+        hosIds: this.hosId,
+        assTypeValues: 'inspect',
+        simpleQuery: true,
+		  },
+		};
+    this.isLoading = true;
+		this.mainService.getFetchDataList('configuration', "taskType", postData).subscribe(data => {
+		  this.isLoading = false;
+      if (data.status == 200) {
+        this.malfunctionInspectData = data.list || [];
+      }
+		})
+	}
+
   // 获取字典数据-图标名称
   pagePermissionIconList: any[] = [];
   getPagePermissionIcon() {
@@ -135,15 +160,23 @@ export class ConfigurationQuickComponent implements OnInit {
     console.log(e);
     this.validatePriorityForm.controls.quickOperation.setValue(null);
     this.validatePriorityForm.controls.taskTypeIds.setValue([]);
+    this.validatePriorityForm.controls.taskTypeInspectIds.setValue(null);
     this.validatePriorityForm.controls.urgentIds.setValue(this.gdEmergencyList.map(v => {v.checked = false;return v;}));
 
     if(e === 'service'){
       this.requiredChange('quickOperation', true);
       this.requiredChange('taskTypeIds', false);
+      this.requiredChange('taskTypeInspectIds', false);
       this.requiredChange('urgentIds', false);
     }else if(e === 'goods'){
       this.requiredChange('quickOperation', false);
       this.requiredChange('taskTypeIds', true);
+      this.requiredChange('taskTypeInspectIds', false);
+      this.requiredChange('urgentIds', false);
+    }else if(e === 'inspect'){
+      this.requiredChange('quickOperation', false);
+      this.requiredChange('taskTypeIds', false);
+      this.requiredChange('taskTypeInspectIds', true);
       this.requiredChange('urgentIds', false);
     }
   }
@@ -180,14 +213,20 @@ export class ConfigurationQuickComponent implements OnInit {
     this.coopData = data;
 
     this.changeBussType(data.bussType.value);
-    data.taskTypeIds && this.changeTaskTypeIds(data.taskTypeIds.split(',').map(v => +v));
+    if(data.bussType.value === 'goods'){
+      data.taskTypeIds && this.changeTaskTypeIds(data.taskTypeIds.split(',').map(v => +v));
+    }
 
     this.validatePriorityForm.controls.orders.setValue(data.orders);
     this.validatePriorityForm.controls.icon.setValue(data.icon.id);
     this.validatePriorityForm.controls.name.setValue(data.name);
     this.validatePriorityForm.controls.bussType.setValue(data.bussType.value);
     data.quickOperation && this.validatePriorityForm.controls.quickOperation.setValue(data.quickOperation.id);
-    data.taskTypeIds && this.validatePriorityForm.controls.taskTypeIds.setValue(data.taskTypeIds.split(',').map(v => +v));
+    if(data.bussType.value === 'goods'){
+      data.taskTypeIds && this.validatePriorityForm.controls.taskTypeIds.setValue(data.taskTypeIds.split(',').map(v => +v));
+    }else if(data.bussType.value === 'inspect'){
+      data.taskTypeIds && this.validatePriorityForm.controls.taskTypeInspectIds.setValue(+data.taskTypeIds);
+    }
     if(data.urgentIds){
       let ids = data.urgentIds.split(',').map(v => +v);
       let urgentIds = this.gdEmergencyList.map(v => {
@@ -212,6 +251,12 @@ export class ConfigurationQuickComponent implements OnInit {
     console.log(this.validatePriorityForm.value);
     this.btnLoading = true;
     let postData:any = {};
+    let taskTypeIds;
+    if(this.validatePriorityForm.value.bussType === 'goods'){
+      taskTypeIds = this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined
+    }else if(this.validatePriorityForm.value.bussType === 'inspect'){
+      taskTypeIds = this.validatePriorityForm.value.taskTypeInspectIds ? this.validatePriorityForm.value.taskTypeInspectIds.toString() : undefined
+    }
     if (this.add) {
       //增加
       postData = {
@@ -221,7 +266,7 @@ export class ConfigurationQuickComponent implements OnInit {
         name: this.validatePriorityForm.value.name,
         bussType: this.validatePriorityForm.value.bussType ? this.pagePermissionBussTypeList.find(v => v.value === this.validatePriorityForm.value.bussType) : undefined,
         quickOperation: this.validatePriorityForm.value.quickOperation ? { id: this.validatePriorityForm.value.quickOperation } : undefined,
-        taskTypeIds: this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined,
+        taskTypeIds,
         urgentIds: this.validatePriorityForm.value.urgentIds.length ? this.validatePriorityForm.value.urgentIds.filter(v => v.checked).map(v => v.value).toString() : undefined,
         active: this.validatePriorityForm.value.active,
       };
@@ -234,7 +279,7 @@ export class ConfigurationQuickComponent implements OnInit {
         name: this.validatePriorityForm.value.name,
         bussType: this.validatePriorityForm.value.bussType ? this.pagePermissionBussTypeList.find(v => v.value === this.validatePriorityForm.value.bussType) : undefined,
         quickOperation: this.validatePriorityForm.value.quickOperation ? { id: this.validatePriorityForm.value.quickOperation } : undefined,
-        taskTypeIds: this.validatePriorityForm.value.taskTypeIds.length ? this.validatePriorityForm.value.taskTypeIds.toString() : undefined,
+        taskTypeIds,
         urgentIds: this.validatePriorityForm.value.urgentIds.length ? this.validatePriorityForm.value.urgentIds.filter(v => v.checked).map(v => v.value).toString() : undefined,
         active: this.validatePriorityForm.value.active,
       };
@@ -268,7 +313,8 @@ export class ConfigurationQuickComponent implements OnInit {
       name: [null, [Validators.required]],//按钮名称
       bussType: [null, [Validators.required]],//关联业务
       quickOperation: [null, [Validators.required]],//快捷操作
-      taskTypeIds: [[], [Validators.required]],//关联任务类型
+      taskTypeIds: [[], [Validators.required]],//关联任务类型-标本，其他，万能
+      taskTypeInspectIds: [null, [Validators.required]],//关联任务类型-陪检
       urgentIds: [this.gdEmergencyList.map(v => {v.checked = false;return v;}), [Validators.required]],//是否显示标本数量
       active: [0, [Validators.required]],//是否启用
     });

src/app/guard/inspectClosedLoopView.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class InspectClosedLoopViewGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'inspectClosedLoopView');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/main.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 import { HttpClient, HttpHeaders } from "@angular/common/http";
 
 import host from "../../assets/js/http";
-import { Observable } from "rxjs";
+import { Observable, of } from "rxjs";
 import { AES, mode, pad, enc } from "crypto-js";
 import { MarkingService } from './marking.service';
 
@@ -1119,12 +1119,47 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
-	
+
 	// 闭环数据生成-查询数据
 	queryCount(data){
 		return this.http.post(host.host + `/api/patchData/queryCount`, data, {
 		  headers: this.headers,
 		});
 	}
-	
+
+  // 根据当前日期查询陪检批量建单设置中的默认时间
+	getPatientInspectTime(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectTime`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 根据当前日期查询陪检批量建单设置中的默认时间
+	bindPatientInspect(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/bindPatientInspect`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 根据当患者查检查
+	getPatientInspectList(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectList`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 批量-检查项目转检验项目
+	addPatientInspectList(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/addPatientInspectList`, data, {
+		  headers: this.headers,
+		});
+	}
+
+  // 护士端-批量陪检图标下两个数字
+	getPatientInspectCount(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectCount`, data, {
+		  headers: this.headers,
+		});
+	}
+
 }

src/app/share/add-inspect-modal/add-inspect-modal.component.html

@@ -0,0 +1,72 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">追加项目<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="patient">
+        <span>患者姓名：{{patientInspectLogDTO.patientName}}</span>
+        <span *ngIf="patientInspectLogDTO.patientType && patientInspectLogDTO.patientType.value == 'I'">住院号：{{patientInspectLogDTO.patientCode}}（{{patientInspectLogDTO.bedNum}}）</span>
+        <span *ngIf="patientInspectLogDTO.patientType && patientInspectLogDTO.patientType.value == 'O'">门诊号：{{patientInspectLogDTO.patientCode}}</span>
+        <span *ngIf="patientInspectLogDTO.patientType && patientInspectLogDTO.patientType.value == 'E'">急诊号：{{patientInspectLogDTO.patientCode}}</span>
+        <span>护理级别：{{patientInspectLogDTO.careLevel?.name}}</span>
+        <span>危重等级：{{patientInspectLogDTO.illnessState?.name}}</span>
+      </div>
+      <div class="tabs">
+        <div class="tab" [ngClass]="{ active: activeTabId == item.id }" *ngFor="let item of tabList" (click)="selectTab(item.id)">{{item.name}}</div>
+      </div>
+      <div class="tableWrap">
+        <ng-container *ngIf="activeTabId == 1">
+          <nz-table class="hospitalTable" [nzData]="data1List" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData1Change($event)" [nzScroll]="{ y: '385px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData1Checked" [nzIndeterminate]="isIndeterminateData1"
+                  (nzCheckedChange)="checkAllData1($event)"></th>
+                <th nzWidth="32%">检查项目</th>
+                <th nzWidth="32%">检查地点</th>
+                <th nzWidth="32%">预约时间</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of data1List;let i = index;" (click)="selectedListData1(data.id)">
+                <td nzShowCheckbox [(nzChecked)]="mapOfCheckedData1Id[data.id]" (nzCheckedChange)="refreshData1Status()"></td>
+                <td>{{ data.inspectName}}</td>
+                <td>{{ deptDisplay == 2 ? data.execDept?.deptalias : data.execDept?.dept }}</td>
+                <td>{{ data.yyTime | date:"yyyy-MM-dd HH:mm" }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </ng-container>
+
+        <ng-container *ngIf="activeTabId == 2">
+          <div class="inspectType">
+            检查类型：<u *ngFor="let item of inspectCheckItemList" (click)="clickInspectCheckItem(item.id)" [ngClass]="{ active: activeInspectCheckItemId == item.id }">{{item.name}}</u>
+          </div>
+          <nz-table class="hospitalTable" [nzData]="data2List" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData2Change($event)" [nzScroll]="{ y: '385px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData2Checked" [nzIndeterminate]="isIndeterminateData2"
+                  (nzCheckedChange)="checkAllData2($event)"></th>
+                <th nzWidth="32%">检查项目</th>
+                <th nzWidth="32%">检查地点</th>
+                <th nzWidth="32%">检查类型</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of data2List;let i = index;" (click)="selectedListData2(data.id)">
+                <td nzShowCheckbox [(nzChecked)]="mapOfCheckedData2Id[data.id]" (nzCheckedChange)="refreshData2Status()"></td>
+                <td>{{ data.name}}</td>
+                <td>{{ deptDisplay == 2 ? data.extra4DTO?.deptalias : data.extra4DTO?.dept }}</td>
+                <td>{{ data.extra5DTO?.name }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </ng-container>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" (click)="confirmModal()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/add-inspect-modal/add-inspect-modal.component.less

@@ -0,0 +1,194 @@
+@import "../../../../src/theme.less";
+.patient{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 56px;
+  font-size: 18px;
+  padding: 0 24px;
+}
+.tabs{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 45px;
+  font-size: 14px;
+  border-top: 1px solid #e5e9ed;
+  border-bottom: 1px solid #e5e9ed;
+  .tab{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    cursor: pointer;
+    &.active{
+      background-color: #F0F6ED;
+    }
+  }
+}
+.tableWrap{
+  padding: 16px;
+  .inspectType{
+    padding-bottom: 16px;
+    text-align: left!important;
+    u{
+      margin-right: 8px;
+      cursor: pointer;
+      &.active{
+        color: @primary-color;
+      }
+    }
+  }
+}
+.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;
+    }
+  }
+
+  .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 {
+      height: 603px;
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      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/add-inspect-modal/add-inspect-modal.component.ts

@@ -0,0 +1,192 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { startOfDay, format } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: 'app-add-inspect-modal',
+  templateUrl: './add-inspect-modal.component.html',
+  styleUrls: ['./add-inspect-modal.component.less']
+})
+export class AddInspectModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  isAllDisplayData1Checked = false;
+  isAllDisplayData2Checked = false;
+  listOfDisplayData1: any[] = [];
+  listOfDisplayData2: any[] = [];
+  mapOfCheckedData1Id: { [key: string]: boolean } = {};
+  mapOfCheckedData2Id: { [key: string]: boolean } = {};
+  isIndeterminateData1 = false;
+  isIndeterminateData2 = false;
+  currentDept; //当前科室
+
+  hosId;
+  hsLoading = false;
+  data1List: any = [];// 列表
+  data2List: any = [];// 列表
+
+  tabList:any[] = [
+    {id: 1, name: '检查项目'},
+    {id: 2, name: '手动添加'},
+  ]
+  activeTabId: number = 1;
+  @Input() patientInspectLogDTO: any;
+  @Input() deptDisplay: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDept = this.tool.getCurrentUserDept();
+    this.getList();
+  }
+
+  // 选择tab
+  selectTab(id){
+    this.activeTabId = id;
+    this.getList();
+  }
+
+  currentPageData1Change($event: any[]): void {
+    this.listOfDisplayData1 = this.data1List; //改变页数，长度也要变
+    this.refreshData1Status();
+  }
+
+  currentPageData2Change($event: any[]): void {
+    this.listOfDisplayData2 = this.data2List; //改变页数，长度也要变
+    this.refreshData2Status();
+  }
+
+  refreshData1Status(): void {
+    this.isAllDisplayData1Checked = this.listOfDisplayData1.length ? this.listOfDisplayData1.every(
+      (item) => this.mapOfCheckedData1Id[item.id]
+    ) : false;
+    this.isIndeterminateData1 = this.listOfDisplayData1.some((item) => this.mapOfCheckedData1Id[item.id]) && !this.isAllDisplayData1Checked;
+  }
+
+  refreshData2Status(): void {
+    this.isAllDisplayData2Checked = this.listOfDisplayData2.length ? this.listOfDisplayData2.every(
+      (item) => this.mapOfCheckedData2Id[item.id]
+    ) : false;
+    this.isIndeterminateData2 = this.listOfDisplayData2.some((item) => this.mapOfCheckedData2Id[item.id]) && !this.isAllDisplayData2Checked;
+  }
+
+  // 开通科室选择整行
+  selectedListData1(id) {
+    this.mapOfCheckedData1Id[id] = !this.mapOfCheckedData1Id[id];
+    this.refreshData1Status();
+  }
+
+  // 开通科室选择整行
+  selectedListData2(id) {
+    this.mapOfCheckedData2Id[id] = !this.mapOfCheckedData2Id[id];
+    this.refreshData2Status();
+  }
+
+  checkAllData1(value: boolean): void {
+    this.listOfDisplayData1.forEach(
+      (item) => (this.mapOfCheckedData1Id[item.id] = value)
+    );
+    this.refreshData1Status();
+  }
+
+  checkAllData2(value: boolean): void {
+    this.listOfDisplayData2.forEach(
+      (item) => (this.mapOfCheckedData2Id[item.id] = value)
+    );
+    this.refreshData2Status();
+  }
+
+  // 确认弹窗
+  confirmModal() {
+    console.log(this[`mapOfCheckedData${this.activeTabId}Id`]);
+    let list = [];
+    for (const key in this[`mapOfCheckedData${this.activeTabId}Id`]) {
+      if (this[`mapOfCheckedData${this.activeTabId}Id`][key]) {
+        list.push({id: key});
+      }
+    }
+    if(list.length == 0){
+      this.message.warning('请选择数据');
+      return;
+    }
+    this.confirmModelHs.emit(JSON.stringify({ show: false, list, type: this.activeTabId }));//emits(向上弹射)事件
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  getList(){
+    if(this.activeTabId == 1){
+      this.getList1();
+    }else if(this.activeTabId == 2){
+      this.getInspectCheckItem();
+      this.getList2();
+    }
+  }
+
+  // 获取列表数据
+  getList1() {
+    let postData = {
+      startTime: format(startOfDay(new Date()), 'yyyy-MM-dd HH:mm:ss'),
+      patientCodes: this.patientInspectLogDTO.patientCode,
+      inspectStateValue: 1,//待陪检
+      noneGdid: 1,//未绑定工单
+      nonePilId: 1,//未绑定患者闭环
+      deptId: this.currentDept.id,
+    }
+    this.hsLoading = true;
+    this.mainService.getPatientInspectList(postData).subscribe((data: any) => {
+      this.hsLoading = false;
+      this.data1List = data.list || [];
+    })
+  }
+
+  // 获取列表数据
+  getList2() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: 'inspect_check_type',
+        extra5: this.activeInspectCheckItemId,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','dictionary',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.data2List = data.list || [];
+    })
+  }
+
+  // 获取检查项目
+  inspectCheckItemList:any[] = [];
+  activeInspectCheckItemId;
+  getInspectCheckItem() {
+    this.mainService.getDictionary("list", "inspect_check_item").subscribe((data) => {
+			this.inspectCheckItemList = data || [];
+		});
+  }
+
+  clickInspectCheckItem(id){
+    if(this.activeInspectCheckItemId == id){
+      this.activeInspectCheckItemId = undefined;
+    }else{
+      this.activeInspectCheckItemId = id;
+    }
+    this.getList2();
+  }
+
+}
+
+
+

src/app/share/select-date-yytime/select-date-yytime.component.html

@@ -0,0 +1,26 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">修改预约时间<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="tips">是否需要预约执行，如需预约请您选择时间</div>
+      <div class="addForm">
+        <div class="display_flex align-items_center">
+          <div>
+            <nz-date-picker [(ngModel)]="yyDate" [nzShowToday]="false"></nz-date-picker>
+            <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false">
+            </nz-time-picker>
+            <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
+              下一日
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nzType="primary" nz-button (click)="submitFormYytime()">预约陪检</button>
+      <button class="btn" nzType="primary" nz-button (click)="submitFormDirect()">立即执行</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/select-date-yytime/select-date-yytime.component.less

@@ -0,0 +1,131 @@
+.yyTimeError {
+  ::ng-deep .ant-time-picker-input,
+  ::ng-deep .ant-calendar-picker-input {
+    border: 1px solid red !important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/share/select-date-yytime/select-date-yytime.component.ts

@@ -0,0 +1,53 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { NzMessageService } from 'ng-zorro-antd';
+import { addDays, startOfMinute, format } from 'date-fns';
+
+@Component({
+  selector: 'app-select-date-yytime',
+  templateUrl: './select-date-yytime.component.html',
+  styleUrls: ['./select-date-yytime.component.less']
+})
+export class SelectDateYytimeComponent implements OnInit {
+  @Input() date:any;
+  @Output() submitFormYytimeE = new EventEmitter();
+  @Output() submitFormDirectE = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+  yyDate = null; //预约日期-患者其他服务
+  yyTime = null; //预约时间-患者其他服务
+  constructor(
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    if(this.date){
+      this.yyDate = startOfMinute(new Date(this.date));
+      this.yyTime = startOfMinute(new Date(this.date));
+    }
+  }
+
+  // 下一日(患者其他服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 预约陪检
+  submitFormYytime(): void {
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间');
+      return;
+    }
+    this.submitFormYytimeE.emit(format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'));
+  }
+
+  // 立即执行
+  submitFormDirect(): void {
+    this.submitFormDirectE.emit();
+  }
+}
+

src/app/share/select-date/select-date.component.html

@@ -0,0 +1,24 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">修改预约时间<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="addForm">
+        <div class="display_flex align-items_center">
+          <div>
+            <nz-date-picker [(ngModel)]="yyDate" [nzShowToday]="false"></nz-date-picker>
+            <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false">
+            </nz-time-picker>
+            <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
+              下一日
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/select-date/select-date.component.less

@@ -0,0 +1,135 @@
+.yyTimeError {
+  ::ng-deep .ant-time-picker-input,
+  ::ng-deep .ant-calendar-picker-input {
+    border: 1px solid red !important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/select-date/select-date.component.ts

@@ -0,0 +1,47 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { NzMessageService } from 'ng-zorro-antd';
+import { addDays, startOfMinute, format } from 'date-fns';
+
+@Component({
+  selector: 'app-select-date',
+  templateUrl: './select-date.component.html',
+  styleUrls: ['./select-date.component.less']
+})
+export class SelectDateComponent implements OnInit {
+  @Input() date:any;
+  @Output() submitFormHand = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+  yyDate = null; //预约日期-患者其他服务
+  yyTime = null; //预约时间-患者其他服务
+  constructor(
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    if(this.date){
+      this.yyDate = new Date(this.date);
+      this.yyTime = new Date(this.date);
+    }
+  }
+
+  // 下一日(患者其他服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 表单提交
+  submitForm(): void {
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间');
+      return;
+    }
+    this.submitFormHand.emit(format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'));
+  }
+}
+

src/app/share/share.module.ts

@@ -59,6 +59,9 @@ 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';
+import { SelectDateComponent } from './select-date/select-date.component';
+import { AddInspectModalComponent } from './add-inspect-modal/add-inspect-modal.component';
+import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yytime.component';
 
 @NgModule({
   declarations: [
@@ -121,6 +124,9 @@ import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info
     BloodHistoryPromptModalComponent,
     MedicalWasteHistoryPromptModalComponent,
     MedicalWasteLogPromptModalComponent,
+    SelectDateComponent,
+    AddInspectModalComponent,
+    SelectDateYytimeComponent,
   ],
   imports: [
     CommonModule,
@@ -191,6 +197,9 @@ import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info
     BloodHistoryPromptModalComponent,
     MedicalWasteHistoryPromptModalComponent,
     MedicalWasteLogPromptModalComponent,
+    SelectDateComponent,
+    AddInspectModalComponent,
+    SelectDateYytimeComponent,
   ]
 })
 export class ShareModule { }

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

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

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

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

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

@@ -0,0 +1,578 @@
+import { Component, OnInit } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { startOfDay, endOfDay, format } from 'date-fns';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Location } from '@angular/common';
+import cloneDeep from 'lodash-es/cloneDeep'
+@Component({
+  selector: 'app-batch-inspection',
+  templateUrl: './batch-inspection.component.html',
+  styleUrls: ['./batch-inspection.component.less']
+})
+export class BatchInspectionComponent implements OnInit {
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private _location: Location,
+  ) { }
+
+  dateRange: any = []; //预约时间
+  patientId: any; //患者
+  hosId:any = this.tool.getCurrentHospital().id; //当前院区
+  deptDTO:any = this.tool.getCurrentUserDept(); //当前科室
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  listOfData: any[] = []; //表格数据
+
+  searchTimerSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+
+    this.init();
+  }
+
+  // 修改出行方式
+  changeTripType(tripTypeId, id){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData = this.listOfData.find(v => v.id == id);
+    this.mainService
+    .simplePost("addData", 'patientInspectLog', postData)
+    .subscribe((data) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      this.getList();
+      if (data.status == 200) {
+        this.message.success("修改出行方式成功");
+      } else {
+        this.message.success(data.msg || "修改出行方式失败");
+      }
+    });
+  }
+
+  init(){
+    this.getPatientInspectTime();
+    this.getWorkOrderInspectScore();
+    this.getList();
+  }
+
+  // 获取批量建单设置中的默认时间
+  getPatientInspectTime(){
+    this.mainService.getPatientInspectTime().subscribe((result:any) => {
+      if(result.startTime && result.endTime){
+        this.dateRange = [new Date(result.startTime), new Date(result.endTime)];
+      }else{
+        this.dateRange = [];
+      }
+    });
+  }
+
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 搜索
+  changeInp(type, e) {
+    if(type === 'patient'){
+      this.searchTimer(this.getPatientList, e);
+    }
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+
+  openChangePatient(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getPatientList();
+  }
+
+  // 获取患者
+  patientList: any = [];
+  getPatientList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      patient: {
+        department: this.deptDTO,
+        keyWord: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "patient", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.patientList = data.list || [];
+      });
+  }
+
+  maskFlag: any = false;
+
+  addPatientList(){
+    if(!this.dateRange.length){
+      this.message.info('请选择预约时间!');
+      return;
+    }
+
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      inspectStateValue: 1,//待陪检
+      noneGdid: 1,//未绑定工单
+      nonePilId: 1,//未绑定患者闭环
+      deptId: this.deptDTO.id,
+    };
+
+    this.mainService
+      .getPatientInspectList(postData)
+      .subscribe((result:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.inspectActiveList = result.list || [];
+        this.patientActiveList = result.patientList || [];
+        if(this.patientActiveList.length){
+          this.showDelModal(this.patientActiveList, `您确认添加“<b class="red">${this.patientActiveList.length}</b>”位患者共“<b class="red">${this.inspectActiveList.length}</b>”项检查吗？`,'批量添加患者','add');
+        }else{
+          this.message.info('当前时间区间没有检查！');
+        }
+      });
+  }
+
+  changePatientId(id){
+    this.setIsSelecting(true);
+    setTimeout(() => {
+      this.patientId = null;
+    }, 0)
+
+    if(!id){
+      return;
+    }
+
+    if(!this.dateRange.length){
+      this.message.info('请选择预约时间!');
+      return;
+    }
+
+    let patientDTO = this.patientList.find(v => v.id == id);
+    this.patientActiveList = [patientDTO];
+    let postData = {
+      startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      patientCodes: patientDTO.patientCode,
+      inspectStateValue: 1,//待陪检
+      noneGdid: 1,//未绑定工单
+      nonePilId: 1,//未绑定患者闭环
+      deptId: this.deptDTO.id,
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getPatientInspectList(postData)
+      .subscribe((result:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.inspectActiveList = result.list || [];
+        this.showDelModal(this.patientActiveList, `<b class="red">${patientDTO.patientName}</b>在时间范围内有<b class="red">${this.inspectActiveList.length}</b>项检查项目，是否确认添加？`,'添加','add');
+      });
+  }
+
+  inspectActiveList: any = [];//选中检查列表
+  patientActiveList: any = [];//选中患者列表
+
+  coopData: any = {}; //当前操作列
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除-移除患者
+      this.mainService
+        .simplePost("rmvData", "patientInspectLog", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "delInspect") {
+      //删除-检验项目
+      this.coopData.data.inspectList.forEach(v => {
+        if(v.id == this.coopData.inspect.id){
+          v.pilId = undefined;
+        }
+      })
+      let postData = {
+        type: 'plan',
+        pilList: [{
+          ...this.patientInspectLogDTO,
+          inspectList: this.coopData.data.inspectList.filter(v => v.id == this.coopData.inspect.id),
+        }]
+      }
+      this.mainService
+        .addPatientInspectList(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal('删除', true, "");
+          } else {
+            this.showPromptModal('删除', false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "add") {
+      //新增-患者陪检闭环
+      let postData = {
+        patientIds: this.inspectActiveList.length === 0 ? this.patientActiveList.map(v => v.id).toString() : undefined,
+        inspectIds: this.inspectActiveList.length !== 0 ? this.inspectActiveList.map(v => v.id).toString() : undefined,
+      }
+      this.mainService
+        .bindPatientInspect(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "reset") {
+      //重置
+      let ids = this.listOfData.filter(v => v.state.value == 1).map(v => v.id);
+      this.mainService
+        .simplePost("rmvData", "patientInspectLog", ids)
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 修改检验项目
+  isShowSelectDate:boolean = false;
+  editInspect(data){
+    this.isShowSelectDate = true;
+    this.coopData = data;
+  }
+
+  // 修改检验项目-确定
+  submitSelectDate(date){
+    console.log(date)
+    this.coopData.data.inspectList.forEach(v => {
+      if(v.id == this.coopData.inspect.id){
+        v.yyTime = date;
+      }
+    })
+    let postData = {
+      type: 'plan',
+      pilList: [{
+        ...this.coopData.data,
+        inspectList: this.coopData.data.inspectList.filter(v => v.id == this.coopData.inspect.id),
+      }]
+    }
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .addPatientInspectList(postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.state == 200) {
+          this.isShowSelectDate = false;
+          this.showPromptModal('修改', true, "");
+        } else {
+          this.showPromptModal('修改', false, data.msg);
+        }
+      });
+  }
+
+  // 修改检验项目-取消
+  cancelSelectDate(e) {
+    this.isShowSelectDate = false;
+  }
+
+
+  // 批量发起陪检
+  isShowSelectDateYytime:boolean = false;
+  addYytime(){
+    let obj1 = this.listOfData.find(v => !v.tripType);
+    if(obj1){
+      this.message.warning(`${obj1.patientName}患者没有选择出行方式，请调整后提交申请！`)
+      return;
+    }
+
+    let obj2 = this.listOfData.find(v => !v.inspectList || v.inspectList.length == 0);
+    if(obj2){
+      this.message.warning(`${obj2.patientName}患者没有检验项目，请调整后提交申请！`)
+      return;
+    }
+    this.isShowSelectDateYytime = true;
+  }
+
+  // 批量发起陪检-预约陪检
+  submitSelectDateYytime(date){
+    console.log(date)
+    if(+date <= +new Date()){
+      this.message.warning(`预约时间不能小于当前时间！`)
+      return;
+    }
+    let pilList = cloneDeep(this.listOfData);
+    pilList.forEach(v => {
+      v.yyTime = date;
+      delete v.inspectList;
+    })
+    let postData = {
+      type: 'appointment',
+      pilList,
+    }
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .addPatientInspectList(postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.state == 200) {
+          this.isShowSelectDateYytime = false;
+          this.showPromptModal('操作', true, "");
+        } else {
+          this.showPromptModal('操作', false, data.msg);
+        }
+      });
+  }
+
+  // 批量发起陪检-立即执行
+  submitSelectDateDirect(){
+    let pilList = cloneDeep(this.listOfData);
+    pilList.forEach(v => {
+      delete v.inspectList;
+    })
+    let postData = {
+      type: 'action',
+      pilList,
+    }
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .addPatientInspectList(postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.state == 200) {
+          this.isShowSelectDateYytime = false;
+          this.showPromptModal('操作', true, "");
+        } else {
+          this.showPromptModal('操作', false, data.msg);
+        }
+      });
+  }
+
+  // 批量发起陪检-取消
+  cancelSelectDateYytime(e) {
+    this.isShowSelectDateYytime = false;
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+
+  loading1:boolean = false;
+  inspectTotalCount:number = 0;
+
+  getList(){
+    let data = {
+      idx: 0,
+      sum: 9999,
+      patientInspectLog: {
+        state: { value: '1,2' },
+        deptId: this.deptDTO ? this.deptDTO.id : undefined,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "patientInspectLog", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.inspectTotalCount = this.listOfData.reduce((v, i) => v + i.planInspectCount, 0);
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  //获取出行方式
+  workOrderInspectScoreList:any[] = [];
+  getWorkOrderInspectScore() {
+    let postData = { idx: 0, sum: 9999, workOrderInspectScore: { hosId: this.hosId } };
+    this.mainService
+      .getFetchDataList("simple/data", "workOrderInspectScore", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.workOrderInspectScoreList = result.list || [];
+        } else {
+          this.message.error("请求数据失败");
+        }
+      });
+  }
+
+  // 返回
+  goBack(){
+    this._location.back();
+  }
+
+  // 追加项目
+  patientInspectLogDTO:any = {};
+  isShowAddInspect = false; //弹窗开关
+  addInspect(patientInspectLogDTO){
+    this.patientInspectLogDTO = patientInspectLogDTO;
+    this.isShowAddInspect = true;
+  }
+  // 关闭弹窗
+  closeAddInspectModel(e) {
+    this.isShowAddInspect = JSON.parse(e).show;
+  }
+  // 确定弹窗
+  confirmAddInspectModel(e) {
+    console.log(e);
+    let obj = JSON.parse(e);
+    this.isShowAddInspect = obj.show;
+    if(obj.type == 1){
+      //检验项目
+      let postData = {
+        inspectIds: obj.list.map(v => v.id).toString() || undefined,
+      }
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+      this.mainService
+        .bindPatientInspect(postData)
+        .subscribe((data:any) => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          if (data.state == 200) {
+            this.showPromptModal('添加', true, "");
+          } else {
+            this.showPromptModal('添加', false, data.msg);
+          }
+        });
+    }else if(obj.type == 2){
+      // 手动添加
+      let postData = {
+        type: 'plan',
+        pilList: [{
+          ...this.patientInspectLogDTO,
+          inspectList: obj.list.map(v => ({
+            patientCode: this.patientInspectLogDTO.patientCode,
+            patientName: this.patientInspectLogDTO.patientName,
+            barCode: this.patientInspectLogDTO.barCode,
+            inspectCheckType: { id: v.id },
+            applyDeptId: this.patientInspectLogDTO.deptId,
+            bedNum: this.patientInspectLogDTO.bedNum,
+            hosId: this.patientInspectLogDTO.hosId,
+            pilId: this.patientInspectLogDTO.id,
+            yyTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+          })) || undefined,
+        }]
+      }
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+      this.mainService
+        .addPatientInspectList(postData)
+        .subscribe((data:any) => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          if (data.state == 200) {
+            this.showPromptModal('添加', true, "");
+          } else {
+            this.showPromptModal('添加', false, data.msg);
+          }
+        });
+    }
+  }
+}

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BatchInspectionRoutingModule } from './batch-inspection-routing.module';
+import { BatchInspectionComponent } from './batch-inspection.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [BatchInspectionComponent],
+  imports: [
+    CommonModule,
+    BatchInspectionRoutingModule,
+    ShareModule,
+  ]
+})
+export class BatchInspectionModule { }

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

@@ -353,10 +353,14 @@
                       <div class="navIcon" [ngClass]="backColorComputed(item.icon.extra1)"><i class="icon_transport" [ngClass]="[item.icon.extra1]"></i></div>
                       <div class="navContent">
                         <h2>{{item.name}}</h2>
-                        <div class="navSpecimen" *ngIf="(item.urgentFlag || item.ordinaryFlag) && deptTaskTypeRules.openSpecimen">
+                        <div class="navSpecimen" *ngIf="item.urgentFlag || item.ordinaryFlag">
                           <span *ngIf="item.urgentFlag" (click)="changeSpeDetail($event, 1)">急:<span class="red">{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</span></span>
                           <span *ngIf="item.ordinaryFlag" (click)="changeSpeDetail($event, 0)">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
                         </div>
+                        <div class="navSpecimen" *ngIf="item.bussType.value === 'inspect'">
+                          <span (click)="changeInspectClosedLoopView($event, '2')">预:{{patientInspectCountMsg.data ? patientInspectCountMsg.data[0].yyCount : 0}}</span>
+                          <span (click)="changeInspectClosedLoopView($event, '3,4')">检:{{patientInspectCountMsg.data ? patientInspectCountMsg.data[0].workingCount : 0}}</span>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -964,7 +968,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let item of outpatientHelpAppointmentList;let i = index">
-                          <td>{{ item.patientName }}<br>{{ item.sex?.name }}<ng-container *ngIf="item.age !== undefined"> {{item.age}}岁</ng-container></td>
+                          <td>{{ item.patientName }}<br>{{ item.sex?.name }}<ng-container *ngIf="item && item.age !== undefined"> {{item.age}}岁</ng-container></td>
                           <td>{{ item.applyType?.name }}<br>{{ item.equipment?.name }}</td>
                           <td>患者：{{ item.patientPhone }}<br>代表：{{ item.agent_phone }}</td>
                           <td>{{ item.escortTime | date:'yyyy-MM-dd HH:mm' }}<br>{{ item.status?.name }}</td>

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

@@ -270,7 +270,7 @@
         padding: 0 5px;
       }
     }
-		
+
 		.new-title {
 		  width: 100%;
 		  text-align: center;
@@ -286,7 +286,7 @@
 		    padding: 0 5px;
 		  }
 		}
-		
+
 		.title-weight{
 			font-weight: bold;
 			font-size: 15px;
@@ -402,7 +402,7 @@
 				            text-decoration: underline;
 				            cursor: pointer;
 				          }
-									
+
 									.coop-btn{
 										button{
 											margin-top: 0 !important;
@@ -415,14 +415,14 @@
 										  display: inline-block;
 										  cursor: pointer;
 										  position: relative;
-										
+
 										  &::after {
 										    content: "|";
 										    position: absolute;
 										    top: 0;
 										    right: 0;
 										  }
-										
+
 										  &:nth-last-child(1) {
 										    &::after {
 										      content: "";
@@ -430,7 +430,7 @@
 										  }
 										}
 									}
-									
+
 				          .coop {
 				            button{
 				              color: #333;
@@ -1461,6 +1461,12 @@
                           font-size: 24px;
                         }
                       }
+                      &.inspect{
+                        background: linear-gradient( 41deg, #28EDD9 0%, #0FBBE2 100%);
+                        .icon_transport{
+                          font-size: 24px;
+                        }
+                      }
                     }
                     h2{
                       font-size: 12px;

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

@@ -789,6 +789,8 @@ export class HushijiandanComponent implements OnInit {
       return 'drugbag';
     }else if(icon === 'transport-baoxiu'){
       return 'incident';
+    }else if(icon === 'transport-peihuguanli'){
+      return 'inspect';
     }else{
       return '';
     }
@@ -1245,6 +1247,7 @@ export class HushijiandanComponent implements OnInit {
   refreshSpecimenWorkOrderMsg() {
     this.msgTimerId = setInterval(() => {
       this.getSpecimenWorkOrderMsg();
+      this.getPatientInspectCountMsg();
     }, 60000);
   }
 
@@ -1274,6 +1277,23 @@ export class HushijiandanComponent implements OnInit {
       });
   }
 
+  // 护士端-批量陪检图标下两个数字
+  patientInspectCountMsg: any = {};
+  getPatientInspectCountMsg() {
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
+      return;
+    }
+    let that = this;
+
+    that.mainService
+      .getPatientInspectCount({
+        deptId: JSON.parse(localStorage.getItem("user")).user.dept.id,
+      })
+      .subscribe((data) => {
+        that.patientInspectCountMsg = data;
+      });
+  }
+
   // 手术提示信息
   surgeryLoading = false;
 	now:any = new Date();
@@ -1748,6 +1768,7 @@ export class HushijiandanComponent implements OnInit {
             that.deptTaskTypeRules.openInspection ||
             that.deptTaskTypeRules.openPatientTransport
           ) {
+            this.getPatientInspectCountMsg();
             // 陪检权限或转科权限
             if (this.tabFlag) {
               this.tabFlag = false;
@@ -4473,6 +4494,16 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+
+  // 跳转患者陪检闭环视图
+  changeInspectClosedLoopView(e, stateValue){
+    e.stopPropagation();
+    let queryParams = {
+      department: { id: this.currentDept.id, dept: this.currentDept.dept },
+      stateValue,
+    }
+    this.router.navigateByUrl(`/inspectClosedLoopView?queryParams=${JSON.stringify(queryParams)}`);
+  }
   // 隐藏查看标本详情弹层
   hideSpeDetailModel() {
     this.detailModel = false;
@@ -5208,6 +5239,9 @@ export class HushijiandanComponent implements OnInit {
       // 物品配送
       this.buildQuickConfirmData = data || {};
       this.isShowBuildQuickConfirm = true;
+    }else if(data.bussType.value === 'inspect'){
+      // 陪检
+      this.router.navigateByUrl("/batchInspection");
     }
   }
   cancelBuildQuickConfirm(e){

src/app/views/info-search/info-search.component.html

@@ -32,7 +32,7 @@
             <!-- 检查列表 -->
             <div *ngSwitchCase="'inspectList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #inspectListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -105,7 +105,7 @@
             <!-- 工单信息 -->
             <div *ngSwitchCase="'order'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #orderTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -207,7 +207,7 @@
             <!-- 工单日志 -->
             <div *ngSwitchCase="'orderLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #orderLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -231,7 +231,7 @@
             <!-- 检查日志 -->
             <div *ngSwitchCase="'inspectLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #inspectLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -253,7 +253,7 @@
             <!-- 标本列表 -->
             <div *ngSwitchCase="'specimenList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #specimenListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -330,7 +330,7 @@
             <!-- 标本日志 -->
             <div *ngSwitchCase="'specimenLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #specimenLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -352,7 +352,7 @@
             <!-- 药品列表 -->
             <div *ngSwitchCase="'drugsBagList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #drugsBagListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -420,7 +420,7 @@
             <!-- 药包日志 -->
             <div *ngSwitchCase="'drugsBagLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #drugsBagLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -442,7 +442,7 @@
             <!-- 药品日志 -->
             <div *ngSwitchCase="'drugsLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #drugsLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -464,7 +464,7 @@
             <!-- 静配包列表 -->
             <div *ngSwitchCase="'jpBagList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #jpBagListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -515,7 +515,7 @@
             <!-- 静配包日志 -->
             <div *ngSwitchCase="'jpBagLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #jpBagLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -537,7 +537,7 @@
             <!-- 静配日志 -->
             <div *ngSwitchCase="'jpLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #jpLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -556,6 +556,32 @@
                 </tbody>
               </nz-table>
             </div>
+            <!-- 原始数据日志 -->
+            <div *ngSwitchCase="'dataSourceList'" class="list-template__bottom">
+              <nz-table class="list-template__nzTable" #dataSourceTpl [nzData]="panel.list" nzSize="middle"
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                <thead>
+                  <tr class="thead">
+                    <th nzWidth="110px">业务标识</th>
+                    <th nzWidth="150px">时间</th>
+                    <th nzWidth="800px">原始数据</th>
+                    <th nzWidth="110px">优先级</th>
+                    <th nzWidth="110px">状态标识</th>
+                    <th nzWidth="150px">业务唯一标识</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr *ngFor="let data of dataSourceTpl.data;let i = index">
+                    <td>{{data[5]}}</td>
+                    <td>{{data[1]|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                    <td (click)="toSource(data[2], '原始数据')" class="wordBreak">{{data[2]}}</td>
+                    <td>{{data[3]}}</td>
+                    <td>{{data[4]}}</td>
+                    <td>{{data[6]}}</td>
+                  </tr>
+                </tbody>
+              </nz-table>
+            </div>
           </ng-container>
         </app-collapse-panel>
       </app-collapse>

src/app/views/info-search/info-search.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
-import { NzModalService } from "ng-zorro-antd";
+import { NzModalService, NzMessageService } from "ng-zorro-antd";
 
 @Component({
   selector: "app-info-search",
@@ -12,7 +12,8 @@ export class InfoSearchComponent implements OnInit {
   constructor(
     private mainService: MainService,
     private tool: ToolService,
-    private modalService: NzModalService
+    private modalService: NzModalService,
+    private message: NzMessageService,
   ) {}
 
   searchCriteria = {
@@ -41,6 +42,10 @@ export class InfoSearchComponent implements OnInit {
       type: "jpBag",
       name: "静配",
     },
+    {
+      type: "dataSource",
+      name: "原始数据",
+    },
   ]; // 类型列表
   hosId;
   ngOnInit() {
@@ -155,6 +160,12 @@ export class InfoSearchComponent implements OnInit {
       extra: "jpLogs",
       list: [],
     },
+    {
+      active: true,
+      name: "原始数据日志",
+      extra: "dataSourceList",
+      list: [],
+    },
   ];
   // 获取数据
   getList() {
@@ -181,4 +192,18 @@ export class InfoSearchComponent implements OnInit {
       nzMaskClosable: true,
     });
   }
+  // 弹窗
+  toSource(string, name) {
+    this.modalService.info({
+      nzTitle: name,
+      nzContent: "<pre>" + string + "</pre>",
+      nzWidth: 1000,
+      nzMaskClosable: true,
+      nzOkText: '复制',
+      nzOnOk: () => {
+        navigator.clipboard.writeText(string);
+        this.message.info(`复制${name}成功`);
+      }
+    });
+  }
 }

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -262,7 +262,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
     let signTypeIds = this.checkInModes.filter(v => v.checked).map(v => v.value).toString();
     // let closeTypeIds = this.automaticCustomsOrders.filter(v => v.checked).map(v => v.value).toString();
     let postData:any = {
-      id: this.configs.id,
+      ...this.configs,
       taskType: this.tasktype.id,
       hosId: this.hosId,
       multiplayerMode: this.multiplayerMode[0].checked ? 1 : 0,

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { InspectClosedLoopViewComponent } from './inspect-closed-loop-view.component';
+
+
+const routes: Routes = [
+  {
+    path: "",
+    component: InspectClosedLoopViewComponent,
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class InspectClosedLoopViewRoutingModule { }

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.html

@@ -0,0 +1,79 @@
+<div class="header">
+  <div class="display_flex align-items_center flex-wrap">
+    <div class="dept"><i class="icon icon_transport transport-fanhui" (click)='goBack()'></i></div>
+    <div class="patient">
+      <span class="label">预约时间:</span>
+      <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+    </div>
+    <div class="patient">
+      <span class="label">科室:</span>
+      <nz-select class="formItem" [nzDisabled]="disableDept" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择科室" [(ngModel)]="searchDto.deptId" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('department', $event)" (nzOpenChange)="openChangeDepartment($event)" (ngModelChange)="setIsSelecting(true)">
+        <ng-container *ngFor="let option of departmentList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+    <div class="patient">
+      <span class="label">患者:</span>
+      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchDto.patientId" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
+        <ng-container *ngFor="let option of patientList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+    <div class="patient">
+      <span class="label">状态:</span>
+      <nz-select nzMode="multiple" class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择状态" [(ngModel)]="searchDto.stateValue" nzAllowClear>
+        <ng-container *ngFor="let option of statusList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.value"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+    <div class="patient">
+      <label nz-checkbox [(ngModel)]="autoRefresh" (ngModelChange)="changeAutoRefresh($event)">自动刷新</label>
+      <nz-input-number [(ngModel)]="autoRefreshSecond" [nzMin]="15" [nzStep]="1" [nzPrecision]="0" [nzParser]="parserPercent" [nzFormatter]="formatterPercent"></nz-input-number>
+    </div>
+  </div>
+  <div class="display_flex align-items_center ml8">
+    <button nz-button class="btn default" (click)='reset()'>重置</button>
+    <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+  </div>
+</div>
+<div class="table">
+  <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+    <thead>
+      <tr class="thead">
+        <th nzWidth="14%">科室信息</th>
+        <th nzWidth="14%">患者信息</th>
+        <th nzWidth="14%">护理信息</th>
+        <th nzWidth="14%">出行方式</th>
+        <th nzWidth="16%">检查项目</th>
+        <th nzWidth="14%">签到信息</th>
+        <th nzWidth="14%">状态</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td>{{data.deptName}}<br>{{data.deptDTO?.pcode}}</td>
+        <td>{{data.patientName}}<ng-container *ngIf="data.age !== undefined">({{data.age}}岁)</ng-container><br><ng-container *ngIf="data.patientType && data.patientType.value == 'I'">住：{{data.patientCode}}（{{data.bedNum}}）</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'O'">门诊：{{data.patientCode}}</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'E'">急：{{data.patientCode}}</ng-container></td>
+        <td>{{data.careLevel?.name}}<br>{{data.illnessState?.name}}</td>
+        <td>{{data.tripTypeDTO?.inspectMode}}</td>
+        <td><ng-container *ngFor="let item of data.inspectList;let last = last">{{item.inspectName}}<ng-container *ngIf="!last"><br></ng-container></ng-container></td>
+        <td>{{ data.signTime | date: "yyyy-MM-dd HH:mm" }}<br>{{ data.signDeptDTO?.dept }}<br>{{ data.signUserDTO?.name }}</td>
+        <td>{{data.state?.name}}</td>
+      </tr>
+    </tbody>
+  </nz-table>
+</div>
+<div class="footer display_flex align-items_center justify-content_flex-end">
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)"></nz-pagination>
+</div>

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.less

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

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.ts

@@ -0,0 +1,248 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { startOfDay, endOfDay, format } from 'date-fns';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Location } from '@angular/common';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: 'app-inspect-closed-loop-view',
+  templateUrl: './inspect-closed-loop-view.component.html',
+  styleUrls: ['./inspect-closed-loop-view.component.less']
+})
+export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private _location: Location,
+    private route: ActivatedRoute,
+  ) { }
+
+  hosId:any = this.tool.getCurrentHospital().id; //当前院区
+  deptDTO:any = this.tool.getCurrentUserDept(); //当前科室
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  searchDto: any = {};
+  autoRefresh:boolean = false;
+  autoRefreshSecond: number = 15;
+
+  dateRange: any = []; //预约时间
+
+  formatterPercent = (value: number) => `${value} 秒`;
+  parserPercent = (value: string) => value.replace(' 秒', '');
+
+
+  searchTimerSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+
+    this.init();
+  }
+
+  ngOnDestroy() {
+    clearInterval(this.timer);
+  }
+
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
+
+  // 修改自动刷新时间
+  timer;
+  time: number = 15;
+  changeAutoRefresh(flag){
+    if(flag){
+      this.time = this.autoRefreshSecond;
+      console.log('this.time:', this.time)
+      clearInterval(this.timer);
+      this.timer = setInterval(() => {
+        this.time--;
+        console.log('this.time:', this.time)
+        if(this.time === 0){
+          this.time = this.autoRefreshSecond;
+          this.search();
+        }
+      }, 1000);
+    }else{
+      clearInterval(this.timer);
+    }
+  }
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+
+  // 重置
+  reset() {
+    if(this.disableDept){
+      this.searchDto = { deptId: this.searchDto.deptId };
+    }else{
+      this.searchDto = {};
+    }
+    this.dateRange = [];
+    this.getList(1);
+  }
+
+  disableDept:boolean = false;
+  init(){
+    const queryParams = this.route.snapshot.queryParams.queryParams ? JSON.parse(this.route.snapshot.queryParams.queryParams) : undefined;
+    if(queryParams){
+      if(queryParams.department){
+        this.searchDto.deptId = queryParams.department.id;
+        this.departmentList = [queryParams.department];
+        this.disableDept = true;
+      }
+
+      if(queryParams.stateValue){
+        this.searchDto.stateValue = queryParams.stateValue.split(',');
+      }
+    }
+    this.getStatusList();
+    this.search();
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 搜索
+  changeInp(type, e) {
+    if(type === 'patient'){
+      this.searchTimer(this.getPatientList, e);
+    }else if(type === 'department'){
+      this.searchTimer(this.getDepartmentList, e);
+    }
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+
+  openChangePatient(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getPatientList();
+  }
+
+  // 获取患者
+  patientList: any = [];
+  getPatientList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      patient: {
+        hosId: this.hosId,
+        keyWord: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "patient", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.patientList = data.list || [];
+      });
+  }
+
+  openChangeDepartment(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDepartmentList();
+  }
+
+  // 获取科室
+  departmentList: any = [];
+  getDepartmentList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        hospital: { id: this.hosId },
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.departmentList = data.list || [];
+      });
+  }
+
+  // 获取状态
+  statusList: any = [];
+  getStatusList() {
+    this.mainService.getDictionary('list', 'patient_inspect_state').subscribe((data) => {
+      this.statusList = data || [];
+    });
+  }
+
+  loading1:boolean = false;
+
+  // 表格数据
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      patientInspectLog: {
+        startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        hosId: this.hosId,
+        deptId: this.searchDto.deptId || undefined,
+        patientId: this.searchDto.patientId || undefined,
+        state: this.searchDto.stateValue ? { value: this.searchDto.stateValue.toString() } : undefined,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "patientInspectLog", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          let list = data.list || [];
+          list.forEach(v => {
+            v.inspectNames = v.inspectList ? v.inspectList.map(v => v.inspectName).join('，') : '';
+          })
+          this.listOfData = list;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 返回
+  goBack(){
+    this._location.back();
+  }
+
+}

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { InspectClosedLoopViewRoutingModule } from './inspect-closed-loop-view-routing.module';
+import { InspectClosedLoopViewComponent } from './inspect-closed-loop-view.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [InspectClosedLoopViewComponent],
+  imports: [
+    CommonModule,
+    InspectClosedLoopViewRoutingModule,
+    ShareModule,
+  ]
+})
+export class InspectClosedLoopViewModule { }

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

@@ -622,6 +622,11 @@ const routes: Routes = [
 			{
 			  path: "shareSpecimen",
 			  loadChildren: () => import("../share-specimen/share-specimen.module").then((m) => m.ShareSpecimenModule),
+			},
+			// 患者陪检闭环
+			{
+			  path: "patientInspectLog",
+			  loadChildren: () => import("../patient-inspect-log/patient-inspect-log.module").then((m) => m.PatientInspectLogModule),
 			}
     ],
   },

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

@@ -51,6 +51,7 @@
 							<div class="dropdownItem" *ngIf="communicationBook" (click)="toCommunicationBook()">病理交接本</div>
 							<div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
 							<div class="dropdownItem" *ngIf="realtimeBroadcastRole" (click)="toRealtimeBroadcast()">故障实时播报</div>
+							<div class="dropdownItem" *ngIf="inspectClosedLoopViewRole" (click)="toInspectClosedLoopView()">陪检闭环视图</div>
             </div>
           </div>
         </div>

src/app/views/main/main.component.ts

@@ -34,7 +34,8 @@ export class MainComponent implements OnInit {
 	sampling: boolean = false; //门诊病理采样端权限
 	communicationBook: boolean = false; //病理交接本权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
-  realtimeBroadcastRole: boolean = false; //全局业务查看权限
+  realtimeBroadcastRole: boolean = false; //故障实时播报
+  inspectClosedLoopViewRole: boolean = false; //陪检闭环视图
   incidentConfigRole: boolean = false; //事件配置权限
   otherConfigRole: boolean = false; //三方配置权限
   pageConfigRole: boolean = false; //业务页面控制权限
@@ -322,6 +323,10 @@ export class MainComponent implements OnInit {
         this.realtimeBroadcastRole = true;
         console.log("故障实时播报权限");
       }
+      if (e.link == "inspectClosedLoopView") {
+        this.inspectClosedLoopViewRole = true;
+        console.log("陪检闭环视图权限");
+      }
       if (e.link == "incidentConfig") {
         this.incidentConfigRole = true;
         console.log("事件配置权限");
@@ -477,6 +482,10 @@ export class MainComponent implements OnInit {
   toRealtimeBroadcast(): void {
     this.router.navigateByUrl("realtimeBroadcast");
   }
+  // 陪检闭环视图
+  toInspectClosedLoopView(): void {
+    this.router.navigateByUrl("inspectClosedLoopView");
+  }
   // 配置中心
   toConfigurationCenter(): void {
     this.iShowMenuModal = true;

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail-routing.module.ts

@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { OrderDetailComponent } from 'src/app/share/order-detail/order-detail.component';
+import { PatientInspectLogDetailComponent } from './patient-inspect-log-detail.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: PatientInspectLogDetailComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'orderDetail/:id',
+        component: OrderDetailComponent,
+      }
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PatientInspectLogDetailRoutingModule { }

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.html

@@ -0,0 +1,173 @@
+<div class="detail" *ngIf="!maskFlag">
+  <div class="title">
+    查看<i class="icon_transport transport-guanbi" (click)="close()"></i>
+  </div>
+  <div class="box">
+    <div class="tab display_flex">
+      <div [ngClass]="{ item: true, flex_1: true, checked: tabType == 1 }" (click)="checkTab(1)">基本信息</div>
+      <div [ngClass]="{ item: true, flex_1: true, checked: tabType == 2 }" (click)="checkTab(2)">日志</div>
+      <div [ngClass]="{ item: true, flex_1: true, checked: tabType == 3 }" (click)="checkTab(3)">检查项目</div>
+      <div [ngClass]="{ item: true, flex_1: true, checked: tabType == 4 }" (click)="checkTab(4)">陪检工单</div>
+    </div>
+
+    <!-- 基本信息 -->
+    <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1" *ngIf="tabType == 1">
+      <div class="content orders">
+        <div class="top">
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">科室名称：{{ orderInfo.deptName }}</div>
+            <div nz-col nzSpan="6">患者信息：{{ orderInfo.patientName }}</div>
+            <div nz-col nzSpan="6">床号：{{ orderInfo.bedNum }}</div>
+            <div nz-col nzSpan="6">年龄：<ng-container *ngIf="orderInfo.age !== undefined">{{ orderInfo.age }}岁</ng-container></div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">护理级别：{{ orderInfo.careLevel?.name }}</div>
+            <div nz-col nzSpan="6">危重等级：{{ orderInfo.illnessState?.name }}</div>
+            <div nz-col nzSpan="6">出科时间：{{ orderInfo.outDeptTime | date:'yyyy-MM-dd HH:mm' }}</div>
+            <div nz-col nzSpan="6">出科陪检人：{{ orderInfo.outDeptUserDTO?.name }}</div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">回科时间：{{ orderInfo.backDeptTime | date:'yyyy-MM-dd HH:mm' }}</div>
+            <div nz-col nzSpan="6">回科陪检人：{{ orderInfo.backDeptUserDTO?.name }}</div>
+            <div nz-col nzSpan="6">签到科室：{{ orderInfo.signDeptDTO?.dept }}</div>
+            <div nz-col nzSpan="6"></div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">签到时间：{{ orderInfo.signTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">签到人：{{ orderInfo.signUserDTO?.name }}</div>
+            <div nz-col nzSpan="6">关联工单数：{{ orderInfo.state && (orderInfo.state.value == 1 || orderInfo.state.value == 2) ? orderInfo.planOrderCount : orderInfo.orderCount }}</div>
+            <div nz-col nzSpan="6"></div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">关联检查项目：{{ orderInfo.state && (orderInfo.state.value == 1 || orderInfo.state.value == 2) ? orderInfo.planInspectCount : orderInfo. inspectCount }}</div>
+            <div nz-col nzSpan="6">状态：{{ orderInfo.state?.name }}</div>
+            <div nz-col nzSpan="6">携带设备：{{ orderInfo.goodsNames }}</div>
+            <div nz-col nzSpan="6">出行方式：{{ orderInfo.tripTypeDTO?.inspectMode }}</div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">预约时间：{{ orderInfo.yyTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6"><ng-container *ngIf="orderInfo.patientType && orderInfo.patientType.value == 'I'">住院号：{{orderInfo.patientCode}}（{{orderInfo.bedNum}}）</ng-container><ng-container *ngIf="orderInfo.patientType && orderInfo.patientType.value == 'O'">门诊号：{{orderInfo.patientCode}}</ng-container><ng-container *ngIf="orderInfo.patientType && orderInfo.patientType.value == 'E'">急诊号：{{orderInfo.patientCode}}</ng-container></div>
+            <div nz-col nzSpan="6"></div>
+            <div nz-col nzSpan="6"></div>
+          </div>
+        </div>
+      </div>
+    </overlay-scrollbars>
+    <!-- 日志 -->
+    <overlay-scrollbars #osComponentRef2 style="height: 90%;flex:1;" *ngIf="tabType == 2">
+      <div class="content jifen">
+        <div class="table">
+          <nz-table class="integralTable" [nzData]="logList" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="15%">动作</th>
+                <th nzWidth="15%">操作时间</th>
+                <th nzWidth="10%">操作人</th>
+                <th nzWidth="10%">原负责人</th>
+                <th nzWidth="10%">接收负责人</th>
+                <th nzWidth="40%">备注</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of logList; let i = index">
+                <td>{{ item.operationType?.name }}</td>
+                <td>{{ item.operationTime | date: 'yyyy-MM-dd HH:mm' }}</td>
+                <td>{{ item.username }}</td>
+                <td></td>
+                <td></td>
+                <td>{{ item.remark }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </overlay-scrollbars>
+    <!-- 检查项目 -->
+    <overlay-scrollbars #osComponentRef3 style="height: 90%;flex:1;" *ngIf="tabType == 3">
+      <div class="content jifen">
+        <div class="table">
+          <nz-table class="integralTable" [nzData]="inspectList" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="20%">检查单号</th>
+                <th nzWidth="20%">检查项目</th>
+                <th nzWidth="20%">检查地点</th>
+                <th nzWidth="20%">预约时间</th>
+                <th nzWidth="20%">状态</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of inspectList; let i = index">
+                <td>{{ item.inspectCode }}</td>
+                <td>{{ item.inspectName }}</td>
+                <td>{{ item.execDept?.dept }}</td>
+                <td>{{ item.yyTime | date:"yyyy-MM-dd HH:mm" }}</td>
+                <td>{{ item.inspectState?.name }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </overlay-scrollbars>
+    <!-- 陪检工单 -->
+    <overlay-scrollbars #osComponentRef4 style="height: 90%;flex:1;" *ngIf="tabType == 4">
+      <div class="content jifen">
+        <div class="table">
+          <nz-table class="integralTable" [nzData]="orderList" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="17%">终点科室</th>
+                <th nzWidth="17%">任务类型</th>
+                <th nzWidth="17%">发起时间</th>
+                <th nzWidth="17%">执行人</th>
+                <th nzWidth="17%">状态</th>
+                <th nzWidth="15%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of orderList; let i = index">
+                <td>{{ item.endDeptsName }}</td>
+                <td>{{ item.taskType.taskName }}</td>
+                <td>{{ item.startTime | date:'yyyy-MM-dd HH:mm' }}</td>
+                <td>{{ item.worker?.name }}</td>
+                <td>{{ item.gdState.name }}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="detail($event, item.id)">查看</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </overlay-scrollbars>
+  </div>
+  <div class="btns">
+    <button class="btn cancel" nz-button nzType="default" (click)="close()">
+      关闭
+    </button>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<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>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.less

@@ -0,0 +1,576 @@
+@import "../../../../src/theme.less";
+
+img{
+	cursor: pointer;
+}
+
+.img-box{
+	display: flex;
+	img{
+		margin: 0 2px;
+	}
+}
+
+:host {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.coop {
+  button{
+    color: #333;
+  }
+  span,button {
+    display: inline-block;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+
+    &::after {
+      content: "|";
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+
+    &:hover,
+    &:active {
+      color: @primary-color;
+    }
+
+    &:nth-last-child(1) {
+      &::after {
+        content: "";
+      }
+    }
+  }
+}
+
+.detail {
+  display: flex;
+  flex-direction: column;
+  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;
+    }
+  }
+
+  & > .box {
+    width: 1160px;
+    border: 1px solid #e5e9ed;
+    border-radius: 5px;
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    .tab {
+      width: 100%;
+      height: 60px;
+      border-bottom: 1px solid #e5e9ed;
+      cursor: pointer;
+
+      .item {
+        text-align: center;
+        line-height: 60px;
+        height: 100%;
+        // border-right: 1px solid #e5e9ed;
+
+        &:nth-last-child(1) {
+          border: none;
+        }
+
+        &.checked {
+          background: #F0F6ED;
+        }
+      }
+    }
+
+    .content {
+      width: 100%;
+      // min-height: 453px;
+      display: flex;
+      flex-direction: column;
+
+      &.orders {
+        background: #f9fafb;
+      }
+
+      & > .top {
+        padding: 16px 24px;
+        overflow: hidden;
+        background: #fff;
+
+        .num {
+          font-size: 16px;
+          overflow: hidden;
+          margin-bottom: 6px;
+
+          .left {
+            float: left;
+            font-weight: 600;
+          }
+
+          .right {
+            float: right;
+          }
+        }
+
+        .info {
+          color: #666;
+
+          & > div {
+            margin: 8px 0;
+          }
+
+          .jiaji {
+            margin: 0;
+            margin-top: 8px;
+          }
+        }
+      }
+
+      & > .center {
+        padding: 27px 0 17px 0;
+        border-bottom: 1px solid #e5e9ed;
+        font-size: 12px;
+        background: #fff;
+
+        .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 {
+        flex: 1;
+        padding: 25px 32px;
+        background: #f9fafb;
+
+        .amplification {
+          display: flex;
+          justify-content: flex-end;
+          margin-bottom: 8px;
+        }
+
+        .urgent {
+          input {
+            width: 600px;
+          }
+
+          .candelBtn {
+            margin-left: 20px;
+          }
+        }
+
+        .table {
+          width: 100%;
+          height: 100%;
+          background: #fff;
+          border-radius: 5px;
+
+          .thead {
+            background-image: repeating-linear-gradient(
+              to right,
+              @bg-start,
+              @bg-end 100%
+            ) !important;
+
+            th {
+              color: #fff !important;
+              text-align: center;
+              font-size: 12px;
+              border: none;
+            }
+          }
+
+          .detailDrugTable {
+            .thead {
+              background-image: repeating-linear-gradient(
+                to right,
+                @bg-start,
+                @bg-end 50%
+              ) !important;
+            }
+          }
+
+          .ant-table-tbody {
+            tr {
+              text-align: center;
+              font-size: 12px;
+              border: none;
+
+              td {
+                border: none;
+                position: relative;
+              }
+            }
+
+            tr:nth-child(2n) {
+              background: #f9fafb;
+            }
+          }
+        }
+
+        .info {
+          width: 100%;
+          height: 100%;
+          background: #fff;
+          border-radius: 5px;
+          border: 1px solid #e5e9ed;
+          padding: 24px 28px 14px 28px;
+          margin-bottom: 8px;
+
+          .top {
+            .left {
+              border-right: 1px dashed #e5e9ed;
+
+              p {
+                padding: 0 70px 0 102px;
+                overflow: hidden;
+
+                & > span:nth-child(1) {
+                  float: left;
+                }
+
+                & > span:nth-child(2) {
+                  float: right;
+                  color: #666;
+                  text-align: right;
+                  max-width: 175px;
+                }
+              }
+            }
+
+            .right {
+              p {
+                padding: 0 102px 0 70px;
+                overflow: hidden;
+
+                span:nth-child(1) {
+                  float: left;
+                }
+
+                span:nth-child(2) {
+                  float: right;
+                  color: #666;
+                  text-align: right;
+                }
+              }
+            }
+          }
+
+          .wait {
+            text-align: center;
+            margin-top: 7px;
+
+            i {
+              font-size: 24px;
+              color: #62c26d;
+            }
+
+            span {
+              color: #62c26d;
+            }
+          }
+        }
+      }
+
+      &.pingjia {
+        .msg {
+          width: 100%;
+          height: 50px;
+          line-height: 50px;
+          padding-left: 32px;
+          border-bottom: 1px solid #e5e9ed;
+
+          div {
+            display: inline-block;
+            margin-right: 100px;
+          }
+        }
+
+        .con {
+          padding: 16px 32px;
+          min-height: 360px;
+        }
+      }
+
+      & > .form {
+        .ant-form-item {
+          padding: 0 32px 13px 32px;
+          margin-bottom: 0;
+          border-bottom: 1px solid #e5e9ed;
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+
+        .ant-form-item-label {
+          line-height: 34px;
+          text-align: left;
+        }
+      }
+
+      & > .mediation {
+        padding: 16px 32px;
+
+        .item {
+          border-bottom: 1px solid #e5e9ed;
+          padding-top: 10px;
+
+          .label {
+            line-height: 28px;
+            margin-top: 10px;
+          }
+
+          .info {
+            line-height: 28px;
+            color: #999;
+            padding-bottom: 20px;
+          }
+        }
+      }
+
+      &.jifen {
+        padding: 32px;
+
+        & > .table {
+          width: 100%;
+          height: 100%;
+          padding: 6px;
+          background: #fff;
+          border: 1px solid #e5e9ed;
+          border-radius: 5px;
+          overflow: hidden;
+
+          .thead {
+            background-image: repeating-linear-gradient(
+              to right,
+              @bg-start,
+              @bg-end 100%
+            ) !important;
+
+            th {
+              color: #fff !important;
+              text-align: center;
+              font-size: 12px;
+              border: none;
+              background: transparent;
+            }
+          }
+
+          .ant-table-tbody {
+            tr {
+              text-align: center;
+              font-size: 12px;
+              border: none;
+
+              td {
+                border: none;
+              }
+            }
+
+            tr:nth-child(2n) {
+              background: #f9fafb;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btns {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 20px;
+
+    .btn {
+      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;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+}
+
+.txtC {
+  text-align: center;
+}
+.ji {
+  position: absolute;
+  right: 0px;
+  top: -3px;
+  width: 30px;
+}

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.ts

@@ -0,0 +1,178 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { NzMessageService } from "ng-zorro-antd";
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToolService } from 'src/app/services/tool.service';
+@Component({
+  selector: "app-patient-inspect-log-detail",
+  templateUrl: "./patient-inspect-log-detail.component.html",
+  styleUrls: ["./patient-inspect-log-detail.component.less"],
+})
+export class PatientInspectLogDetailComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+  ) {}
+  maskFlag: any = false;
+  id: number; //工单id
+  orderInfo: any = {}; //详情信息
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  loading1:boolean = false;
+
+  ngOnInit() {
+    this.id = +this.route.snapshot.paramMap.get("id");
+    this.checkTab(1);
+  }
+
+  // 获取详情
+  getInfo(isInit = false) {
+    if(isInit){
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+    }
+    this.mainService
+      .getFetchData("simple/data", "patientInspectLog", this.id)
+      .subscribe((data) => {
+        if(isInit){
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+        }
+        let orderInfo = data.data || {};
+        if(orderInfo.goodsList){
+          orderInfo.goodsNames = orderInfo.goodsList.map(v => v.name).toString();
+        }
+        this.orderInfo = orderInfo;
+      });
+  }
+
+  // 获取日志
+  logList: any = [];
+  getWorkOrderRecord() {
+    this.loading1 = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      patientInspectLogLog: {
+        pilId: this.id,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "patientInspectLogLog", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.logList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+  // 获取检查项目
+  inspectList: any = [];
+  getInspectList() {
+    this.loading1 = true;
+    let postData = {
+      pilId: this.id,
+    };
+    this.mainService
+      .getPatientInspectList(postData)
+      .subscribe((data:any) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.inspectList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 获取工单
+  orderList: any = [];
+  getOrderList() {
+    this.loading1 = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      workOrder: {
+        pilId: this.id,
+        simpleQuery: true,
+      },
+    };
+    this.mainService
+      .getFetchDataList("data", "workOrder", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.orderList = data.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+  // 切换tab栏
+  tabType: number = 1; //tab栏
+  checkTab(type, isInit = false) {
+    this.tabType = type;
+    if(type == 1){
+      this.getInfo(isInit);
+    }else if(type == 2){
+      this.getWorkOrderRecord();
+    }else if(type == 3){
+      this.getInspectList();
+    }else if(type == 4){
+      this.getOrderList();
+    }
+  }
+
+  // 关闭弹框
+  close() {
+    history.go(-1);
+  }
+
+  // 展示信息提示框（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);
+  }
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl(`/main/patientInspectLog/patientInspectLogDetail/${this.id}/orderDetail/${id}`);
+  }
+
+}

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PatientInspectLogDetailRoutingModule } from './patient-inspect-log-detail-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { PatientInspectLogDetailComponent } from './patient-inspect-log-detail.component';
+
+
+@NgModule({
+  declarations: [
+    PatientInspectLogDetailComponent
+  ],
+  imports: [
+    CommonModule,
+    PatientInspectLogDetailRoutingModule,
+    ShareModule,
+  ]
+})
+export class PatientInspectLogDetailModule { }

src/app/views/patient-inspect-log/patient-inspect-log-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { PatientInspectLogComponent } from './patient-inspect-log.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: PatientInspectLogComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'patientInspectLogDetail/:id',
+        loadChildren: () => import('../patient-inspect-log-detail/patient-inspect-log-detail.module').then(m => m.PatientInspectLogDetailModule),
+      }
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PatientInspectLogRoutingModule { }

src/app/views/patient-inspect-log/patient-inspect-log.component.html

@@ -0,0 +1,92 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">科室</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择科室" [(ngModel)]="searchDto.deptId" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('department', $event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+            <ng-container *ngFor="let option of deptList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">患者</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchDto.patientId" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
+            <ng-container *ngFor="let option of patientList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择状态" [(ngModel)]="searchDto.stateId">
+            <ng-container *ngFor="let option of stateList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzLg="8" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="12%">科室</th>
+            <th nzWidth="11%">患者信息</th>
+            <th nzWidth="11%">护理信息</th>
+            <th nzWidth="11%">出科信息</th>
+            <th nzWidth="11%">回科信息</th>
+            <th nzWidth="11%">备注信息</th>
+            <th nzWidth="11%">预约时间</th>
+            <th nzWidth="11%">状态</th>
+            <th nzWidth="11%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.deptName}}<br>{{data.deptDTO?.pcode}}</td>
+            <td>{{data.patientName}}<ng-container *ngIf="data.age !== undefined">({{data.age}}岁)</ng-container><br><ng-container *ngIf="data.patientType && data.patientType.value == 'I'">住：{{data.patientCode}}（{{data.bedNum}}）</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'O'">门诊：{{data.patientCode}}</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'E'">急：{{data.patientCode}}</ng-container></td>
+            <td>{{data.careLevel?.name}}<br>{{data.illnessState?.name}}</td>
+            <td>{{data.outDeptTime | date:'yyyy-MM-dd HH:mm'}}<br>{{data.outDeptUserDTO?.name}}</td>
+            <td>{{data.backDeptTime | date:'yyyy-MM-dd HH:mm'}}<br>{{data.backDeptUserDTO?.name}}</td>
+            <td>{{data.goodsNames}}<br>{{data.tripTypeDTO?.inspectMode}}</td>
+            <td>{{data.yyTime | date:'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{data.state?.name}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/patient-inspect-log/patient-inspect-log.component.less

@@ -0,0 +1,179 @@
+@import "../../../../src/theme.less";
+
+:host {
+  ::ng-deep .ant-calendar-picker {
+    width: 100% !important;
+  }
+  .list-template__top{
+    overflow: visible!important;
+    .label{
+      width: auto!important;
+    }
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/patient-inspect-log/patient-inspect-log.component.ts

@@ -0,0 +1,215 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+@Component({
+  selector: "app-patient-inspect-log",
+  templateUrl: "./patient-inspect-log.component.html",
+  styleUrls: ["./patient-inspect-log.component.less"],
+})
+export class PatientInspectLogComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  nextSchemeName = ""; //下一个开启的方案名称
+  modelName = ""; //模态框名称
+
+  searchTimerSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getStatus();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl("/main/patientInspectLog/patientInspectLogDetail/" + id);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      patientInspectLog: {
+        hosId: this.currentHospital.id,
+        deptId: this.searchDto.deptId || undefined,
+        patientId: this.searchDto.patientId || undefined,
+        state: this.searchDto.stateId ? { id: this.searchDto.stateId } : undefined,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "patientInspectLog", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          let listOfData = data.list || [];
+          listOfData.forEach((v) => {
+            if(v.goodsList){
+              v.goodsNames = v.goodsList.map(v => v.name).toString();
+            }else{
+              v.goodsNames = "";
+            }
+          })
+          this.listOfData = listOfData;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 搜索
+  changeInp(type, e) {
+    if(type === 'department'){
+      this.searchTimer(this.getDeptList, e);
+    }else if(type === 'patient'){
+      this.searchTimer(this.getPatientList, e);
+    }
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 获取科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.currentHospital.id,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  openChangePatient(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getPatientList();
+  }
+
+  // 获取患者
+  patientList: any = [];
+  getPatientList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      patient: {
+        hosId: this.currentHospital.id,
+        keyWord: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "patient", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.patientList = data.list || [];
+      });
+  }
+
+  //获取状态
+  stateList:any[] = [];
+  getStatus() {
+    this.mainService
+    .getDictionary('list', 'patient_inspect_state')
+    .subscribe((data) => {
+      this.stateList = data || [];
+    });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+}

src/app/views/patient-inspect-log/patient-inspect-log.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PatientInspectLogRoutingModule } from './patient-inspect-log-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { PatientInspectLogComponent } from './patient-inspect-log.component';
+
+
+@NgModule({
+  declarations: [
+    PatientInspectLogComponent
+  ],
+  imports: [
+    CommonModule,
+    PatientInspectLogRoutingModule,
+    ShareModule,
+  ]
+})
+export class PatientInspectLogModule { }

src/assets/iconfont/demo_index.html

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

src/assets/iconfont/iconfont.css

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

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "24101601",
+      "name": "陪护管理",
+      "font_class": "peihuguanli",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
       "icon_id": "18532319",
       "name": "数据生成规则",
       "font_class": "shujushengchengguize",

src/common.less

@@ -1,6 +1,9 @@
 .ant-table-tbody tr:nth-of-type(2n){
   background-color: #e9f7e9!important;
 }
+.display_block{
+  display: block!important;
+}
 .padding8{
   padding: 8px!important
 }