解决冲突

src/app/app-routing.module.ts

@@ -202,6 +202,11 @@ const routes: Routes = [
     path: 'batchInspection',
     loadChildren: () => import('./views/batch-inspection/batch-inspection.module').then(m => m.BatchInspectionModule),
   },
+  // 陪检信息配置
+  {
+    path: 'inspectInfoConfig',
+    loadChildren: () => import('./views/inspect-info-config/inspect-info-config.module').then(m => m.InspectInfoConfigModule),
+  },
   // 陪检闭环视图
   {
     path: 'inspectClosedLoopView',

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

@@ -112,7 +112,7 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">默认检查科室</nz-form-label>
+          <nz-form-label [nzSpan]="6" nzFor="extra4">默认检查科室</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择默认检查科室!">
             <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择默认检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of deptList">

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

@@ -101,17 +101,10 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
 
     if (this.add) {
       //增加
-      let n = 0;
-      if (this.dataList.length > 0) {
-        let sortArr = this.dataList.map((item) => Number(item.value));
-        n = Math.max.apply(null, sortArr);
-      } else {
-        n = 0;
-      }
       postData = {
         // dictionary: {
           key: "inspect_check_type",
-          value: n + 1,
+          value: this.validateForm.value.extra6,
           desc: "检查项目",
           orders: this.validateForm.value.orders,
           name: this.validateForm.value.name,
@@ -131,6 +124,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
             orders: this.validateForm.value.orders,
             name: this.validateForm.value.name,
             extra6: this.validateForm.value.extra6,
+            value: this.validateForm.value.value,
             extra4: this.validateForm.value.extra4,
             extra5: this.validateForm.value.extra5,
             extra7: this.validateForm.value.extra7.toString(),
@@ -164,7 +158,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       orders: [null, [Validators.required]],
       name: [null, [Validators.required]],
       extra6: [null, [Validators.required]],
-      extra4: [null, [Validators.required]],
+      extra4: [null],
       extra5: [null, [Validators.required]],
       extra7: [[]],
     });

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

@@ -181,6 +181,12 @@
 								  <nz-form-label class="label">是否默认展开</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speDefaultExpandTube"></nz-checkbox-group>
 								</div>
+
+                <!-- 是否空单自动关单 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label">是否空单自动关单</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speAutoCloseEmptyOrder"></nz-checkbox-group>
+								</div>
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">
@@ -418,8 +424,25 @@
                   <nz-form-label class="label">条码打印尺寸</nz-form-label>
                   <nz-select class="w320px" nzPlaceHolder="请选择条码打印尺寸" [(ngModel)]="spePackageCodeSize" nzAllowClear>
                     <nz-option nzLabel="80*80" [nzValue]="1"></nz-option>
+                    <nz-option nzLabel="70*50" [nzValue]="2"></nz-option>
                   </nz-select>
                 </div>
+
+                <!-- 是否同时打印试管类型 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">是否同时打印试管类型</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="spePrintTubeType"></nz-checkbox-group>
+                </div>
+
+                <!-- 打印位置 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">打印位置</nz-form-label>
+                  <nz-radio-group [(ngModel)]="spePrintPosition">
+                    <label nz-radio [nzValue]="1">居左</label>
+                    <label nz-radio [nzValue]="2">居中</label>
+                    <label nz-radio [nzValue]="3">居右</label>
+                  </nz-radio-group>
+                </div>
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -45,7 +45,9 @@ export class ConfigurationSpecimenComponent implements OnInit {
   spePackageTubeIds:any[] = [];// 自动关联试管类型
   spePackageTubeList:any[] = [];// 自动关联试管类型列表
   spePackageInventoryTypes:any[] = [{label: '患者', value: 1}, {label: '试管', value: 2}];//清点方式
+  spePrintPosition:any = undefined;//打印位置
   spePackageCreateOrder:any = [{ label:'是否开启', value: 0 }];//生成配送工单
+  spePrintTubeType:any = [{ label:'是否开启', value: 0 }];//是否同时打印试管类型
   spePackageCodeSize:any = undefined;//条码打印尺寸
 	// 是否允许转派
 	handoverOrder:any[] = [
@@ -62,6 +64,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	  {label:'是否开启',value: 0}
 	];
 
+  // 是否空单自动关单
+	speAutoCloseEmptyOrder:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
   // 工单模式
   spePackageModelList:any[] = [
     { label: '一单一包', value: 1 },
@@ -421,6 +428,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			handoverOrder: this.handoverOrder[0].checked ? 1 : 0,
 			speExpandTube: this.speExpandTube[0].checked ? 1 : 0,
 			speDefaultExpandTube: this.speDefaultExpandTube[0].checked ? 1 : 0,
+			speAutoCloseEmptyOrder: this.speAutoCloseEmptyOrder[0].checked ? 1 : 0,
 		};
 		if(this.speCollectLimit[0].checked){
 			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
@@ -490,7 +498,9 @@ export class ConfigurationSpecimenComponent implements OnInit {
       spePackageDeptIds: this.spePackageDeptIds.length ? this.spePackageDeptIds.toString() : undefined,
       spePackageTubeIds: this.spePackageTubeIds.length ? this.spePackageTubeIds.toString() : undefined,
       spePackageInventoryTypes: this.spePackageInventoryTypes.filter(v => v.checked).map(v => v.value).toString() || undefined,
+      spePrintPosition: this.spePrintPosition,
       spePackageCreateOrder: this.spePackageCreateOrder[0].checked ? 1 : 0,
+      spePrintTubeType: this.spePrintTubeType[0].checked ? 1 : 0,
       spePackageCodeSize: this.spePackageCodeSize || undefined,
     };
     this.btnLoading = true;
@@ -642,6 +652,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.handoverOrder[0].checked = this.configs.handoverOrder == 1;
 						this.speExpandTube[0].checked = this.configs.speExpandTube == 1;
 						this.speDefaultExpandTube[0].checked = this.configs.speDefaultExpandTube == 1;
+						this.speAutoCloseEmptyOrder[0].checked = this.configs.speAutoCloseEmptyOrder == 1;
 						if(this.configs.speCollectLimit == 1){
 							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
 							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1;
@@ -683,7 +694,10 @@ export class ConfigurationSpecimenComponent implements OnInit {
             this.spePackageTubeIds = this.configs.spePackageTubeIds ? this.configs.spePackageTubeIds.split(',').map(v => +v) : [];
             this.spePackageInventoryTypes = this.spePackageInventoryTypes.map(v => ({...v, checked: (this.configs.spePackageInventoryTypes || '').split(',').includes(v.value.toString())}));
             this.spePackageCreateOrder[0].checked = this.configs.spePackageCreateOrder == 1;
+            this.spePrintTubeType[0].checked = this.configs.spePrintTubeType == 1;
             this.spePackageCodeSize = this.configs.spePackageCodeSize || undefined;
+
+            this.spePrintPosition = this.configs.spePrintPosition;
 					}
         }
       });

src/app/services/main.service.ts

@@ -1223,17 +1223,17 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
-	
+
 	// 文档管理上传
 	documentImport(folderId, personal): string {
 	  return `${host.host}/document/importFile/${folderId}/${personal}`;
 	}
-	
+
 	// 文档管理更新
 	documentUpdateFile(fileId): string {
 	  return `${host.host}/document/updateFile/${fileId}`;
 	}
-	
+
 	// 文档管理导出
 	documentExport(fileToken): any {
 	  return this.http.post(host.host + `/document/downloadFile/${fileToken}`,{}, {
@@ -1248,14 +1248,22 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
-	
+
+  // 患者-清空标记
+	clearPatientMark(data = {}){
+		return this.http.post(host.host + `/nurse/inspect/clearPatientMark`, data, {
+		  headers: this.headers,
+		});
+	}
+
+
 	// 调度台删除填写原因
 	delWorkOrderWithReason(id, data){
 		return this.http.post(host.host + `/workerOrder/delWorkOrderWithReason/${id}`, data, {
 		  headers: this.headers,
 		});
 	}
-	
+
 	// 常用耗材缓存刷新
 	resetCache(model){
 		return this.http.post(host.host + `/incident/refresh/cache/${model}`, {}, {

src/app/services/tool.service.ts

@@ -349,6 +349,11 @@ export class ToolService {
 				case "download":
 				  coopBtns.download = true; //下载
 				  break;
+        case "removeSign":
+				  coopBtns.removeSign = true; //清空标记
+				  break;
+        case "lookLog":
+				  coopBtns.lookLog = true; //查看日志
 				case "allocation":
 				  coopBtns.allocation = true; //分配任务
 				  break;

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

@@ -0,0 +1,80 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1000px;">
+    <div class="title">新增检查信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="tableWrap">
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>患者信息：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.patientId" nzShowSearch nzPlaceHolder="请选择患者信息" nzServerSearch (nzOnSearch)="searchPatient($event)" (nzOpenChange)="openPatient($event)" (ngModelChange)="changePatient($event)">
+                <ng-container *ngFor="let data of patientList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.patientName + '(' + (data.bedNum || '') + ')' + '-' + data.residenceNo" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>检查项目：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.id" nzShowSearch nzPlaceHolder="请选择检查项目" nzServerSearch (nzOnSearch)="searchInspect($event)" (nzOpenChange)="openInspect($event)" (ngModelChange)="changeInspect($event)">
+                <ng-container *ngFor="let data of inspectList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_2">
+            <div class="name"><i class="icon_transport transport-required red"></i>检查科室：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.execDeptId" nzPlaceHolder="请选择检查科室">
+                <ng-container *ngFor="let data of execDeptList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+          <div class="formItem flex_1 justify-content_flex-end">
+            检查项目标识：{{inspectData.sign}}
+          </div>
+          <div class="formItem flex_1 justify-content_flex-end">
+            检查类型：{{inspectData.type}}
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>预约时间：</div>
+            <div class="value">
+              <nz-date-picker [(ngModel)]="inspectData.date" [nzAllowClear]="false" [nzShowToday]="false"></nz-date-picker>
+              <nz-time-picker class="ml8" nzFormat="HH:mm" [(ngModel)]="inspectData.time" [nzAllowEmpty]="false"></nz-time-picker>
+              <button nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">下一日</button>
+            </div>
+          </div>
+        </div>
+      </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-info/add-inspect-info.component.less

@@ -0,0 +1,185 @@
+@import "../../../../src/theme.less";
+.transport-required{
+  font-size: 10px;
+  margin-right: 4px;
+  position: relative;
+  bottom: 2px;
+}
+.patient{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 56px;
+  font-size: 18px;
+  padding: 0 24px;
+  border-bottom: 1px solid #e5e9ed;
+}
+.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: 32px 16px;
+  .row{
+    display: flex;
+    align-items: center;
+    text-align: left;
+    margin-top: 32px;
+    &:first-of-type{
+      margin-top: 0;
+    }
+    .formItem{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-right: 24px;
+      &:last-of-type{
+        margin-right: 0;
+      }
+      .name{}
+      .value{
+        flex: 1;
+      }
+    }
+  }
+}
+.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 {
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+    }
+
+    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-info/add-inspect-info.component.ts

@@ -0,0 +1,178 @@
+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, addDays } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+@Component({
+  selector: 'app-add-inspect-info',
+  templateUrl: './add-inspect-info.component.html',
+  styleUrls: ['./add-inspect-info.component.less']
+})
+export class AddInspectInfoComponent implements OnInit {
+  // 切换科室，切换弹窗
+  listOfDisplayData2: any[] = [];
+  currentDept; //当前科室
+
+  hosId;
+  hsLoading = false;
+
+  @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,
+  ) { }
+
+  patientDTO:any = {};
+  inspectData:any = {
+    date: new Date(),
+  }; //检查项目
+  changeInspectSubject = new Subject(); //防抖
+  changePatientSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.changeInspectSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getInspectList(v[0]);
+    });
+    this.changePatientSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getPatientList(v[0]);
+    });
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDept = this.tool.getCurrentUserDept();
+  }
+
+  // 确认弹窗
+  confirmModal() {
+    if(!this.inspectData.patientId){
+      this.message.warning('请选择患者！');
+      return;
+    }
+    if(!this.inspectData.id){
+      this.message.warning('请选择检查项目！');
+      return;
+    }
+    if(!this.inspectData.execDeptId){
+      this.message.warning('请选择检查科室！');
+      return;
+    }
+    if(!this.inspectData.date){
+      this.message.warning('请选择预约时间！');
+      return;
+    }
+    if(!this.inspectData.time){
+      this.message.warning('请选择预约时间！');
+      return;
+    }
+    this.confirmModelHs.emit(JSON.stringify({ show: false, inspectData: this.inspectData, patientDTO: this.patientDTO }));//emits(向上弹射)事件
+  }
+
+  changePatient(e){
+    this.patientDTO = this.patientList.find(v => v.id == this.inspectData.patientId) || {};
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 下一日
+  nextDay() {
+    this.inspectData.date = addDays(this.inspectData.date, 1);
+  }
+
+  isLoading = false;
+  inspectList: Array<any>; //检查项目列表
+  // 获取检查项目
+  getInspectList(keyword = '') {
+    let postData = {
+      dictionary: {
+        key: "inspect_check_type",
+        name: keyword || undefined,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.inspectList = data.list || [];
+      });
+  }
+
+  // 边输边搜节流阀
+  searchInspect(e) {
+    this.isLoading = true;
+    this.changeInspectSubject.next([e]);
+  }
+
+  // 修改检查项目
+  inspectDTO:any = {};
+  execDeptList:any[] = [];
+  changeInspect(id){
+    this.inspectDTO = this.inspectList.find(v => v.id == id);
+    if(this.inspectDTO){
+      this.inspectData.id = this.inspectDTO.id;
+      this.execDeptList = this.inspectDTO.deptList || [];
+      this.inspectData.execDeptId = this.execDeptList.length === 1 ? this.execDeptList[0].id : undefined;
+      this.inspectData.sign = this.inspectDTO.extra6 || '';
+      this.inspectData.type = this.inspectDTO.extra5DTO ? this.inspectDTO.extra5DTO.name : '';
+    }else{
+      this.inspectData.id = undefined;
+      this.inspectData.execDeptId= undefined;
+      this.execDeptList = [];
+      this.inspectData.sign = '';
+      this.inspectData.type = '';
+    }
+  }
+
+  // 打开班次
+  openInspect(e){
+    if(e){
+      this.getInspectList();
+    }
+  }
+
+  // =========================患者=====================
+  patientList: Array<any>; //检查项目列表
+  // 获取检查项目
+  getPatientList(keyword = '') {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      hosId: this.hosId,
+      patientName: keyword || undefined,
+      hasBedNum: 1,//有床号
+    };
+    this.isLoading = true;
+    this.mainService
+      .listMsgByMain('listPatient',postData)
+      .subscribe((data:any) => {
+        this.isLoading = false;
+        this.patientList = data.list || [];
+      });
+  }
+
+  // 边输边搜节流阀
+  searchPatient(e) {
+    this.isLoading = true;
+    this.changePatientSubject.next([e]);
+  }
+
+  // 打开
+  openPatient(e){
+    if(e){
+      this.getPatientList();
+    }
+  }
+  // =========================患者=====================
+}
+
+
+

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

