陪检优化

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

@@ -0,0 +1,56 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <ng-container *ngFor="let item of dictionaryKeyList">
+      <div class="list" *ngIf="!loading && activeDictionaryKey.id === item.id">
+        <!-- 特性配置 -->
+        <div *ngIf="tabModalName=='characteristics'">
+          <!-- 是否开启批量患者回科 -->
+          <div class="display_flex align-items_center mb8">
+            <nz-form-label class="label">是否开启批量患者回科</nz-form-label>
+            <nz-checkbox-group [(ngModel)]="item.postData.batchPatientBackDept" (ngModelChange)="changeBatchPatientBackDept($event)"></nz-checkbox-group>
+          </div>
+          <ng-container *ngIf="item.postData.batchPatientBackDept[0].checked">
+            <!-- 批量患者回科确认方式 -->
+            <div class="display_flex align-items_center mb8">
+              <nz-form-label class="label" nzRequired>批量患者回科确认方式</nz-form-label>
+              <nz-radio-group [(ngModel)]="item.postData.batchPatientCheckType" (ngModelChange)="changeBatchPatientCheckType($event)">
+                <label nz-radio [nzValue]="0">无</label>
+                <label nz-radio [nzValue]="1">科室码</label>
+                <label nz-radio [nzValue]="2">动态码</label>
+                <label nz-radio [nzValue]="3">输入工号</label>
+              </nz-radio-group>
+            </div>
+            <!-- 是否支持动态密钥 -->
+            <div class="display_flex align-items_center mb8" *ngIf="item.postData.batchPatientCheckType == 1 || item.postData.batchPatientCheckType == 2">
+              <nz-form-label class="label">是否支持动态密钥</nz-form-label>
+              <nz-checkbox-group [(ngModel)]="item.postData.batchPatientDynamicKey"></nz-checkbox-group>
+            </div>
+          </ng-container>
+        </div>
+        <!-- 自动建单配置 -->
+        <div *ngIf="tabModalName=='automaticOrderCreation'">
+          <!-- 自动建单 -->
+        </div>
+        <div class="bottom">
+          <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+        </div>
+      </div>
+    </ng-container>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

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

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

