陪检

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.4.129",
+		"target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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/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,40 @@ 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,
+		});
+	}
+
 }

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: '400px' }">
+            <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: '400px' }">
+            <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,193 @@
+@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 {
+      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,196 @@
+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.every(
+      (item) => this.mapOfCheckedData1Id[item.id]
+    );
+    this.isIndeterminateData1 =
+      this.listOfDisplayData1.some((item) => this.mapOfCheckedData1Id[item.id]) &&
+      !this.isAllDisplayData1Checked;
+  }
+
+  refreshData2Status(): void {
+    this.isAllDisplayData2Checked = this.listOfDisplayData2.every(
+      (item) => this.mapOfCheckedData2Id[item.id]
+    );
+    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,25 @@
+<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 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,57 @@
+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 = new Date(this.date);
+      this.yyTime = 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 {
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间');
+      return;
+    }
+    this.submitFormDirectE.emit(format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'));
+  }
+}
+

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,580 @@
+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(){
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      patient: {
+        department: this.deptDTO,
+      }
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchDataList("simple/data", "patient", postData)
+      .subscribe((data) => {
+        let patientList = data.list || [];
+        this.patientActiveList = patientList;
+
+        if(!this.patientActiveList.length){
+          this.message.warning('没有找到患者');
+          return;
+        }
+
+        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: this.patientActiveList.map(v => v.patientCode).toString(),
+          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.showDelModal(this.patientActiveList, `您确认添加“<b class="red">${this.patientActiveList.length}</b>”位患者共“<b class="red">${this.inspectActiveList.length}</b>”项检查吗？`,'批量添加患者','add');
+          });
+      });
+  }
+
+  changePatientId(id){
+    this.setIsSelecting(true);
+    if(!id){
+      return;
+    }
+    setTimeout(() => {
+      this.patientId = null;
+    }, 0)
+    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.patientActiveList.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.tripType);
+    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(date){
+    console.log(date)
+    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,7 +353,7 @@
                       <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>

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

@@ -5204,6 +5204,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/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,73 @@
+<div class="header">
+  <div class="display_flex align-items_center">
+    <div class="dept"><i class="icon icon_transport transport-fanhui" (click)='goBack()'></i></div>
+    <div class="patient">
+      <span class="label">科室：</span>
+      <nz-select class="formItem" [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 class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择状态" [(ngModel)]="searchDto.stateId" nzAllowClear (nzOpenChange)="openChangeStatus($event)">
+        <ng-container *ngFor="let option of statusList">
+          <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 class="display_flex align-items_center">
+    <button nz-button class="btn default" (click)='reset()'>重置</button>
+    <button nz-button class="btn default ml8" (click)='addPatientList()'>搜索</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="12.5%">科室</th>
+        <th nzWidth="12.5%">患者信息</th>
+        <th nzWidth="12.5%">护理信息</th>
+        <th nzWidth="12.5%">预约时间</th>
+        <th nzWidth="12.5%">出行方式</th>
+        <th nzWidth="12.5%">检查项目</th>
+        <th nzWidth="12.5%">签到信息</th>
+        <th nzWidth="12.5%">状态</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td>{{data.inspectionDTO?.name}}<br>{{data.batchNo}}</td>
+        <td>{{data.inspectionDTO?.name}}<br>{{data.batchNo}}</td>
+        <td>{{data.inspectionNodeDTO?.name}}<br>{{data.inspectionDTO?.inspectionFormDTO?.name}}</td>
+        <td>{{data.signType?.name}}</td>
+        <td>{{data.userDTO?.name || data.groupDTO?.groupName}}</td>
+        <td>{{data.incidentDTO?.incidentsign}}<br>{{data.incidentDTO?.state?.name}}</td>
+        <td>{{data.yyTime | date:'yyyy-MM-dd HH:mm'}}</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,139 @@
+@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;
+      i{
+        font-size: 24px;
+        color: #8A8A8A;
+        cursor: pointer;
+      }
+    }
+    .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/inspect-closed-loop-view/inspect-closed-loop-view.component.ts

@@ -0,0 +1,188 @@
+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-inspect-closed-loop-view',
+  templateUrl: './inspect-closed-loop-view.component.html',
+  styleUrls: ['./inspect-closed-loop-view.component.less']
+})
+export class InspectClosedLoopViewComponent implements OnInit {
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private _location: Location,
+  ) { }
+
+  hosId:any = this.tool.getCurrentHospital().id; //当前院区
+  deptDTO:any = this.tool.getCurrentUserDept(); //当前科室
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  searchDto: any = {};
+
+
+  searchTimerSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+
+    this.init();
+  }
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(1);
+  }
+
+  init(){
+    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 || [];
+      });
+  }
+
+  openChangeStatus(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getStatusList();
+  }
+
+  // 获取状态
+  statusList: any = [];
+  getStatusList() {
+    this.mainService.getDictionary('list', 'patient_inspect_state').subscribe((data) => {
+      this.statusList = data || [];
+    });
+  }
+
+  loading1:boolean = false;
+
+  // 表格数据
+  searchDto: any = {};
+  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,
+        batchId: 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) {
+          this.listOfData = data.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.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.startTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">患者信息：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">床号：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">年龄：{{ orderInfo.startTime }}</div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">护理级别：{{ orderInfo.startTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">危重等级：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">出科时间：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">出科陪检人：{{ orderInfo.startTime }}</div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">回科时间：{{ orderInfo.startTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">回科陪检人：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">签到科室：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6"></div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">签到时间：{{ orderInfo.startTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">签到人：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">关联工单数：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6"></div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">关联检查项目：{{ orderInfo.startTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">状态：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">携带设备：{{ orderInfo.startTime }}</div>
+            <div nz-col nzSpan="6">出行方式：{{ orderInfo.startTime }}</div>
+          </div>
+
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">预约时间：{{ orderInfo.startTime | date: "yyyy-MM-dd HH:mm" }}</div>
+            <div nz-col nzSpan="6">住院号：{{ orderInfo.startTime }}</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]="workOrderRecord" nzSize="middle" [nzShowPagination]="false">
+            <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 workOrderRecord; let i = index">
+                <td>{{ item.operation ? item.operation.name : "-" }}</td>
+                <td>{{ item.operationTime || "-" }}</td>
+                <td>{{ item.username || "-" }}</td>
+                <td>{{ item.handoverUserid ? item.handoverUserid.name : "-" }}</td>
+                <td>{{ item.handoverUserid ? item.handoverUserid.name : "-" }}</td>
+                <td>{{ item.logRemarks || "-" }}</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]="workOrderRecord" nzSize="middle" [nzShowPagination]="false">
+            <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 workOrderRecord; let i = index">
+                <td>{{ item.operation ? item.operation.name : "-" }}</td>
+                <td>{{ item.operationTime || "-" }}</td>
+                <td>{{ item.username || "-" }}</td>
+                <td>{{ item.handoverUserid ? item.handoverUserid.name : "-" }}</td>
+                <td>{{ item.logRemarks || "-" }}</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]="workOrderRecord" nzSize="middle" [nzShowPagination]="false">
+            <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 workOrderRecord; let i = index">
+                <td>{{ item.operation ? item.operation.name : "-" }}</td>
+                <td>{{ item.operationTime || "-" }}</td>
+                <td>{{ item.username || "-" }}</td>
+                <td>{{ item.handoverUserid ? item.handoverUserid.name : "-" }}</td>
+                <td>{{ item.logRemarks || "-" }}</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,578 @@
+@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%;
+          min-height: 160px;
+          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%;
+          min-height: 160px;
+          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,117 @@
+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';
+@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,
+  ) {}
+  maskFlag: any = false;
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  ngOnInit() {
+    this.id = +this.route.snapshot.paramMap.get("id");
+    this.checkTab(1);
+  }
+
+  // 获取工单详情
+  getInfo() {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("simple/data", "workOrder", this.id)
+      .subscribe((data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.orderInfo = data.data;
+      });
+  }
+
+  // 获取历史记录
+  workOrderRecord: any = [];
+  getWorkOrderRecord() {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.getWorkOrderRecord({ gdid: this.id }).subscribe((res) => {
+      this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+      if (res.status == 200) {
+        this.workOrderRecord = res.data || [];
+      }
+    })
+  }
+  // 切换tab栏
+  tabType: number = 1; //tab栏
+  checkTab(type) {
+    this.tabType = type;
+    if(type == 1){
+      this.getInfo();
+    }else if(type == 2){
+      this.getWorkOrderRecord();
+    }else if(type == 3){
+      this.getWorkOrderRecord();
+    }else if(type == 4){
+      this.getWorkOrderRecord();
+    }
+  }
+
+  // 关闭弹框
+  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) {
+    id = 2803260;
+    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

@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { InspectionExecuteDetailComponent } from 'src/app/share/inspection-execute-detail/inspection-execute-detail.component';
 import { PatientInspectLogComponent } from './patient-inspect-log.component';
 
 
@@ -11,8 +10,8 @@ const routes: Routes = [
     children: [
       {
         // 查看详情
-        path: 'inspectionExecuteDetail/:id',
-        component: InspectionExecuteDetailComponent,
+        path: 'patientInspectLogDetail/:id',
+        loadChildren: () => import('../patient-inspect-log-detail/patient-inspect-log-detail.module').then(m => m.PatientInspectLogDetailModule),
       }
     ]
   }

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

@@ -62,11 +62,11 @@
             <td>{{data.inspectionDTO?.name}}<br>{{data.batchNo}}</td>
             <td>{{data.inspectionDTO?.name}}<br>{{data.batchNo}}</td>
             <td>{{data.inspectionNodeDTO?.name}}<br>{{data.inspectionDTO?.inspectionFormDTO?.name}}</td>
-            <td>{{data.overtime | date:'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.signType?.name}}</td>
             <td>{{data.userDTO?.name || data.groupDTO?.groupName}}</td>
-            <td>{{data.status?.name}}</td>
             <td>{{data.incidentDTO?.incidentsign}}<br>{{data.incidentDTO?.state?.name}}</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>
@@ -83,27 +83,10 @@
     </div>
   </div>
 </div>
-<!-- 模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo">
 </app-prompt-modal>
 
-<!-- 指派 -->
-<app-inspection-execute-assign-prompt-modal
-  [deptFlag]="inspectionExecuteAssignPromptModalShow"
-  (submitFormHand)="confirmModelInspectionExecuteAssign($event)"
-  (deptFlagHand)="closeModelInspectionExecuteAssign($event)"
-  *ngIf="inspectionExecuteAssignPromptModalShow"
-></app-inspection-execute-assign-prompt-modal>
-
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
-
 <!-- 查看详情 -->
 <router-outlet></router-outlet>
-
-<!-- 详情 -->
-<app-incident-detail [id]="coopData.incidentId" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

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

@@ -62,7 +62,7 @@ export class PatientInspectLogComponent implements OnInit {
   // 查看
   detail(e, id) {
     e.stopPropagation();
-    this.router.navigateByUrl("/main/inspectionExecute/inspectionExecuteDetail/" + id);
+    this.router.navigateByUrl("/main/patientInspectLog/patientInspectLogDetail/" + id);
   }
 
   // 搜索
@@ -163,7 +163,7 @@ export class PatientInspectLogComponent implements OnInit {
     flag && this.getPatientList();
   }
 
-  // 获取科室
+  // 获取患者
   patientList: any = [];
   getPatientList(e = undefined) {
     let postData = {

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

@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
 
 import { PatientInspectLogRoutingModule } from './patient-inspect-log-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
-import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
 import { PatientInspectLogComponent } from './patient-inspect-log.component';
 
 
@@ -15,7 +14,6 @@ import { PatientInspectLogComponent } from './patient-inspect-log.component';
     CommonModule,
     PatientInspectLogRoutingModule,
     ShareModule,
-    IncidentDetailModule,
   ]
 })
 export class PatientInspectLogModule { }

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
 }