@@ -0,0 +1,71 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1000px;">
+    <div class="title">追加检查项目<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="patient">
+        <span>患者姓名：{{patientDTO.patientName}}</span>
+        <span *ngIf="patientDTO.patientType && patientDTO.patientType.value == 'I'">住院号：{{patientDTO.patientCode}}（{{patientDTO.bedNum}}）</span>
+        <span *ngIf="patientDTO.patientType && patientDTO.patientType.value == 'O'">门诊号：{{patientDTO.patientCode}}</span>
+        <span *ngIf="patientDTO.patientType && patientDTO.patientType.value == 'E'">急诊号：{{patientDTO.patientCode}}</span>
+        <span>护理级别：{{patientDTO.careLevel?.name}}</span>
+        <span>危重等级：{{patientDTO.illnessState?.name}}</span>
+      </div>
+      <div class="tableWrap">
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>检查项目：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.id" nzShowSearch nzPlaceHolder="请选择检查项目" nzServerSearch (nzOnSearch)="searchInspect($event)" (nzOpenChange)="openInspect($event)" (ngModelChange)="changeInspect($event)">
+                <ng-container *ngFor="let data of inspectList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_2">
+            <div class="name"><i class="icon_transport transport-required red"></i>检查科室：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.execDeptId" nzPlaceHolder="请选择检查科室">
+                <ng-container *ngFor="let data of execDeptList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+          <div class="formItem flex_1 justify-content_flex-end">
+            检查项目标识：{{inspectData.sign}}
+          </div>
+          <div class="formItem flex_1 justify-content_flex-end">
+            检查类型：{{inspectData.type}}
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>预约时间：</div>
+            <div class="value">
+              <nz-date-picker [(ngModel)]="inspectData.date" [nzAllowClear]="false" [nzShowToday]="false"></nz-date-picker>
+              <nz-time-picker class="ml8" nzFormat="HH:mm" [(ngModel)]="inspectData.time" [nzAllowEmpty]="false"></nz-time-picker>
+              <button nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">下一日</button>
+            </div>
+          </div>
+        </div>
+      </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-three-modal/add-inspect-three-modal.component.less

@@ -0,0 +1,185 @@
+@import "../../../../src/theme.less";
+.transport-required{
+  font-size: 10px;
+  margin-right: 4px;
+  position: relative;
+  bottom: 2px;
+}
+.patient{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 56px;
+  font-size: 18px;
+  padding: 0 24px;
+  border-bottom: 1px solid #e5e9ed;
+}
+.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: 32px 16px;
+  .row{
+    display: flex;
+    align-items: center;
+    text-align: left;
+    margin-top: 32px;
+    &:first-of-type{
+      margin-top: 0;
+    }
+    .formItem{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-right: 24px;
+      &:last-of-type{
+        margin-right: 0;
+      }
+      .name{}
+      .value{
+        flex: 1;
+      }
+    }
+  }
+}
+.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 {
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+    }
+
+    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-three-modal/add-inspect-three-modal.component.ts

@@ -0,0 +1,134 @@
+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, addDays } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+@Component({
+  selector: 'app-add-inspect-three-modal',
+  templateUrl: './add-inspect-three-modal.component.html',
+  styleUrls: ['./add-inspect-three-modal.component.less']
+})
+export class AddInspectThreeModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  listOfDisplayData2: any[] = [];
+  currentDept; //当前科室
+
+  hosId;
+  hsLoading = false;
+
+  @Input() patientDTO: 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,
+  ) { }
+
+  inspectData:any = {
+    date: new Date(),
+  }; //检查项目
+  changeInspectSubject = new Subject(); //防抖
+
+  ngOnInit() {
+    //防抖
+    this.changeInspectSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getInspectList(v[0]);
+    });
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDept = this.tool.getCurrentUserDept();
+  }
+
+  // 确认弹窗
+  confirmModal() {
+    if(!this.inspectData.id){
+      this.message.warning('请选择检查项目！');
+      return;
+    }
+    if(!this.inspectData.execDeptId){
+      this.message.warning('请选择检查科室！');
+      return;
+    }
+    if(!this.inspectData.date){
+      this.message.warning('请选择预约时间！');
+      return;
+    }
+    if(!this.inspectData.time){
+      this.message.warning('请选择预约时间！');
+      return;
+    }
+    this.confirmModelHs.emit(JSON.stringify({ show: false, inspectData: this.inspectData }));//emits(向上弹射)事件
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 下一日
+  nextDay() {
+    this.inspectData.date = addDays(this.inspectData.date, 1);
+  }
+
+  isLoading = false;
+  inspectList: Array<any>; //检查项目列表
+  // 获取检查项目
+  getInspectList(keyword = '') {
+    let postData = {
+      dictionary: {
+        key: "inspect_check_type",
+        keyword: keyword || undefined,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.inspectList = data.list || [];
+      });
+  }
+
+  // 边输边搜节流阀
+  searchInspect(e) {
+    this.isLoading = true;
+    this.changeInspectSubject.next([e]);
+  }
+
+  // 修改检查项目
+  inspectDTO:any = {};
+  execDeptList:any[] = [];
+  changeInspect(id){
+    this.inspectDTO = this.inspectList.find(v => v.id == id);
+    if(this.inspectDTO){
+      this.inspectData.id = this.inspectDTO.id;
+      this.execDeptList = this.inspectDTO.deptList || [];
+      this.inspectData.execDeptId = this.execDeptList.length === 1 ? this.execDeptList[0].id : undefined;
+      this.inspectData.sign = this.inspectDTO.extra6 || '';
+      this.inspectData.type = this.inspectDTO.extra5DTO ? this.inspectDTO.extra5DTO.name : '';
+    }else{
+      this.inspectData.id = undefined;
+      this.inspectData.execDeptId= undefined;
+      this.execDeptList = [];
+      this.inspectData.sign = '';
+      this.inspectData.type = '';
+    }
+  }
+
+  // 打开班次
+  openInspect(e){
+    if(e){
+      this.getInspectList();
+    }
+  }
+}
+
+
+