@@ -0,0 +1,144 @@
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+import { addDays, startOfMinute, endOfMinute, set, getYear, getMonth, getDate, format } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-inspect-closed-loop",
+  templateUrl: "./configuration-inspect-closed-loop.component.html",
+  styleUrls: ["./configuration-inspect-closed-loop.component.less"],
+})
+export class ConfigurationInspectClosedLoopComponent implements OnInit {
+  @Input() activeDictionaryKey: any;
+  @Input() dictionaryKeyList: any;
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  ngOnInit() {
+    this.tabModal('characteristics');
+    this.init();
+  }
+
+ tabModalName:string = 'characteristics'; //当前选中的tab
+ loading:boolean = false; //页面加载的loading
+ hosId = this.tool.getCurrentHospital().id; //当前院区
+ tasktype:any = {};// 任务类型
+ configs:any = {};// 配置
+ // 切换tab
+ tabModal(tabModalName:string){
+   this.tabModalName = tabModalName;
+ }
+
+ // 选择是否开启批量患者回科
+ changeBatchPatientBackDept(e){
+  if(!e[0].checked){
+    this.activeDictionaryKey.postData.batchPatientCheckType = 0;
+    this.activeDictionaryKey.postData.batchPatientDynamicKey[0].checked = false;
+  }
+ }
+
+ // 选择批量患者回科确认方式
+ changeBatchPatientCheckType(e){
+  this.activeDictionaryKey.postData.batchPatientDynamicKey[0].checked = false;
+ }
+
+ // 保存
+ btnLoading: boolean = false; //提交按钮loading状态
+ submitForm() {
+   if(!this.tasktype.id){
+     this.message.create("warning", "请先配置任务类型！");
+     return;
+   }
+
+   let postData:any = {
+     ...this.configs,
+     taskType: this.tasktype.id,
+     hosId: this.hosId,
+     batchPatientBackDept: this.activeDictionaryKey.postData.batchPatientBackDept[0].checked ? 1 : 0,
+     batchPatientCheckType: this.activeDictionaryKey.postData.batchPatientCheckType || 0,
+     batchPatientDynamicKey: this.activeDictionaryKey.postData.batchPatientDynamicKey[0].checked ? 1 : 0,
+   };
+   console.log(postData);
+   this.btnLoading = true;
+   this.mainService
+     .simplePost("addData", "taskTypeConfig", postData)
+     .subscribe((result) => {
+       this.btnLoading = false;
+       if (result.status == 200) {
+         this.message.success("保存成功！");
+         this.getConfig();
+       }else{
+         this.message.success("保存失败！");
+       }
+     });
+ }
+
+ //初始化
+ init() {
+   this.loading = true;
+   this.getTaskType();
+ }
+
+ //获取任务类型
+ getTaskType() {
+   this.loading = true;
+   let postData = {
+     idx: 0,
+     sum: 1,
+     taskType: {
+       simpleQuery: true,
+       hosId: {
+         id: this.hosId
+       },
+       associationType: {
+         key: 'association_types',
+         value: 'inspect',
+       }
+     }
+   };
+   this.mainService
+     .getFetchDataList("simple/data", "taskType", postData)
+     .subscribe((result) => {
+       this.loading = false;
+       if (result.status == 200) {
+         this.tasktype = result.list[0] || {};
+         this.getConfig();
+       }
+     });
+ }
+
+ // 获取配置
+ getConfig() {
+   this.loading = true;
+   let postData = {
+     idx: 0,
+     sum: 1,
+     taskTypeConfig: {
+       taskTypeDTO: {
+         hosId: {
+           id: this.hosId
+         },
+         associationType: this.tasktype.associationType,
+       }
+     }
+   };
+   this.mainService
+     .getFetchDataList("simple/data", "taskTypeConfig", postData)
+     .subscribe((result) => {
+       this.loading = false;
+       if (result.status == 200) {
+        this.configs = result.list[0] || {};
+
+        this.activeDictionaryKey.postData.batchPatientBackDept[0].checked = this.configs.batchPatientBackDept == 1;
+        this.activeDictionaryKey.postData.batchPatientCheckType = this.configs.batchPatientCheckType || 0;
+        this.activeDictionaryKey.postData.batchPatientDynamicKey[0].checked = this.configs.batchPatientDynamicKey == 1;
+       }
+     });
+ }
+}

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

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

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

@@ -64,6 +64,12 @@
           <app-configuration-inspect-inspects></app-configuration-inspect-inspects>
         </div>
       </ng-container>
+      <!-- 陪检闭环 -->
+      <ng-container *ngIf="activeDictionaryKey.id == 4">
+        <div class="contentBody2">
+          <app-configuration-inspect-closed-loop [activeDictionaryKey]="activeDictionaryKey" [dictionaryKeyList]="dictionaryKeyList"></app-configuration-inspect-closed-loop>
+        </div>
+      </ng-container>
     </div>
   </div>
 </div>

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

@@ -61,6 +61,11 @@ export class ConfigurationInspectComponent implements OnInit {
       ib2DefaultDayEnd: [{ label:'+1天', value: 0 }],
     }},
     { id: 3, name: '检查项目', key: ""},
+    { id: 4, name: '陪检闭环', key: "", postData: {
+      batchPatientBackDept: [{ label:'是否开启批量患者回科', value: 0 }],
+      batchPatientCheckType: 0,
+      batchPatientDynamicKey: [{ label:'是否支持动态密钥', value: 0 }],
+    }},
   ]
 
   // 点击数据字典key

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

@@ -5,6 +5,7 @@ import { ConfigurationInspectComponent } from './configuration-inspect.component
 import { ShareModule } from '../../../share/share.module';
 import { ConfigurationInspectBatchModule } from './configuration-inspect-batch/configuration-inspect-batch.module';
 import { ConfigurationInspectInspectsModule } from './configuration-inspect-inspects/configuration-inspect-inspects.module';