src/app/share/edit-inspect-info/edit-inspect-info.component.html

@@ -0,0 +1,44 @@
+<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="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>检查科室：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="deptId" nzPlaceHolder="请选择检查科室">
+                <ng-container *ngFor="let data of deptList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>预约时间：</div>
+            <div class="value">
+              <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>
+    <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/edit-inspect-info/edit-inspect-info.component.less

@@ -0,0 +1,160 @@
+.yyTimeError {
+  ::ng-deep .ant-time-picker-input,
+  ::ng-deep .ant-calendar-picker-input {
+    border: 1px solid red !important;
+  }
+}
+.transport-required{
+  font-size: 10px;
+  margin-right: 4px;
+  position: relative;
+  bottom: 2px;
+}
+.row{
+  display: flex;
+  align-items: center;
+  text-align: left;
+  margin-top: 32px;
+  &:first-of-type{
+    margin-top: 0;
+  }
+  .formItem{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-right: 24px;
+    &:last-of-type{
+      margin-right: 0;
+    }
+    .name{}
+    .value{
+      flex: 1;
+    }
+  }
+}
+.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 {
+        &.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: 560px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 32px 16px;
+        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/edit-inspect-info/edit-inspect-info.component.ts

@@ -0,0 +1,71 @@
+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-edit-inspect-info',
+  templateUrl: './edit-inspect-info.component.html',
+  styleUrls: ['./edit-inspect-info.component.less']
+})
+
+export class EditInspectInfoComponent implements OnInit {
+  @Input() date:any;
+  @Input() execDeptId:any;
+  @Input() execDeptList:any[] = [];
+  @Output() submitFormHand = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+  yyDate = null; //预约日期-患者其他服务
+  yyTime = null; //预约时间-患者其他服务
+  deptId = null;
+  deptList:any[] = [];
+  isLoading:boolean = false;
+  constructor(
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    if(this.date){
+      this.yyDate = new Date(this.date);
+      this.yyTime = new Date(this.date);
+    }
+
+    if(this.execDeptList){
+      this.deptList = this.execDeptList;
+    }
+
+    if(this.execDeptId){
+      let flag = this.deptList.some(v => v.id == this.execDeptId);
+      if(flag){
+        this.deptId = this.execDeptId;
+      }
+    }
+  }
+
+  // 下一日(患者其他服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 表单提交
+  submitForm(): void {
+    if(!this.deptId) {
+      this.message.warning('请选择检查科室！');
+      return;
+    }
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间！');
+      return;
+    }
+    this.submitFormHand.emit({
+      deptId: this.deptId,
+      date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),
+    });
+  }
+}
+

src/app/share/inspect-log-prompt-modal/inspect-log-prompt-modal.component.html

@@ -0,0 +1,44 @@
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
+  <div class="modalBody">
+    <div class="title">
+      日志<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false" [nzLoading]="hsLoading">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="8%">序号</th>
+            <th nzWidth="23%">动作</th>
+            <th nzWidth="23%">时间</th>
+            <th nzWidth="23%">备注</th>
+            <th nzWidth="23%">操作人</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of historySpecimenList; let i = index">
+            <td>{{ i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1 }}</td>
+            <td>{{ data.operationType?.name }}</td>
+            <td>{{ data.createTime | date: "MM-dd HH:mm:ss" }}</td>
+            <td>{{ data.logRemarks }}</td>
+            <td>{{ data.operationUserDTO?.name }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination">
+        <nz-pagination
+          [(nzPageIndex)]="historySpecimenPageIndex"
+          [(nzTotal)]="historySpecimenListLength"
+          [(nzPageSize)]="historySpecimenPageSize"
+          (nzPageIndexChange)="getHistorySpecimen()"
+          (nzPageSizeChange)="getHistorySpecimen()"
+        >
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button (click)="hideModal()">
+        关闭
+      </button>
+    </div>
+  </div>
+</div>

src/app/share/inspect-log-prompt-modal/inspect-log-prompt-modal.component.less

@@ -0,0 +1,165 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .pagination{
+    padding: 8px;
+    margin-left: auto;
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+          padding-bottom: 10px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/inspect-log-prompt-modal/inspect-log-prompt-modal.component.ts

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

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

@@ -0,0 +1,37 @@
+<div class="save add display_flex align-items_center justify-content_flex-center" (click)="clickExtra($event)">
+  <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">
+          <form class="w100" nz-form [formGroup]="validateForm">
+            <nz-form-item>
+              <nz-form-label [nzSpan]="6" nzRequired nzFor="remark">注意事项</nz-form-label>
+              <nz-form-control [nzSpan]="18" nzErrorTip="请填写注意事项!">
+                <div class="noteSign">
+                  <textarea formControlName="remark" class="noteFocus" id="noteFocus" (focus)="focusNote()" nz-input rows="5" placeholder="请填写注意事项" #remarkEle></textarea>
+                  <div class="noteList" id="noteList" *ngIf="isShowNoteList">
+                    <ng-container *ngIf="!noteLoading && noteList.length">
+                      <div class="noteItem ellipsis-oneline" *ngFor="let item of noteList" [title]="item.name" (click)="selectNote(item.name)">{{item.name}}</div>
+                    </ng-container>
+                    <div *ngIf="!noteLoading && !noteList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                      <nz-empty></nz-empty>
+                    </div>
+                    <div *ngIf="noteLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                      <nz-spin nzSimple></nz-spin>
+                    </div>
+                  </div>
+                </div>
+              </nz-form-control>
+            </nz-form-item>
+          </form>
+        </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-remark/select-remark.component.less

@@ -0,0 +1,123 @@
+.noteSign{
+  position: relative;
+  .noteList{
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    width: 100%;
+    max-height: 256px;
+    z-index: 99;
+    background: #fff;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    overflow: hidden auto;
+    .noteItem{
+      padding: 5px 12px;
+      cursor: pointer;
+      line-height: normal;
+      &:hover{
+        background-color: #e9f7e9;
+      }
+    }
+  }
+}
+.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;
+      }
+
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 24px;
+        max-height: 500px;
+        // overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+            &:last-of-type{
+              margin-bottom: 0;
+            }
+
+            .ant-form-item-label {
+              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-remark/select-remark.component.ts

@@ -0,0 +1,83 @@
+import { Component, OnInit, Output, Input, ViewChild, ElementRef } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: 'app-select-remark',
+  templateUrl: './select-remark.component.html',
+  styleUrls: ['./select-remark.component.less']
+})
+export class SelectRemarkComponent implements OnInit {
+  @ViewChild("remarkEle", { static: false }) remarkEle: ElementRef;
+  @Input() inspect:any = {};
+  @Output() submitFormHand = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+
+  validateForm: FormGroup;
+
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+  ) { }
+
+  ngOnInit() {
+    this.initForm();
+  }
+
+  initForm(){
+    this.validateForm = this.fb.group({
+      remark: [this.inspect.remark || '', [Validators.required, Validators.pattern(/\S/)]],
+    });
+  }
+
+  // 注意事项获取焦点
+  isShowNoteList:boolean = false;
+  focusNote(){
+    this.isShowNoteList = true;
+    this.getNoteList();
+  }
+
+  // 选择注意事项
+  selectNote(name){
+    this.validateForm.controls.remark.setValue(name);
+    this.isShowNoteList = false;
+    // this.remarkEle.nativeElement.focus();
+  }
+
+  // 获取注意事项列表
+  noteList:any[] = [];
+  noteLoading:boolean = false;
+  getNoteList() {
+    this.noteLoading = true;
+    this.mainService.getDictionary('list', 'inspect_notes',).subscribe(result=>{
+      this.noteLoading = false;
+      this.noteList = result || [];
+    });
+  }
+
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('#noteList')) && e.target !== document.querySelector('#noteFocus')){
+      this.isShowNoteList = false;
+    }
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+    this.submitFormHand.emit(this.validateForm.value.remark);
+  }
+}
+

src/app/share/share.module.ts

@@ -60,14 +60,19 @@ import { PathologyDetailComponent } from './pathology-detail/pathology-detail.co
 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 { EditInspectInfoComponent } from './edit-inspect-info/edit-inspect-info.component';
+import { AddInspectInfoComponent } from './add-inspect-info/add-inspect-info.component';
+import { SelectRemarkComponent } from './select-remark/select-remark.component';
 import { AddInspectModalComponent } from './add-inspect-modal/add-inspect-modal.component';
 import { SelectDateYytimeComponent } from './select-date-yytime/select-date-yytime.component';
 import { PackageSpecimenRuleComponent } from './package-specimen-rule/package-specimen-rule.component';
 import { SpecimenPackageListModalComponent } from './specimen-package-list-modal/specimen-package-list-modal.component';
 import { NgxPrintModule } from 'ngx-print';
 import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component';
+import { InspectLogPromptModalComponent } from './inspect-log-prompt-modal/inspect-log-prompt-modal.component';
 import { UploadFileComponent } from './upload-file/upload-file.component';
 import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect-two-modal.component';