+import { ConfigurationInspectClosedLoopModule } from './configuration-inspect-closed-loop/configuration-inspect-closed-loop.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { ConfigurationInspectInspectsModule } from './configuration-inspect-insp
     ShareModule,
     ConfigurationInspectBatchModule,
     ConfigurationInspectInspectsModule,
+    ConfigurationInspectClosedLoopModule,
   ],
   exports: [
     ConfigurationInspectComponent,

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

@@ -152,6 +152,14 @@ export class ConfigurationMessageComponent implements OnInit {
           "[$患者信息$]",
           "[$删除原因$]",
         ];
+      }else if(data.noticeCode === 'pil_sign_user2'){
+        // 陪检签到通知驻点人员
+        this.varArr = [
+          "[$患者清单$]",
+          "[$签到人$]",
+          "[$签到科室$]",
+          "[$签到时间$]",
+        ];
       }
 
       this.currentIndex = 1;

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

@@ -15,7 +15,7 @@ import { FormBuilder, Validators, FormGroup, FormControl } from "@angular/forms"
 export class DrugSearchComponent implements OnInit {
   constructor(
 	private fb: FormBuilder,
-	private mainService: MainService, 
+	private mainService: MainService,
 	private tool: ToolService,
 	private router: Router,
 	private route: ActivatedRoute
@@ -43,7 +43,7 @@ export class DrugSearchComponent implements OnInit {
 	changeUserInpSubject = new Subject();
 	coopBtns:any;
 	validateForm: FormGroup; //新增/编辑表单
-	
+
   ngOnInit() {
 		this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.changeSearchSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -132,7 +132,7 @@ export class DrugSearchComponent implements OnInit {
       this.searchTypes();
     }
   }
-	
+
 	// 获取药品类型
 	drugsList:any = [];
 	getDrugsList(){
@@ -140,7 +140,7 @@ export class DrugSearchComponent implements OnInit {
 		  this.drugsList = res;
 		});
 	}
-	
+
 	//获取用户
 	userSearch:any = [];
 	searchUser(keyword) {
@@ -164,13 +164,13 @@ export class DrugSearchComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 搜索用户
 	changeUserInp(e){
 		this.isLoading = true;
 		this.changeUserInpSubject.next(e);
 	}
-	
+
 	// 日期选择
 	startDate: string; //发起时间开始
 	endDate: string; //发起时间结束
@@ -183,7 +183,7 @@ export class DrugSearchComponent implements OnInit {
 		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
 	  this.searchCriteria.dateRange = [this.startDate,this.endDate]
 	}
-	
+
 	onCalendarChangeDate(dateArr){
 	  console.log(dateArr)
 	  if(dateArr.length == 2){
@@ -194,7 +194,7 @@ export class DrugSearchComponent implements OnInit {
 	    this.searchCriteria.dateRange = [dateStart,dateEnd];
 	  }
 	}
-	
+
   // 重置
   reset() {
     this.searchCriteria = {
@@ -271,7 +271,7 @@ export class DrugSearchComponent implements OnInit {
         }
       });
   }
-	
+
 	getDept(dept){
 		let postData = {
 		  department: {
@@ -292,7 +292,7 @@ export class DrugSearchComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 查看
 	detail(e, data) {
 		if(!data.workOrderDTO){
@@ -301,7 +301,7 @@ export class DrugSearchComponent implements OnInit {
 	  e.stopPropagation();
 	  this.router.navigateByUrl("/main/drugSearch/orderDetail/" + data.workOrderDTO.id);
 	}
-	
+
 	// 新增弹框
 	modal:boolean = false;
 	add:boolean = false;
@@ -317,13 +317,13 @@ export class DrugSearchComponent implements OnInit {
 	  this.modal = false;
 	  this.initForm();
 	}
-	
+
 	// 搜索科室
 	changeDept(dept, type){
 		this.isLoading = true;
 		this.changeInpSubject.next([dept, type]);
 	}
-	
+
 	// 初始化新增form表单
 	initForm() {
 	  this.validateForm = this.fb.group({
@@ -336,14 +336,14 @@ export class DrugSearchComponent implements OnInit {
 			drugsBagType: [null, []],
 	  });
 	}
-	
+
 	// // 选择开始时间
 	onStartChange(result: Date): void {
 		console.log('Selected Time: ', result);
 		let startTime = format(result, 'yyyy-MM-dd HH:mm:ss');
 		this.validateForm.controls.creatTime.setValue(startTime);
 	}
-		
+
 	// 表单提交
 	submitForm(): void {
 	  var that = this;
@@ -396,7 +396,7 @@ export class DrugSearchComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 编辑
 	itemData:any;
 	coopId:any;
@@ -428,23 +428,23 @@ export class DrugSearchComponent implements OnInit {
 		}
 		this.modal = true
 	}
-	
+
 	// 消息发送
 	sendModal:boolean = false;
 	sendMsg(data){
 		this.itemData = data;
 		this.sendModal = true
 	}
-	
+
 	// 取消删除弹框
 	cancelSend(){
 		this.hideSendModal();
 	}
-	
+
 	hideSendModal(){
 		this.sendModal = false
 	}
-	
+
 	// 确认发送
 	confirmSend() {
 	  let that = this;
@@ -467,7 +467,7 @@ export class DrugSearchComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
   // 表格数据
   loading1 = false;
   getList(type) {

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

@@ -185,6 +185,11 @@
           <nz-form-label class="label">是否修改危重等级</nz-form-label>
           <nz-checkbox-group [(ngModel)]="updatePatientIllness"></nz-checkbox-group>
         </div>
+        <!-- 是否开通非预约检查顺延 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否开通非预约检查顺延</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="inspectDelayOneDay"></nz-checkbox-group>
+        </div>
         <!-- 检查预约不进行工单合并 -->
         <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">检查预约不进行工单合并</nz-form-label>

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

@@ -109,6 +109,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   updatePatientIllness:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否开通非预约检查顺延
+  inspectDelayOneDay:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 检查预约不进行工单合并
   // yyInspectMergeOrder:any[] = [
   //   {label:'是否开启',value: 0}
@@ -336,6 +340,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       nurseAppendInspect: this.nurseAppendInspect[0].checked ? 1 : 0,
       signReassign: this.signReassign[0].checked ? 1 : 0,
       updatePatientIllness: this.updatePatientIllness[0].checked ? 1 : 0,
+      inspectDelayOneDay: this.inspectDelayOneDay[0].checked ? 1 : 0,
       // yyInspectMergeOrder: this.yyInspectMergeOrder[0].checked ? 1 : 0,
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
@@ -475,6 +480,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.nurseAppendInspect[0].checked = this.configs.nurseAppendInspect == 1;
           this.signReassign[0].checked = this.configs.signReassign == 1;
           this.updatePatientIllness[0].checked = this.configs.updatePatientIllness == 1;
+          this.inspectDelayOneDay[0].checked = this.configs.inspectDelayOneDay == 1;
           // this.yyInspectMergeOrder[0].checked = this.configs.yyInspectMergeOrder == 1;
           this.addService[0].checked = this.configs.addService == 1;
           this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];

src/app/views/inspect-info-config/inspect-info-config-routing.module.ts

@@ -1,12 +1,20 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { InspectInfoConfigComponent } from './inspect-info-config.component';
+import { OrderDetailComponent } from '../../share/order-detail/order-detail.component';
 
 
 const routes: Routes = [
   {
     path: "",
     component: InspectInfoConfigComponent,
+    children: [
+	    {
+	      // 查看详情
+	      path: 'orderDetail/:id',
+	      component: OrderDetailComponent,
+	    }
+	  ]
   },
 ];
 

src/app/views/inspect-info-config/inspect-info-config.component.html

@@ -16,6 +16,11 @@
         </nz-option>
       </nz-select>
     </div>
+    <div class="searchItem">
+      <div class="patient">
+        <label nz-checkbox [(ngModel)]="searchData.noneGdid">未建单检查</label>
+      </div>
+    </div>
     <div class="searchItem">
         <div class="patient">
           <label nz-checkbox [(ngModel)]="searchData.noneTripType">未标记患者</label>
@@ -32,12 +37,14 @@
     </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)='getList()'>搜索</button>
+    <div class="display_flex flex-direction_column">
+      <button nz-button class="btn default" (click)='reset()'>重置</button>
+      <button nz-button class="btn default mt8" (click)='getList()'>搜索</button>
+    </div>
     <button nz-button nzType="default" class="ml8" (click)='goBack()'>返回</button>
     <div class="info">
-      <span>患者:{{listOfData.length}}</span>
-      <span class="infoNum">检查项:{{inspectTotalCount}}</span>
+      <div>患者:{{listOfData.length}}</div>
+      <div class="infoNum">检查项:{{inspectTotalCount}}</div>
     </div>
   </div>
 </div>
@@ -99,10 +106,10 @@
                   <span class="circle red" title="无预约时间检查"></span>
                 </ng-container>
               </ng-template>
-              {{(inspect.yyTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}}
+              {{(inspect.yyTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span>
             </span>
-            <span class="icon_transport transport-weibiaoti2010104" (click)="editInspect({data: data, inspect: inspect})"></span>
-            <span class="icon_transport transport-shanchu1" (click)="showDelModal({data: data, inspect: inspect}, '您确认要删除吗？','删除','delInspect')"></span>
+            <span *ngIf="!inspect.gdId" class="icon_transport transport-weibiaoti2010104" (click)="editInspect({data: data, inspect: inspect})"></span>
+            <span *ngIf="!inspect.gdId" class="icon_transport transport-shanchu1" (click)="showDelModal({data: data, inspect: inspect}, '您确认要删除吗？','删除','delInspect')"></span>
           </div>
         </td>
         <td>
@@ -136,3 +143,6 @@
 
 <!-- 追加检查项目 -->
 <app-add-inspect-three-modal *ngIf="isShowAddInspect" [patientDTO]="patientDTO" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-three-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/inspect-info-config/inspect-info-config.component.less

@@ -21,6 +21,10 @@
       }
     }
   }
+  .inspectState{
+    text-decoration: underline;
+    cursor: pointer;
+  }
   .header{
     height: 100px;
     background-color: #fff;
@@ -62,9 +66,6 @@
     .info{
       margin-left: 24px;
       font-weight: bold;
-      .infoNum{
-        margin-left: 10px;
-      }
     }
   }
   .table{

src/app/views/inspect-info-config/inspect-info-config.component.ts

@@ -7,6 +7,7 @@ import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { Location } from '@angular/common';
 import cloneDeep from 'lodash-es/cloneDeep'
+import { Router } from "@angular/router";
 @Component({
   selector: 'app-inspect-info-config',
   templateUrl: './inspect-info-config.component.html',
@@ -19,6 +20,7 @@ export class InspectInfoConfigComponent implements OnInit {
     private tool: ToolService,
     private message: NzMessageService,
     private _location: Location,
+    private router: Router,
   ) { }
 
   searchData:any = {
@@ -313,6 +315,7 @@ export class InspectInfoConfigComponent implements OnInit {
       noneTripType: this.searchData.noneTripType || undefined,
       noneEndDept: this.searchData.noneEndDept || undefined,
       noneYY: this.searchData.noneYY || undefined,
+      noneGdid: this.searchData.noneGdid || undefined,
     };
     this.loading1 = true;
     this.mainService
@@ -465,4 +468,10 @@ export class InspectInfoConfigComponent implements OnInit {
         }
       });
   }
+
+  // 查看工单详情
+	detail(e, gdId) {
+	  e.stopPropagation();
+	  this.router.navigateByUrl("/inspectInfoConfig/orderDetail/" + gdId);
+	}
 }