+import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-inspect-three-modal.component';
 
 @NgModule({
   declarations: [
@@ -131,12 +136,17 @@ import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect
     MedicalWasteHistoryPromptModalComponent,
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
+    EditInspectInfoComponent,
+    AddInspectInfoComponent,
+    SelectRemarkComponent,
     AddInspectModalComponent,
     AddInspectTwoModalComponent,
+    AddInspectThreeModalComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
     SpecimenPackageLogPromptModalComponent,
+    InspectLogPromptModalComponent,
 		UploadFileComponent
   ],
   imports: [
@@ -210,12 +220,17 @@ import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect
     MedicalWasteHistoryPromptModalComponent,
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
+    EditInspectInfoComponent,
+    AddInspectInfoComponent,
+    SelectRemarkComponent,
     AddInspectModalComponent,
     AddInspectTwoModalComponent,
+    AddInspectThreeModalComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
     SpecimenPackageLogPromptModalComponent,
+    InspectLogPromptModalComponent,
 		UploadFileComponent
   ]
 })

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -70,23 +70,36 @@
 <!-- 打印的内容 -->
 <div id="print-section-package" hidden>
   <!-- 80mm*80mm -->
-  <ng-container *ngIf="configs.spePackageCodeSize == 1">
-    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;">
-      <div style="display: flex;">
-        <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
-        <div style="flex: 1;">
-          <div>包号：{{package.packCode}}</div>
-          <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
-          <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
-        </div>
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
+    <div style="display: flex;">
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
+      <div style="flex: 1;">
+        <div>包号：{{package.packCode}}</div>
+        <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
+        <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
       </div>
-      <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
-      <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
-      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
-      <div style="display: flex;flex-wrap: wrap;">
-        <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
+    </div>
+    <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
+    <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
+    <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
+      <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
+    </div>
+  </div>
+  <!-- 70mm*50mm -->
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
+    <div style="display: flex;">
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
+      <div style="flex: 1;">
+        <div>包号:{{package.packCode}}</div>
+        <div>{{package.packDeptDTO?.dept}}</div>
+        <div>{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
+        <div>{{package.specimenNum}};{{package.packUserDTO?.name}}</div>
       </div>
     </div>
-  </ng-container>
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
+      <div *ngFor="let item of typeSpecimentList">{{item.name}}:{{item.size}}</div>
+    </div>
+  </div>
 </div>
 <button ngxPrint printSectionId="print-section-package" #printBtnPackage hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

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

@@ -61,7 +61,7 @@ export class BatchInspectionComponent implements OnInit {
         this.message.success("修改陪检方式成功");
       } else {
         this.getList();
-        this.message.success(data.msg || "修改陪检方式失败");
+        this.message.error(data.msg || "修改陪检方式失败");
       }
     });
   }

src/app/views/batch-specimen/batch-specimen.component.html

@@ -80,23 +80,36 @@
 <!-- 打印的内容 -->
 <div id="print-section" hidden>
   <!-- 80mm*80mm -->
-  <ng-container *ngIf="configs.spePackageCodeSize == 1">
-    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;">
-      <div style="display: flex;">
-        <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
-        <div style="flex: 1;">
-          <div>包号：{{package.packCode}}</div>
-          <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
-          <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
-        </div>
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;max-height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
+    <div style="display: flex;">
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
+      <div style="flex: 1;">
+        <div>包号：{{package.packCode}}</div>
+        <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
+        <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
       </div>
-      <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
-      <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
-      <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
-      <div style="display: flex;flex-wrap: wrap;">
-        <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
+    </div>
+    <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
+    <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
+    <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
+      <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
+    </div>
+  </div>
+  <!-- 70mm*50mm -->
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;max-height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
+    <div style="display: flex;">
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 1mm;">
+      <div style="flex: 1;">
+        <div>包号:{{package.packCode}}</div>
+        <div>{{package.packDeptDTO?.dept}}</div>
+        <div>{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
+        <div>{{package.specimenNum}};{{package.packUserDTO?.name}}</div>
       </div>
     </div>
-  </ng-container>
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
+      <div *ngFor="let item of typeSpecimentList">{{item.name}}:{{item.size}}</div>
+    </div>
+  </div>
 </div>
 <button ngxPrint printSectionId="print-section" #printBtn hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

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

@@ -421,8 +421,10 @@ export class HushijiandanComponent implements OnInit {
 		  .getFetchDataList("simple/data", "taskTypeConfig", postData)
 		  .subscribe((result) => {
 		    if (result.status == 200) {
-					this.autoCreate = result.list[0].autoCreate;
-					this.pathologyFrozenSpecime = result.list[0].pathologyFrozenSpecimenNum;
+          if(Array.isArray(result.list) && result.list[0]){
+            this.autoCreate = result.list[0].autoCreate;
+					  this.pathologyFrozenSpecime = result.list[0].pathologyFrozenSpecimenNum;
+          }
 		    }
 		  });
 	}
@@ -1994,14 +1996,16 @@ export class HushijiandanComponent implements OnInit {
 				.subscribe((result) => {
 					let arr = result.start.start.list;
 					arr.forEach(i=>{
-						i.inputcode = i.inputcode.toUpperCase()
-						if(this.deptDisplay == 2){
-							i.deptalias = i.deptalias + '('+i.inputcode+')'
-						}else{
-							i.dept = i.dept + '('+i.inputcode+')'
-						}
+            if(i.inputcode){
+                i.inputcode = i.inputcode.toUpperCase()
+              if(this.deptDisplay == 2){
+                i.deptalias = i.deptalias + '('+i.inputcode+')'
+              }else{
+                i.dept = i.dept + '('+i.inputcode+')'
+              }
+            }
 					})
-					
+
 					if(key!=''){
 						if(this.deptDisplay ==2){
 							data = arr.filter(i=>i.deptalias.indexOf(key) !=-1)
@@ -2019,14 +2023,16 @@ export class HushijiandanComponent implements OnInit {
 				.subscribe((result) => {
 					let arr = result.end.end.list;
 					arr.forEach(i=>{
-						i.inputcode = i.inputcode.toUpperCase()
-						if(this.deptDisplay == 2){
-							i.deptalias = i.deptalias + '('+i.inputcode+')'
-						}else{
-							i.dept = i.dept + '('+i.inputcode+')'
-						}
+            if(i.inputcode){
+              i.inputcode = i.inputcode.toUpperCase()
+              if(this.deptDisplay == 2){
+                i.deptalias = i.deptalias + '('+i.inputcode+')'
+              }else{
+                i.dept = i.dept + '('+i.inputcode+')'
+              }
+            }
 					})
-					
+
 					if(key!=''){
 						if(this.deptDisplay ==2){
 							data = arr.filter(i=>i.deptalias.indexOf(key) !=-1)
@@ -2068,22 +2074,26 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((data) => {
         if (type == "target") {
 					data.list.forEach(i=>{
-						i.inputcode = i.inputcode.toUpperCase()
-						if(this.deptDisplay == 2){
-							i.deptalias = i.deptalias + '('+i.inputcode+')'
-						}else{
-							i.dept = i.dept + '('+i.inputcode+')'
-						}
+            if(i.inputcode){
+              i.inputcode = i.inputcode.toUpperCase()
+              if(this.deptDisplay == 2){
+                i.deptalias = i.deptalias + '('+i.inputcode+')'
+              }else{
+                i.dept = i.dept + '('+i.inputcode+')'
+              }
+            }
 					})
           msg.end.end.list = data.list;
         } else if (type == "start") {
 					data.list.forEach(i=>{
-						i.inputcode = i.inputcode.toUpperCase()
-						if(this.deptDisplay == 2){
-							i.deptalias = i.deptalias + '('+i.inputcode+')'
-						}else{
-							i.dept = i.dept + '('+i.inputcode+')'
-						}
+            if(i.inputcode){
+              i.inputcode = i.inputcode.toUpperCase()
+              if(this.deptDisplay == 2){
+                i.deptalias = i.deptalias + '('+i.inputcode+')'
+              }else{
+                i.dept = i.dept + '('+i.inputcode+')'
+              }
+            }
 					})
           msg.start.start.list = data.list;
         }
@@ -3592,20 +3602,24 @@ export class HushijiandanComponent implements OnInit {
       .postCustom("nurse", "workOrder/buildTrip", postData)
       .subscribe((result) => {
 				result.start.start.list.forEach(i=>{
-					i.inputcode = i.inputcode.toUpperCase()
-					if(this.deptDisplay ==2){
-						i.deptalias = i.deptalias + '('+i.inputcode+')'
-					}else{
-						i.dept = i.dept + '('+i.inputcode+')'
-					}
+          if(i.inputcode){
+            i.inputcode = i.inputcode.toUpperCase()
+            if(this.deptDisplay ==2){
+              i.deptalias = i.deptalias + '('+i.inputcode+')'
+            }else{
+              i.dept = i.dept + '('+i.inputcode+')'
+            }
+          }
 				})
 				result.end.end.list.forEach(i=>{
-					i.inputcode = i.inputcode.toUpperCase()
-					if(this.deptDisplay ==2){
-						i.deptalias = i.deptalias + '('+i.inputcode+')'
-					}else{
-						i.dept = i.dept + '('+i.inputcode+')'
-					}
+          if(i.inputcode){
+            i.inputcode = i.inputcode.toUpperCase()
+            if(this.deptDisplay ==2){
+              i.deptalias = i.deptalias + '('+i.inputcode+')'
+            }else{
+              i.dept = i.dept + '('+i.inputcode+')'
+            }
+          }
 				})
         this.buildMsg = result;
 				if(result.end){
@@ -5408,7 +5422,13 @@ export class HushijiandanComponent implements OnInit {
       this.isShowBuildQuickConfirm = true;
     }else if(data.bussType.value === 'inspect'){
       // 陪检
-      this.router.navigateByUrl("/batchInspection");
+      if(this.inspectAndPatientTransportConfig.batchInspectType == 1){
+        // 预约陪检
+        this.router.navigateByUrl("/batchInspection");
+      }else if(this.inspectAndPatientTransportConfig.batchInspectType == 2){
+        // 陪检信息配置
+        this.router.navigateByUrl("/inspectInfoConfig");
+      }
     }
   }
   cancelBuildQuickConfirm(e){

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

@@ -167,6 +167,24 @@
           <nz-form-label class="label">是否支持签到并转派</nz-form-label>
           <nz-checkbox-group [(ngModel)]="signReassign"></nz-checkbox-group>
         </div>
+        <!-- 批量陪检配置方式 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label" nzRequired>批量陪检配置方式</nz-form-label>
+          <nz-radio-group [(ngModel)]="radioBatchInspectTypesValue">
+            <label style="display: block;" nz-radio [nzValue]="item.value" *ngFor="let item of batchInspectTypes">{{ item.label }}</label>
+          </nz-radio-group>
+        </div>
+        <!-- 是否自动清空患者标记 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否自动清空患者标记</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="batchInspectAutoClear" (ngModelChange)="changeBatchInspectAutoClear($event)"></nz-checkbox-group>
+          <nz-time-picker *ngIf="batchInspectAutoClear[0].checked" [(ngModel)]="batchInspectAutoClearTime" nzFormat="HH:mm"></nz-time-picker>
+        </div>
+        <!-- 是否修改危重等级 -->
+        <div class="display_flex align-items_center mb8">
+          <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>

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

@@ -4,6 +4,7 @@ import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
+import { format } from 'date-fns';
 
 @Component({
   selector: "app-inspect-and-patient-transport-config",
@@ -25,6 +26,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   accurateTimeFilling:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否自动清空患者标记
+  batchInspectAutoClear:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 是否显示排队信息
   queuingInformation:any[] = [
     {label:'是否开启',value: 0}
@@ -100,11 +105,21 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   signReassign:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否修改危重等级
+  updatePatientIllness:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 检查预约不进行工单合并
   // yyInspectMergeOrder:any[] = [
   //   {label:'是否开启',value: 0}
   // ];
 
+  // 批量陪检配置方式
+  batchInspectTypes:any[] = [
+    { label: '预约陪检', value: 1, },
+    { label: '陪检信息配置', value: 2, },
+  ];
+
   changeBatchSignExecutionDept(e){
     if(!e[0].checked){
       this.batchSignExecutionParent = [
@@ -122,6 +137,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   }
 
   timeMod:any;
+  batchInspectAutoClearTime:any;
   // 交接方式
   // handoverMode:any;
   // handoverModes:any[] = [];
@@ -180,6 +196,14 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       this.timeMod = null;
     }
   }
+  // 修改是否自动清空患者标记
+  changeBatchInspectAutoClear(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.batchInspectAutoClearTime = undefined;
+    }
+  }
   // 修改是否允许追加服务
   changeAddService(e){
     console.log(e);
@@ -263,10 +287,18 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       this.msg.create("warning", "请选择精确时间模式！");
       return;
     }
+    if(this.batchInspectAutoClear[0].checked && !this.batchInspectAutoClearTime){
+      this.msg.create("warning", "请选择时分！");
+      return;
+    }
     if(this.addService[0].checked && !this.addServiceTaskIds.length){
       this.msg.create("warning", "请选择追加服务任务类型！");
       return;
     }
+    if(!this.radioBatchInspectTypesValue){
+      this.msg.create("warning", "请选择批量陪检配置方式！");
+      return;
+    }
     // if(!this.handoverMode){
     //   this.msg.create("warning", "请选择交接方式！");
     //   return;
@@ -284,6 +316,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       multiplayerMode: this.multiplayerMode[0].checked ? 1 : 0,
       integralCalculationMethod: this.multiplayerMode[0].checked ? this.integralCalculationMethod : undefined,
       accurateTimeFilling: this.accurateTimeFilling[0].checked ? 1 : 0,
+      batchInspectAutoClear: this.batchInspectAutoClear[0].checked ? 1 : 0,
       queuingInformation: this.queuingInformation[0].checked ? 1 : 0,
 
       startShowAnotherService: this.startShowAnotherService[0].checked ? 1 : 0,
@@ -302,12 +335,15 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       enableTripType: this.enableTripType[0].checked ? 1 : 0,
       nurseAppendInspect: this.nurseAppendInspect[0].checked ? 1 : 0,
       signReassign: this.signReassign[0].checked ? 1 : 0,
+      updatePatientIllness: this.updatePatientIllness[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,
+      batchInspectType: this.radioBatchInspectTypesValue || undefined,
 
 
       timeMod: this.timeMod || undefined,
+      batchInspectAutoClearTime: this.batchInspectAutoClearTime ? format(this.batchInspectAutoClearTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
       // autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
       // autoDept: this.autoDepts[0].checked ? 1 : 0,
       // handoverType: {id: this.handoverMode},
@@ -383,6 +419,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   }
   // 获取配置
   // radioCheckModesValue = '';
+  radioBatchInspectTypesValue = '';
   getConfig() {
     this.loading = true;
     let postData = {
@@ -408,6 +445,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           // this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
           // this.autoDepts[0].checked = this.configs.autoDept == 1;
 
+          this.radioBatchInspectTypesValue = this.configs.batchInspectType || undefined;
           if(this.configs.signTypeIds){
             let ids = this.configs.signTypeIds.split(',');
             this.checkInModes = this.checkInModes.map(v => ({...v, checked: ids.includes(v.value.toString())}));
@@ -415,7 +453,9 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.multiplayerMode[0].checked = this.configs.multiplayerMode == 1;
           this.integralCalculationMethod = this.configs.integralCalculationMethod;
           this.accurateTimeFilling[0].checked = this.configs.accurateTimeFilling == 1;
+          this.batchInspectAutoClear[0].checked = this.configs.batchInspectAutoClear == 1;
           this.timeMod = this.configs.timeMod || null;
+          this.batchInspectAutoClearTime = this.configs.batchInspectAutoClearTime ? new Date(this.configs.batchInspectAutoClearTime) : undefined;
           this.queuingInformation[0].checked = this.configs.queuingInformation == 1;
 
           this.startShowAnotherService[0].checked = this.configs.startShowAnotherService == 1;
@@ -434,6 +474,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.enableTripType[0].checked = this.configs.enableTripType == 1;
           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.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

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

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

@@ -0,0 +1,136 @@
+<div class="header">
+  <div class="display_flex align-items_center">
+    <div class="dept">{{deptDisplay == 2 ? deptDTO.deptalias : deptDTO.dept}}</div>
+    <div class="yyTime">
+      <span class="label">检查时间：</span>
+      <nz-date-picker [(ngModel)]="searchData.dateRange" [nzAllowClear]="false"></nz-date-picker>
+    </div>
+    <div class="searchItem">
+      <span class="label">患者：</span>
+      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchData.id" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)">
+        <ng-container *ngFor="let option of patientList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName + '(' + (option.bedNum || '') + ')' + '-' + option.residenceNo" [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="searchItem">
+        <div class="patient">
+          <label nz-checkbox [(ngModel)]="searchData.noneTripType">未标记患者</label>
+        </div>
+        <div class="patient">
+          <label nz-checkbox [(ngModel)]="searchData.noneEndDept">未标记检查科室</label>
+          <span class="circle red" title="未标记检查科室"></span>
+          <span class="circle red" style="right: -21px;" title="未标记检查科室"></span>
+        </div>
+        <div class="patient">
+          <label nz-checkbox [(ngModel)]="searchData.noneYY">无预约时间检查</label>
+          <span class="circle red" title="无预约时间检查"></span>
+        </div>
+    </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>
+    <button nz-button nzType="default" class="ml8" (click)='goBack()'>返回</button>
+    <div class="info">
+      <span>患者:{{listOfData.length}}</span>
+      <span class="infoNum">检查项:{{inspectTotalCount}}</span>
+    </div>
+  </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%">患者信息</th>
+        <th nzWidth="12%">护理信息</th>
+        <th nzWidth="12%">陪检方式</th>
+        <th nzWidth="22%">注意事项</th>
+        <th nzWidth="30%">检查项目</th>
+        <th nzWidth="12%">操作</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td>
+          <span class="patient">
+            <ng-container *ngIf="!data.tripType">
+              <span class="circle red" title="未标记患者"></span>
+            </ng-container>
+            <span>{{data.patientName}}<ng-container *ngIf="data.age !== undefined">({{data.age}}岁)</ng-container></span>
+          </span>
+          <br>
+          <ng-container *ngIf="data.patientType && data.patientType.value == 'I'">住：{{data.patientCode}}（{{data.bedNum}}）</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'O'">门诊：{{data.patientCode}}</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'E'">急：{{data.patientCode}}</ng-container>
+        </td>
+        <td>
+          <ng-container *ngIf="configs.updatePatientIllness == 1;else elseIllnessStateTpl">
+            <nz-radio-group [(ngModel)]="data.illnessStateCopy" (ngModelChange)="changeIllnessState($event, data.id)">
+              <label nz-radio class="display_block" [nzValue]="item.id" *ngFor="let item of illnessStateList">{{item.name}}</label>
+            </nz-radio-group>
+          </ng-container>
+          <ng-template #elseIllnessStateTpl>
+            {{data.careLevel?.name}}<br>{{data.illnessState?.name}}
+          </ng-template>
+        </td>
+        <td>
+          <nz-radio-group [(ngModel)]="data.tripType" (ngModelChange)="changeTripType($event, data.id)">
+            <label nz-radio class="display_block" [nzValue]="item.id" *ngFor="let item of workOrderInspectScoreList">{{item.inspectMode}}</label>
+          </nz-radio-group>
+        </td>
+        <td class="text_align_left">
+          <div class="remarkText">
+            <span class="remarkTextInner" (click)="editRemark({data: data, inspect: inspect})"><span [ngStyle]="{ color: data.remark ? '#333' : '#999'}">{{data.remark || '请点击填写注意事项！'}}</span><span style="margin-top: 2px;" class="icon_transport transport-weibiaoti2010104 remarkTextEdit"></span></span>
+          </div>
+        </td>
+        <td>
+          <div *ngFor="let inspect of data.inspects" class="display_flex align-items_center" style="padding-left: 30px;">
+            <span class="patient">
+              <ng-container *ngIf="!inspect.execDept;else elseTpl">
+                <span class="circle red" title="未标记检查科室"></span>
+                <span class="circle red" style="left: -21px;" title="未标记检查科室"></span>
+              </ng-container>
+              <ng-template #elseTpl>
+                <ng-container *ngIf="!inspect.yyTime">
+                  <span class="circle red" title="无预约时间检查"></span>
+                </ng-container>
+              </ng-template>
+              {{(inspect.yyTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}}
+            </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>
+          </div>
+        </td>
+        <td>
+          <div class="coop">
+            <span (click)="showDelModal(data, '您确认要清空标记吗？','清空标记','clearSign')">清空标记</span>
+            <span (click)="addInspect(data)">增加检查项目</span>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </nz-table>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 修改检查 -->
+<app-edit-inspect-info [execDeptList]="coopData.inspect && coopData.inspect.inspectCheckType && coopData.inspect.inspectCheckType.deptList" [execDeptId]="coopData.inspect && coopData.inspect.execDeptId" [date]="coopData.inspect && coopData.inspect.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
+
+<!-- 修改注意事项 -->
+<app-select-remark [inspect]="coopData.data" *ngIf="isShowSelectRemark" (submitFormHand)="submitSelectRemark($event)" (cancelFlagHand)="cancelSelectRemark($event)"></app-select-remark>
+
+<!-- 追加检查项目 -->
+<app-add-inspect-three-modal *ngIf="isShowAddInspect" [patientDTO]="patientDTO" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-three-modal>

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

@@ -0,0 +1,170 @@
+@import "../../../../src/theme.less";
+
+:host {
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  background-color: #F0F2F5;
+  display: flex;
+  flex-direction: column;
+  .remarkText{
+    padding-right: 24px;
+    .remarkTextInner{
+      position: relative;
+      display: inline-block;
+      cursor: pointer;
+      .remarkTextEdit{
+        position: absolute;
+        top: 50%;
+        right: -24px;
+        transform: translateY(-50%);
+      }
+    }
+  }
+  .header{
+    height: 100px;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 24px;
+    font-size: 16px;
+    .dept{
+      margin-right: 48px;
+    }
+    .searchItem{
+      margin-left: 24px;
+      .patient{
+        position: relative;
+        text-align: left;
+        .circle{
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          background-color: @primary-color;
+          position: absolute;
+          top: 51%;
+          right: -8px;
+          transform: translate(-50%,-50%);
+          &.red{
+            background-color: red;
+          }
+        }
+      }
+    }
+    .label{
+      padding-right: 16px;
+      font-size: 14px;
+    }
+    .formItem{
+      width: 173px;
+    }
+    .info{
+      margin-left: 24px;
+      font-weight: bold;
+      .infoNum{
+        margin-left: 10px;
+      }
+    }
+  }
+  .table{
+    flex: 1;
+    min-height: 0;
+    margin-top: 10px;
+    background-color: #fff;
+    overflow: auto;
+    padding: 8px 16px;
+    .patient{
+      position: relative;
+      text-align: left;
+      .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-info-config/inspect-info-config.component.ts

@@ -0,0 +1,468 @@
+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, startOfMinute } 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-info-config',
+  templateUrl: './inspect-info-config.component.html',
+  styleUrls: ['./inspect-info-config.component.less']
+})
+export class InspectInfoConfigComponent implements OnInit {
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private _location: Location,
+  ) { }
+
+  searchData:any = {
+    dateRange: new Date(), //检查时间
+  }
+  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.getTaskType();
+    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", 'patient', postData)
+    .subscribe((data) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      if (data.status == 200) {
+        this.message.success("修改陪检方式成功");
+      } else {
+        this.getList();
+        this.message.error(data.msg || "修改陪检方式失败");
+      }
+    });
+  }
+
+  // 修改危重等级
+  changeIllnessState(illnessStateId, id){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData = this.listOfData.find(v => v.id == id);
+    postData.illnessState = {
+      id: illnessStateId,
+    }
+    this.mainService
+    .simplePost("addData", 'patient', postData)
+    .subscribe((data) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      if (data.status == 200) {
+        this.message.success("修改危重等级成功");
+      } else {
+        this.getList();
+        this.message.error(data.msg || "修改危重等级失败");
+      }
+    });
+  }
+
+  init(){
+    this.getIllnessState();
+    this.getWorkOrderInspectScore();
+    this.getList();
+  }
+
+  // 防抖
+  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: 10,
+      hosId: this.hosId,
+      department: this.deptDTO.id,
+      hasBedNum: 1,//有床号
+      patientName: e,
+    };
+    this.isLoading = true;
+    this.mainService
+      .listMsgByMain('listPatient',postData)
+      .subscribe((data:any) => {
+        this.isLoading = false;
+        this.patientList = data.list || [];
+      });
+  }
+
+  maskFlag: any = false;
+
+  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 === "clearSign") {
+      //清空标记
+      this.mainService
+        .clearPatientMark({ patientId: this.coopData.id })
+        .subscribe((data:any) => {
+          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.mainService
+        .simplePost("rmvData", "inspect", [this.coopData.inspect.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);
+          }
+        });
+    }
+  }
+
+  // 修改检验项目
+  isShowSelectDate:boolean = false;
+  editInspect(data){
+    this.isShowSelectDate = true;
+    this.coopData = data;
+  }
+
+  // 修改检查项目-确定
+  submitSelectDate({date, deptId}){
+    let postData = {
+      id: this.coopData.inspect.id,
+      yyTime: date || undefined,
+      execDeptId: deptId,
+    }
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .simplePost("updData", 'inspect', postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.status == 200) {
+          this.isShowSelectDate = false;
+          this.showPromptModal('修改', true, "");
+        } else {
+          this.showPromptModal('修改', false, data.msg);
+        }
+      });
+  }
+
+  // 修改检验项目-取消
+  cancelSelectDate(e) {
+    this.isShowSelectDate = false;
+  }
+
+  // 修改注意事项
+  isShowSelectRemark:boolean = false;
+  editRemark(data){
+    this.isShowSelectRemark = true;
+    this.coopData = data;
+  }
+
+  // 修改注意事项-确定
+  submitSelectRemark(remark){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData = {
+      ...this.coopData.data,
+      remark,
+    };
+
+    this.mainService
+    .simplePost("addData", 'patient', postData)
+    .subscribe((data) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      this.getList();
+      if (data.status == 200) {
+        this.isShowSelectRemark = false;
+        this.message.success("编辑注意事项成功");
+      } else {
+        this.message.error(data.msg || "编辑注意事项失败");
+      }
+    });
+  }
+
+  // 修改注意事项-取消
+  cancelSelectRemark(e) {
+    this.isShowSelectRemark = 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 postData = {
+      idx: 0,
+      sum: 99999,
+      hosId: this.hosId,
+      department: this.deptDTO.id,
+      queryInspect: 1,//带inspects
+      hasBedNum: 1,//有床号
+      startTime: this.searchData.dateRange ? format(startOfDay(this.searchData.dateRange), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.searchData.dateRange ? format(endOfDay(this.searchData.dateRange), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      id: this.searchData.id || undefined,
+      noneTripType: this.searchData.noneTripType || undefined,
+      noneEndDept: this.searchData.noneEndDept || undefined,
+      noneYY: this.searchData.noneYY || undefined,
+    };
+    this.loading1 = true;
+    this.mainService
+      .listMsgByMain('listPatient',postData)
+      .subscribe((data:any) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          let listOfData = data.list || [];
+          listOfData.forEach(v => {
+            if(v.illnessState){
+              v.illnessStateCopy = v.illnessState.id;
+            }
+          })
+          this.listOfData = listOfData;
+          this.inspectTotalCount = this.listOfData.reduce((v, i) => v + i.inspects.length, 0);
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 重置
+  reset(){
+    this.searchData = {
+      dateRange: new Date(),
+    };
+    this.getList();
+  }
+
+  //获取陪检方式
+  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("请求数据失败");
+        }
+      });
+  }
+
+  //获取危重等级
+  illnessStateList:any[] = [];
+  getIllnessState() {
+    this.mainService.getDictionary('list', 'stateOfAnIllness').subscribe((data) => {
+      this.illnessStateList = data || [];
+    });
+  }
+
+  // 返回
+  goBack(){
+    this._location.back();
+  }
+
+  // 追加项目
+  patientDTO:any = {};
+  isShowAddInspect = false; //弹窗开关
+  addInspect(patientDTO){
+    this.patientDTO = patientDTO;
+    this.isShowAddInspect = true;
+  }
+  // 关闭弹窗
+  closeAddInspectModel(e) {
+    this.isShowAddInspect = JSON.parse(e).show;
+  }
+  // 确定弹窗
+  confirmAddInspectModel(e) {
+    console.log(e);
+    let obj = JSON.parse(e);
+    let postData:any = {
+      inspectList: [{
+        patientCode: this.patientDTO.patientCode,
+        patientName: this.patientDTO.patientName,
+        barCode: this.patientDTO.barCode,
+        inspectCheckType: { id: obj.inspectData.id },
+        applyDeptId: this.deptDTO.id,
+        execDeptId: obj.inspectData.execDeptId,
+        bedNum: this.patientDTO.bedNum,
+        hosId: this.hosId,
+        yyTime: format(new Date(obj.inspectData.date), 'yyyy-MM-dd ') + format(startOfMinute(new Date(obj.inspectData.time)), 'HH:mm:ss'),
+      }] || undefined,
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .simplePost("addData", "inspect", postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.status == 200) {
+          this.isShowAddInspect = obj.show;
+          this.showPromptModal('添加', true, "");
+        } else {
+          this.showPromptModal('添加', false, data.msg);
+        }
+      });
+  }
+
+  //获取任务类型
+  tasktype:any = {};// 任务类型
+ getTaskType() {
+   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) => {
+       if (result.status == 200) {
+         this.tasktype = result.list[0] || {};
+         this.getConfig();
+       }
+     });
+ }
+
+  // 获取配置
+  configs:any = {};
+  getConfig() {
+    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) => {
+        if (result.status == 200) {
+          this.configs = result.list[0] || {};
+        }
+      });
+  }
+}

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { InspectInfoConfigRoutingModule } from './inspect-info-config-routing.module';
+import { InspectInfoConfigComponent } from './inspect-info-config.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [InspectInfoConfigComponent],
+  imports: [
+    CommonModule,
+    InspectInfoConfigRoutingModule,
+    ShareModule,
+  ]
+})
+export class InspectInfoConfigModule { }

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

@@ -1,7 +1,11 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl='16' class="list-template__searchBox">
+      <div nz-col nzXl='18' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">入库时间</span>：
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+        </div>
         <div class="list-template__searchItem">
           <span class="label">患者姓名：</span>
           <input nz-input class="formItem" placeholder="请输入患者姓名" [(ngModel)]="searchCriteria.patientName" />
@@ -16,7 +20,7 @@
             nzPlaceHolder="请选择配送人员" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
             (nzOpenChange)="changeSearch($event)">
             <ng-container *ngFor="let data of workerSearch">
-              <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -25,22 +29,9 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">状态：</span>
-          <nz-select
-            [nzDropdownMatchSelectWidth]="false"
-            class="formItem"
-            nzServerSearch
-            nzShowSearch
-            nzAllowClear
-            nzPlaceHolder="请选择状态"
-            [(ngModel)]="searchCriteria.inspectState"
-            (nzOpenChange)="changeSearch1($event)"
-          >
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择状态" [(ngModel)]="searchCriteria.inspectState" (nzOpenChange)="changeSearch1($event)">
             <ng-container *ngFor="let data of types">
-              <nz-option
-                *ngIf="!isLoading1"
-                nzLabel="{{ data.name }}"
-                nzValue="{{ data.id }}"
-              ></nz-option>
+              <nz-option *ngIf="!isLoading1" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -48,44 +39,49 @@
           </nz-select>
         </div>
       </div>
-      <div nz-col nzXl="8" class="list-template__btns">
-        <button nz-button class="btn default" (click)='reset()'>重置</button>
-        <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
+      <div nz-col nzXl="6" class="list-template__btns">
+        <button nz-button class="btn default" (click)='getList(1)'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
       </div>
     </div>
+    <div class="list-template__checkBoxes">
+      <nz-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="log(checkOptionsOne)"></nz-checkbox-group>
+    </div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="6%">序号</th>
-            <th nzWidth="8%">患者姓名</th>
-            <th nzWidth="8%">住院号</th>
-            <th nzWidth="8%">申请科室</th>
-            <th nzWidth="8%">检查科室</th>
-            <th nzWidth="8%">检查单号</th>
-            <th nzWidth="8%">患者床号</th>
-            <th nzWidth="8%">检查项目</th>
-            <th nzWidth="11%">预约时间</th>
-            <th nzWidth="11%">到达时间</th>
+            <th nzWidth="4%">序号</th>
+            <th nzWidth="8%">患者姓名|住院号</th>
+            <th nzWidth="10%">申请科室</th>
+            <th nzWidth="10%">检查科室</th>
+            <th nzWidth="14%">检查单号|检查项目</th>
+            <th nzWidth="14%">预约时间|入库时间</th>
             <th nzWidth="8%">检查状态</th>
-            <th nzWidth="8%">配送人员</th>
+            <th nzWidth="8%">陪检人员</th>
+            <th nzWidth="14%">出行方式|注意事项</th>
+            <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.patientName||'-' }}</td>
-            <td>{{ data.residenceNo||'-' }}</td>
-            <td>{{ data.applyDept ? data.applyDept.dept : '-' }}</td>
-            <td>{{ data.execDept ? data.execDept.dept : '-' }}</td>
-            <td>{{ data.inspectCode||'-' }}</td>
-            <td>{{ data.patientBedNum||'-' }}</td>
-            <td>{{data.inspectName||'-'}}</td>
-            <td>{{ data.yyTime||'-' }}</td>
-            <td>{{data.arriveTime||'-'}}</td>
-            <td>{{ data.inspectState?data.inspectState.name:''}}</td>
-            <td>{{ data.workerName||'-' }}</td>
+            <td>{{ data.patientName }}({{ data.patientBedNum }})<br>{{ data.residenceNo }}</td>
+            <td>{{ data.applyDept?.dept }}</td>
+            <td>{{ data.execDept?.dept }}</td>
+            <td>{{ data.inspectCode }}<br>{{data.inspectName}}</td>
+            <td>{{ data.yyTime }}<br>{{ data.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+            <td>{{ data.inspectState?.name}}</td>
+            <td>{{ data.workerName }}</td>
+            <td>{{ data.patientDTO?.tripTypeDTO?.inspectMode }}<br>{{ data.patientDTO?.remark }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.lookLog" (click)="showLogs(data)">查看日志</span>
+                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
+              </div>
+            </td>
           </tr>
         </tbody>
       </nz-table>
@@ -97,3 +93,17 @@
     </div>
   </div>
 </div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 修改检查 -->
+<app-edit-inspect-info [execDeptList]="coopData.inspectCheckType && coopData.inspectCheckType.deptList" [execDeptId]="coopData.execDept && coopData.execDept.id" [date]="coopData.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
+
+<!-- 新增检查 -->
+<app-add-inspect-info *ngIf="isShowAddInspect" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-info>
+
+<!-- 查看日志 -->
+<app-inspect-log-prompt-modal *ngIf="logPromptModalShow" [show]="logPromptModalShow" [id]="inspectId" (closeModelHs)="closeModelLog($event)"></app-inspect-log-prompt-modal>

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

@@ -1,8 +1,11 @@
 import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
+import { startOfDay, endOfDay, format, startOfMinute } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
 
 @Component({
   selector: "app-inspect-search",
@@ -10,7 +13,22 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./inspect-search.component.less"],
 })
 export class InspectSearchComponent implements OnInit {
-  constructor(private mainService: MainService, private tool: ToolService) {}
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+  ) {}
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  checkOptionsOne: Array<any> = [
+    { label: "未标记检查科室", value: "0", checked: false },
+    { label: "无预约时间检查", value: "1", checked: false },
+  ];
+
+  dateRange: any = []; //入库时间区间
 
   searchCriteria = {
     //搜索条件
@@ -27,12 +45,27 @@ export class InspectSearchComponent implements OnInit {
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   changeInpSubject = new Subject();
+
   ngOnInit() {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchWorker(v);
     });
+    this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getAllHospital();
   }
+
+  // 表格筛选
+  log(value: object[]): void {
+    this.getList(1);
+  }
+
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
+
   // 搜索类型
   isLoading1 = false;
   types = []; // 类型列表(搜索框)
@@ -51,11 +84,12 @@ export class InspectSearchComponent implements OnInit {
   }
   // 重置
   reset() {
+    this.dateRange = [];
     this.searchCriteria = {
       //搜索条件
       patientName: "",
       inspectCode: "",
-      hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
+      hospital: this.allHospital[0] ? this.allHospital[0]["id"] : null,
       workerId: null,
       inspectState: null,
     };
@@ -65,7 +99,7 @@ export class InspectSearchComponent implements OnInit {
   // 获取所有院区
   getAllHospital() {
     this.allHospital = [this.tool.getCurrentHospital()];
-    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + "";
+    this.searchCriteria.hospital = this.tool.getCurrentHospital().id;
     this.getList(1);
   }
   // 查看标本历史记录
@@ -127,11 +161,16 @@ export class InspectSearchComponent implements OnInit {
     let postData = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      hosId: this.searchCriteria.hospital,
-      patientName: this.searchCriteria.patientName,
-      inspectCode: this.searchCriteria.inspectCode,
-      workerId: this.searchCriteria.workerId,
+      hosId: this.searchCriteria.hospital || undefined,
+      patientName: this.searchCriteria.patientName || undefined,
+      inspectCode: this.searchCriteria.inspectCode || undefined,
+      workerId: this.searchCriteria.workerId || undefined,
       inspectState: this.searchCriteria.inspectState || undefined,
+      createStartTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      createEndTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      noneEndDept: this.checkOptionsOne[0].checked ? true : undefined,
+      noneYytime: this.checkOptionsOne[1].checked ? true : undefined,
+      queryInspect: 1,//带检查项目
     };
     this.loading1 = true;
     this.mainService
@@ -144,4 +183,115 @@ export class InspectSearchComponent implements OnInit {
         }
       });
   }
+
+  // 查看日志弹窗
+  logPromptModalShow = false; //弹窗开关
+  inspectId = ""; //查看记录携带id
+  showLogs(data) {
+    this.inspectId = data.id;
+    this.logPromptModalShow = true;
+  }
+  // 关闭日志弹窗
+  closeModelLog(e) {
+    this.logPromptModalShow = JSON.parse(e).show;
+  }
+
+  // ============================add start==================
+  // 新增检查
+  isShowAddInspect = false; //弹窗开关
+  addModal(){
+    this.isShowAddInspect = true;
+  }
+  // 关闭弹窗
+  closeAddInspectModel(e) {
+    this.isShowAddInspect = JSON.parse(e).show;
+  }
+  // 确定弹窗
+  confirmAddInspectModel(e) {
+    console.log(e);
+    let obj = JSON.parse(e);
+    let postData:any = {
+      inspectList: [{
+        patientCode: obj.patientDTO.patientCode,
+        patientName: obj.patientDTO.patientName,
+        barCode: obj.patientDTO.barCode,
+        inspectCheckType: { id: obj.inspectData.id },
+        applyDeptId: this.tool.getCurrentUserDept().id,
+        execDeptId: obj.inspectData.execDeptId,
+        bedNum: obj.patientDTO.bedNum,
+        hosId: this.searchCriteria.hospital,
+        yyTime: format(new Date(obj.inspectData.date), 'yyyy-MM-dd ') + format(startOfMinute(new Date(obj.inspectData.time)), 'HH:mm:ss'),
+      }] || undefined,
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .simplePost("addData", "inspect", postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.status == 200) {
+          this.isShowAddInspect = obj.show;
+          this.showPromptModal('添加', true, "");
+        } else {
+          this.showPromptModal('添加', false, data.msg);
+        }
+      });
+  }
+  // ============================add end==================
+
+  coopData: any = {}; //当前操作列
+  // 修改检验项目
+  isShowSelectDate:boolean = false;
+  edit(data){
+    this.isShowSelectDate = true;
+    this.coopData = data;
+  }
+
+  // 修改检查项目-确定
+  maskFlag: any = false;
+  submitSelectDate({date, deptId}){
+    let postData = {
+      id: this.coopData.id,
+      yyTime: date || undefined,
+      execDeptId: deptId,
+    }
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .simplePost("updData", 'inspect', postData)
+      .subscribe((data:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (data.status == 200) {
+          this.isShowSelectDate = false;
+          this.showPromptModal('修改', true, "");
+        } else {
+          this.showPromptModal('修改', false, data.msg);
+        }
+      });
+  }
+
+  // 修改检验项目-取消
+  cancelSelectDate(e) {
+    this.isShowSelectDate = 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(1);
+  }
 }

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

@@ -74,37 +74,32 @@
         <thead>
           <tr class="thead">
             <th nzWidth="8%">患者类别</th>
-            <th nzWidth="8%">患者姓名</th>
-            <th nzWidth="8%">患者标识</th>
-            <th nzWidth="8%">住院号</th>
-            <th nzWidth="8%">条码号</th>
-            <th nzWidth="8%">床号</th>
-            <th nzWidth="8%">院区</th>
-            <th nzWidth="8%">当前科室</th>
-            <th nzWidth="8%">护理等级</th>
-            <th nzWidth="8%">病情级别</th>
-            <th nzWidth="8%">年龄</th>
-            <th nzWidth="8%">性别</th>
-            <th nzWidth="7%">操作</th>
+            <th nzWidth="10%">患者姓名(床号)</th>
+            <th nzWidth="10%">患者标识</th>
+            <th nzWidth="10%">住院号|条码号</th>
+            <th nzWidth="10%">院区|当前科室</th>
+            <th nzWidth="10%">护理等级</th>
+            <th nzWidth="10%">病情级别</th>
+            <th nzWidth="10%">性别、年龄</th>
+            <th nzWidth="12%">出行方式|注意事项</th>
+            <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{ data.patientType?.name }}</td>
-            <td>{{ data.patientName }}</td>
+            <td>{{ data.patientName }}({{ data.bedNum }})</td>
             <td>{{ data.patientCode }}</td>
-            <td>{{ data.residenceNo }}</td>
-            <td>{{ data.barCode }}</td>
-            <td>{{ data.bedNum }}</td>
-            <td>{{ data.hospitalDTO?.hosName }}</td>
-            <td>{{ data.department?.dept }}</td>
+            <td>{{ data.residenceNo }}<br>{{ data.barCode }}</td>
+            <td>{{ data.hospitalDTO?.hosName }}<br>{{ data.department?.dept }}</td>
             <td>{{ data.careLevel?.name }}</td>
             <td>{{ data.illnessState?.name }}</td>
-            <td>{{ data.age }}</td>
-            <td>{{ data.gender?.name }}</td>
+            <td>{{ data.gender?.name }}、{{ data.age }}</td>
+            <td>{{ data.tripTypeDTO?.inspectMode }}<br>{{ data.remark }}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
+                <span *ngIf="coopBtns.removeSign" (click)="showDelModal(data, '您确认要清空标记吗？','清空标记','clearSign')">清空标记</span>
               </div>
             </td>
           </tr>
@@ -120,7 +115,7 @@
 </div>
 
 <!-- 新增/编辑模态框 -->
-<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal" (click)="clickExtra($event)">
   <div class="modalBody">
     <div class="title">{{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
@@ -251,6 +246,39 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="tripType">出行方式</nz-form-label>
+          <nz-form-control nzErrorTip="请选择出行方式!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="tripType" nzAllowClear nzPlaceHolder="请选择出行方式" (nzOpenChange)="openTripType($event)">
+              <ng-container *ngFor="let data of tripTypeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.inspectMode" [nzValue]="data.id">
+                </nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="remark">注意事项</nz-form-label>
+          <nz-form-control nzErrorTip="请选择注意事项!">
+            <div class="noteSign">
+              <textarea formControlName="remark" class="noteFocus mt8" id="noteFocus" (focus)="focusNote()" nz-input rows="5" placeholder="请填写注意事项" #remarkEle></textarea>
+              <div class="noteList" id="noteList" *ngIf="isShowNoteList">
+                <ng-container *ngIf="!noteLoading && noteList.length">
+                  <div class="noteItem ellipsis-oneline" *ngFor="let item of noteList" [title]="item.name" (click)="selectNote(item.name)">{{item.name}}</div>
+                </ng-container>
+                <div *ngIf="!noteLoading && !noteList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                  <nz-empty></nz-empty>
+                </div>
+                <div *ngIf="noteLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                  <nz-spin nzSimple></nz-spin>
+                </div>
+              </div>
+            </div>
+          </nz-form-control>
+        </nz-form-item>
       </form>
     </overlay-scrollbars>
     <div class="display_flex justify-content_flex-center">
@@ -260,6 +288,10 @@
   </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>

src/app/views/patient-search/patient-search.component.less

@@ -1,5 +1,28 @@
 @import "../../../../src/theme.less";
 
+.noteSign{
+  position: relative;
+  .noteList{
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    width: 100%;
+    max-height: 256px;
+    z-index: 99;
+    background: #fff;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    overflow: hidden auto;
+    .noteItem{
+      padding: 5px 12px;
+      cursor: pointer;
+      line-height: normal;
+      &:hover{
+        background-color: #e9f7e9;
+      }
+    }
+  }
+}
 .save {
   position: fixed;
   left: 0;

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
 import { Subject } from 'rxjs';
@@ -12,6 +12,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
   styleUrls: ["./patient-search.component.less"],
 })
 export class PatientSearchComponent implements OnInit {
+  @ViewChild("remarkEle", { static: false }) remarkEle: ElementRef;
   constructor(
     private mainService: MainService,
     private tool: ToolService,
@@ -59,6 +60,9 @@ export class PatientSearchComponent implements OnInit {
   changeHospital(e){
     this.deptList = [];
     this.validateForm.controls.department.setValue(null);
+
+    this.tripTypeList = [];
+    this.validateForm.controls.tripType.setValue(null);
   }
 
   // 获取院区列表
@@ -140,6 +144,12 @@ export class PatientSearchComponent implements OnInit {
       this.changeInp("", "departmentSearch");
     }
   }
+  // 打开搜索框
+  openTripType(flag) {
+    if (flag) {
+      this.getTripTypeList();
+    }
+  }
   // 重置
   reset() {
     this.searchCriteria = {
@@ -218,6 +228,8 @@ export class PatientSearchComponent implements OnInit {
       careLevel: [null, [Validators.required]],
       illnessState: [null],
       patientType: [null, [Validators.required]],
+      tripType: [null],
+      remark: [null],
     });
   }
   // 表单提交
@@ -255,6 +267,8 @@ export class PatientSearchComponent implements OnInit {
           patientType: {
             id: this.validateForm.value.patientType,
           },
+          tripType:  this.validateForm.value.tripType || undefined,
+          remark:  this.validateForm.value.remark || undefined,
         }
       }
     }else{
@@ -283,6 +297,8 @@ export class PatientSearchComponent implements OnInit {
           patientType: {
             id: this.validateForm.value.patientType,
           },
+          tripType:  this.validateForm.value.tripType || undefined,
+          remark:  this.validateForm.value.remark || undefined,
         }
       }
     }
@@ -317,8 +333,8 @@ export class PatientSearchComponent implements OnInit {
   }
 
   // 编辑
-  maskFlag: any = false;
-  coopData = {};
+  maskFlag:any = false;
+  coopData:any = {};
   edit(data) {
     this.initForm();
     this.validateForm.controls.hosId.setValue(data.hosId);
@@ -354,6 +370,8 @@ export class PatientSearchComponent implements OnInit {
     }else{
       this.validateForm.controls.patientType.setValue(null);
     }
+    this.validateForm.controls.tripType.setValue(data.tripType);
+    this.validateForm.controls.remark.setValue(data.remark);
 
     this.modal = true;
     this.add = false;
@@ -391,4 +409,98 @@ export class PatientSearchComponent implements OnInit {
       this.patientTypeList = data || [];
     });
 	}
+
+  // 获取出行方式
+	tripTypeList: any = [];
+	getTripTypeList() {
+    let postData = {
+      workOrderInspectScore: {
+        hosId: this.validateForm.value.hosId
+      },
+      idx: 0,
+      sum: 99999,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "workOrderInspectScore", postData)
+      .subscribe((res) => {
+        this.isLoading = false;
+        if (res.status == 200) {
+          this.tripTypeList = res.list;
+        }else{
+          this.tripTypeList = [];
+        }
+      });
+	}
+
+  // 注意事项获取焦点
+  isShowNoteList:boolean = false;
+  focusNote(){
+    this.isShowNoteList = true;
+    this.getNoteList();
+  }
+
+  // 选择注意事项
+  selectNote(name){
+    this.validateForm.controls.remark.setValue(name);
+    this.isShowNoteList = false;
+    // this.remarkEle.nativeElement.focus();
+  }
+
+  // 获取注意事项列表
+  noteList:any[] = [];
+  noteLoading:boolean = false;
+  getNoteList() {
+    this.noteLoading = true;
+    this.mainService.getDictionary('list', 'inspect_notes',).subscribe(result=>{
+      this.noteLoading = false;
+      this.noteList = result || [];
+    });
+  }
+
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('#noteList')) && e.target !== document.querySelector('#noteFocus')){
+      this.isShowNoteList = false;
+    }
+  }
+
+  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 === "clearSign") {
+      //清空标记
+      this.mainService
+        .clearPatientMark({ patientId: this.coopData.id })
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
 }

src/common.less

@@ -1,3 +1,6 @@
+textarea{
+  margin-bottom: 0!important;
+}
 .ant-table-tbody tr:nth-of-type(2n){
   background-color: #e9f7e9!important;
 }
@@ -117,7 +120,7 @@
 }
 
 .justify-content_flex-end {
-  justify-content: flex-end;
+  justify-content: flex-end !important;
 }
 
 .justify-content_space-between {
@@ -162,6 +165,14 @@
   width: 0;
   flex: 1;
 }
+.flex_2 {
+  width: 0;
+  flex: 2;
+}
+.flex_3 {
+  width: 0;
+  flex: 3;
+}
 
 /*显示顺序*/
 .order_2 {