Merge branch 'master' into develop

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

@@ -34,6 +34,20 @@
               <nz-checkbox-group [(ngModel)]="item.postData.batchPatientDynamicKey"></nz-checkbox-group>
             </div>
           </ng-container>
+					<!-- 自动标记回科 -->
+					<div class="display_flex align-items_center mb8">
+					  <nz-form-label class="label">自动标记回科</nz-form-label>
+						<nz-checkbox-group [(ngModel)]="item.postData.pilAutoBackDept"></nz-checkbox-group>
+					</div>
+					<!-- 自动关闭时间 -->
+					<div class="display_flex align-items_center mb8" *ngIf="item.postData.pilAutoBackDept[0].checked">
+					  <nz-form-label class="label">自动关闭时间</nz-form-label>
+						<nz-input-number [(ngModel)]="item.postData.pilAutoBackDeptHour" nz-input [nzMin]="1" [nzMax]="99999" [nzStep]="1"></nz-input-number>&nbsp;&nbsp;<span class="unit">小时</span>
+					</div>
+					<!-- tip -->
+					<div class="display_flex align-items_center mb8 red" *ngIf="item.postData.pilAutoBackDept[0].checked">
+						自动标记回科根据闭环数据的最新操作日志标记，超过指定时间后自动标记回科
+					</div>
         </div>
         <!-- 自动建单配置 -->
         <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -55,7 +55,7 @@ export class ConfigurationInspectClosedLoopComponent implements OnInit {
      this.message.create("warning", "请先配置任务类型！");
      return;
    }
-
+	 let data = this.activeDictionaryKey.postData;
    let postData:any = {
      ...this.configs,
      taskType: this.tasktype.id,
@@ -63,7 +63,9 @@ export class ConfigurationInspectClosedLoopComponent implements OnInit {
      batchPatientBackDept: this.activeDictionaryKey.postData.batchPatientBackDept[0].checked ? 1 : 0,
      batchPatientCheckType: this.activeDictionaryKey.postData.batchPatientCheckType || 0,
      batchPatientDynamicKey: this.activeDictionaryKey.postData.batchPatientDynamicKey[0].checked ? 1 : 0,
-   };
+		 pilAutoBackDept: data.pilAutoBackDept[0].checked ? 1 : 0,
+		 pilAutoBackDeptHour: data.pilAutoBackDept[0].checked ? data.pilAutoBackDeptHour : undefined
+	 };
    console.log(postData);
    this.btnLoading = true;
    this.mainService
@@ -138,7 +140,9 @@ export class ConfigurationInspectClosedLoopComponent implements OnInit {
         this.activeDictionaryKey.postData.batchPatientBackDept[0].checked = this.configs.batchPatientBackDept == 1;
         this.activeDictionaryKey.postData.batchPatientCheckType = this.configs.batchPatientCheckType || 0;
         this.activeDictionaryKey.postData.batchPatientDynamicKey[0].checked = this.configs.batchPatientDynamicKey == 1;
-       }
+				this.activeDictionaryKey.postData.pilAutoBackDept[0].checked = this.configs.pilAutoBackDept == 1;
+				this.activeDictionaryKey.postData.pilAutoBackDeptHour = this.configs.pilAutoBackDeptHour || 0;
+			 }
      });
  }
 }

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

@@ -47,10 +47,12 @@
                 <th nzWidth="7%">排序号</th>
                 <th nzWidth="12%">检查项目标识</th>
                 <th nzWidth="12%">检查项目名称</th>
-                <th nzWidth="12%">检查类型</th>
+                <th nzWidth="10%">检查类型</th>
                 <th nzWidth="12%">默认检查科室</th>
-                <th nzWidth="30%">检查科室</th>
-                <th nzWidth="15%">操作</th>
+                <th nzWidth="12%">检查科室</th>
+								<th nzWidth="12%">预估检查时长</th>
+								<th nzWidth="12%">预约间隔时长</th>
+                <th nzWidth="14%">操作</th>
               </tr>
             </thead>
             <tbody>
@@ -61,6 +63,8 @@
                 <td>{{data.extra5DTO?.name}}</td>
                 <td>{{data.extra4DTO?.dept}}</td>
                 <td>{{data.deptList | multipleName: 'dept'}}</td>
+								<td>{{data.extra3}} <span *ngIf="data.extra3">分钟</span></td>
+								<td>{{data.extra1}} <span *ngIf="data.extra1">分钟</span></td>
                 <td>
                   <div class="coop">
                     <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
@@ -163,6 +167,22 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="6" nzFor="extra3">预估检查时长</nz-form-label>
+				  <nz-form-control [nzSpan]="18">
+				    <nz-input-group>
+							<nz-input-number formControlName="extra3" nz-input nzPlaceHolder="请输入预估检查时长" [nzMin]="1" [nzMax]="99999" [nzStep]="1"></nz-input-number>&nbsp;&nbsp;<span class="unit">分钟</span>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="6" nzFor="extra1">预约间隔时长</nz-form-label>
+				  <nz-form-control [nzSpan]="18">
+				    <nz-input-group>
+							<nz-input-number formControlName="extra1" nz-input nzPlaceHolder="请输入预约间隔时长" [nzMin]="1" [nzMax]="99999" [nzStep]="1"></nz-input-number>&nbsp;&nbsp;<span class="unit">分钟</span>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class=" display_flex justify-content_flex-center">

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

@@ -250,7 +250,16 @@
               .ant-form-item-label {
                 text-align: left;
               }
-
+							
+							.ant-input-number{
+								width: 88%;
+							}
+							
+							.unit{
+								position: relative;
+								top: 5px;
+							}
+							
               .desc {
                 margin-top: 5px;
               }

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

@@ -62,6 +62,8 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
     this.validateForm.controls.orders.setValue(data.orders);
     this.validateForm.controls.name.setValue(data.name);
     this.validateForm.controls.extra6.setValue(data.extra6);
+		this.validateForm.controls.extra3.setValue(data.extra3?data.extra3:null);
+		this.validateForm.controls.extra1.setValue(data.extra1?data.extra1:null);
     this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
     this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
     this.validateForm.controls.extra7.setValue(data.deptList ? data.deptList.map(v => v.id) : []);
@@ -109,6 +111,8 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           desc: "检查项目",
           orders: this.validateForm.value.orders,
           name: this.validateForm.value.name,
+					extra3: this.validateForm.value.extra3 || undefined,
+					extra1: this.validateForm.value.extra1 || undefined,
           extra6: this.validateForm.value.extra6,
           extra4: this.validateForm.value.extra4,
           extra5: this.validateForm.value.extra5,
@@ -123,6 +127,8 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           ...this.coopData,
           orders: this.validateForm.value.orders,
           name: this.validateForm.value.name,
+					extra3: this.validateForm.value.extra3 || undefined,
+					extra1: this.validateForm.value.extra1 || undefined,
           extra6: this.validateForm.value.extra6,
           value: this.validateForm.value.extra6,
           extra4: this.validateForm.value.extra4,
@@ -158,6 +164,8 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       orders: [null, [Validators.required]],
       name: [null, [Validators.required]],
       extra6: [null, [Validators.required]],
+			extra1: [null],
+			extra3: [null],
       extra4: [null],
       extra5: [null, [Validators.required]],
       extra7: [[]],

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

@@ -65,6 +65,8 @@ export class ConfigurationInspectComponent implements OnInit {
       batchPatientBackDept: [{ label:'是否开启批量患者回科', value: 0 }],
       batchPatientCheckType: 0,
       batchPatientDynamicKey: [{ label:'是否支持动态密钥', value: 0 }],
+			pilAutoBackDept: [{ label:'是否自动标记回科', value: 0 }],
+			pilAutoBackDeptHour: 1,
     }},
   ]
 

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

@@ -90,12 +90,21 @@
           <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>
+              <nz-date-picker [(ngModel)]="inspectData.date" [nzAllowClear]="false" [nzShowToday]="false" (ngModelChange)="dateChange($event)"></nz-date-picker>
+              <nz-time-picker class="ml8" nzFormat="HH:mm" [(ngModel)]="inspectData.time" [nzAllowEmpty]="false" (ngModelChange)="timeChange($event)"></nz-time-picker>
               <button nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">下一日</button>
             </div>
           </div>
         </div>
+				
+				<div class="row" *ngIf="endTime">
+				  <div class="formItem flex_1">
+				    <div class="name"><i class="icon_transport transport-required red"></i>预约结束时间：</div>
+				    <div class="value">
+							{{endTime}}
+				    </div>
+				  </div>
+				</div>
       </div>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -1,7 +1,7 @@
 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 { startOfDay, format, addDays, addMinutes } from 'date-fns';
 import { NzMessageService } from 'ng-zorro-antd';
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
@@ -20,7 +20,7 @@ export class AddInspectInfoComponent implements OnInit {
 
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
-
+	@Input() inspectAndPatientTransportConfig:any = {};
   constructor(
     private mainService: MainService,
     private tool: ToolService,
@@ -126,6 +126,7 @@ export class AddInspectInfoComponent implements OnInit {
   changeInspect(id){
     this.inspectDTO = this.inspectList.find(v => v.id == id);
     if(this.inspectDTO){
+			this.setTimeData();
       this.inspectData.id = this.inspectDTO.id;
       this.execDeptList = this.inspectDTO.deptList || [];
       this.inspectData.execDeptId = this.execDeptList.length === 1 ? this.execDeptList[0].id : undefined;
@@ -139,7 +140,35 @@ export class AddInspectInfoComponent implements OnInit {
       this.inspectData.type = '';
     }
   }
-
+	
+	// 选择日期
+	mdData:any;
+	dateChange(e){
+		this.mdData = format(e, 'yyyy-MM-dd')
+		this.setTimeData();
+	}
+	
+	// 选择时间
+	endTime:any;
+	timeChange(e){
+		if(e){
+			this.mdData = format(this.inspectData.date, 'yyyy-MM-dd')
+			this.setTimeData();
+		}
+	}
+	
+	// 设置结束时间
+	setTimeData(){
+		if(this.mdData && this.inspectData.time){
+			let num = this.inspectDTO.extra1 ? Number(this.inspectDTO.extra1) : undefined
+			let time = addMinutes(this.inspectData.time, num ? num : this.inspectAndPatientTransportConfig.yytimeGapMinute)
+			let time2 = format(time, 'HH:mm')
+			this.endTime = this.mdData +' '+ time2
+			let date = new Date(this.endTime);
+			this.inspectData.endCheckTime = date.getTime()
+		}
+	}
+	
   // 打开班次
   openInspect(e){
     if(e){

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

@@ -55,12 +55,21 @@
           <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>
+              <nz-date-picker [(ngModel)]="inspectData.date" [nzAllowClear]="false" [nzShowToday]="false" (ngModelChange)="dateChange($event)"></nz-date-picker>
+              <nz-time-picker class="ml8" nzFormat="HH:mm" [(ngModel)]="inspectData.time" [nzAllowEmpty]="false" (ngModelChange)="timeChange($event)"></nz-time-picker>
               <button nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">下一日</button>
             </div>
           </div>
         </div>
+				
+				<div class="row" *ngIf="endTime">
+				  <div class="formItem flex_1">
+				    <div class="name"><i class="icon_transport transport-required red"></i>预约结束时间：</div>
+				    <div class="value">
+							{{endTime}}
+				    </div>
+				  </div>
+				</div>
       </div>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -1,7 +1,7 @@
 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 { startOfDay, format, addDays, addMinutes } from 'date-fns';
 import { NzMessageService } from 'ng-zorro-antd';
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
@@ -20,7 +20,7 @@ export class AddInspectThreeModalComponent implements OnInit {
 
   @Input() patientDTO: any;
   @Input() deptDisplay: any;
-
+	@Input() inspectAndPatientTransportConfig:any = {};
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
@@ -42,6 +42,7 @@ export class AddInspectThreeModalComponent implements OnInit {
     });
     this.hosId = this.tool.getCurrentHospital().id;
     this.currentDept = this.tool.getCurrentUserDept();
+		console.log(777, this.inspectAndPatientTransportConfig)
   }
 
   // 确认弹窗
@@ -74,7 +75,34 @@ export class AddInspectThreeModalComponent implements OnInit {
   nextDay() {
     this.inspectData.date = addDays(this.inspectData.date, 1);
   }
-
+	
+	// 选择日期
+	mdData:any = format(this.inspectData.date, 'yyyy-MM-dd');
+	dateChange(e){
+		this.mdData = format(e, 'yyyy-MM-dd')
+		this.setTimeData();
+	}
+
+	// 选择时间
+	endTime:any;
+	timeChange(e){
+		if(e){
+			this.setTimeData();
+		}
+	}
+	
+	// 设置结束时间
+	setTimeData(){
+		if(this.mdData && this.inspectData.time){
+			let num = this.inspectDTO.extra1 ? Number(this.inspectDTO.extra1) : undefined
+			let time = addMinutes(this.inspectData.time, num ? num : this.inspectAndPatientTransportConfig.yytimeGapMinute)
+			let time2 = format(time, 'HH:mm')
+			this.endTime = this.mdData +' '+ time2
+			let date = new Date(this.endTime);
+			this.inspectData.endCheckTime = date.getTime()
+		}
+	}
+	
   isLoading = false;
   inspectList: Array<any>; //检查项目列表
   // 获取检查项目
@@ -107,7 +135,9 @@ export class AddInspectThreeModalComponent implements OnInit {
   execDeptList:any[] = [];
   changeInspect(id){
     this.inspectDTO = this.inspectList.find(v => v.id == id);
+		console.log(4545, this.inspectDTO)
     if(this.inspectDTO){
+			this.setTimeData();
       this.inspectData.id = this.inspectDTO.id;
       this.execDeptList = this.inspectDTO.deptList || [];
       this.inspectData.execDeptId = this.execDeptList.length === 1 ? this.execDeptList[0].id : undefined;

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

@@ -139,7 +139,7 @@
               <div nz-col nzSpan="8">
                 <p>
                   <span class="label">预约时间：</span>
-                  <span>{{item.yyTime||'-'}}</span>
+                  <span>{{item.yyEndTime||'-'}}</span>
                 </p>
               </div>
               <div nz-col nzSpan="8">

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

@@ -5,6 +5,7 @@ import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { NzMessageService } from "ng-zorro-antd";
 import { forkJoin } from "rxjs";
 import { ToolService } from "src/app/services/tool.service";
+import { startOfDay, endOfDay, format, startOfMinute, addMinutes } from 'date-fns';
 
 @Component({
   selector: "app-detail-patients",
@@ -63,23 +64,32 @@ export class DetailPatientsComponent implements OnInit {
       // getDetail
       this.orderInfo = res[1]["data"];
       if (this.orderInfo["checkList"] && this.orderInfo["checkList"].length) {
-        let arr = [];
-        let orderInfo = this.orderInfo["checkList"].filter(
-          (item) => item.yyTime
-        );
-        if (orderInfo.length) {
-          arr = orderInfo.map((item) => [
-            new Date(item.yyTime).getTime() - new Date().getTime(),
-            item.yyTime,
-          ]);
-          arr.sort((a, b) => a - b);
-          this.orderInfo["yyTime"] = arr[0][1];
-        } else {
-          this.orderInfo["yyTime"] = "";
-        }
-      } else {
-        this.orderInfo["yyTime"] = "";
-      }
+        // let arr = [];
+        // let orderInfo = this.orderInfo["checkList"].filter(
+        //   (item) => item.yyTime
+        // );
+        // if (orderInfo.length) {
+        //   arr = orderInfo.map((item) => [
+        //     new Date(item.yyTime).getTime() - new Date().getTime(),
+        //     item.yyTime,
+        //   ]);
+        //   arr.sort((a, b) => a - b);
+        //   this.orderInfo["yyTime"] = arr[0][1];
+        // } else {
+        //   this.orderInfo["yyTime"] = "";
+        // }
+				
+				this.orderInfo["checkList"].forEach(i =>{
+					i.newTime = format(new Date(i.yyTime), 'MM-dd HH:mm')
+					if(i.endCheckTime){
+						i.newTime2 = format(new Date(i.endCheckTime), 'HH:mm')
+						i.yyEndTime = i.newTime + '--' + i.newTime2
+					}else{
+						i.yyEndTime = i.newTime
+					}
+				})
+      } 
+			
       if (res[1]["data"].middleDept) {
         this.middleDept = res[1]["data"].middleDept.map((item) =>
           !this.showCoop && this.deptDisplay == 2 ? item.deptalias : item.dept

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

@@ -25,8 +25,8 @@
           <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-date-picker [(ngModel)]="yyDate" [nzShowToday]="false" (ngModelChange)="dateChange($event)"></nz-date-picker>
+              <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false" (ngModelChange)="timeChange($event)">
               </nz-time-picker>
               <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
                 下一日
@@ -34,7 +34,16 @@
             </div>
           </div>
         </div>
-
+				
+				<div class="row" *ngIf="endTime">
+				  <div class="formItem flex_1">
+				    <div class="name"><i class="icon_transport transport-required red"></i>预约结束时间：</div>
+				    <div class="value">
+							{{endTime}}
+				    </div>
+				  </div>
+				</div>
+				
         <div class="row">
           <div class="formItem flex_1">
             <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>医生备注：</div>

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

@@ -1,7 +1,7 @@
 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';
+import { addDays, startOfMinute, format, addMinutes } from 'date-fns';
 
 @Component({
   selector: 'app-edit-inspect-info',
@@ -13,7 +13,10 @@ export class EditInspectInfoComponent implements OnInit {
   @Input() date:any;
   @Input() execDeptId:any;
   @Input() remarkText:any;
-  @Input() execDeptList:any[] = [];
+  @Input() execDeptList:any;
+	@Input() extra1:any;
+	@Input() inspectAndPatientTransportConfig:any = {};
+	@Input() endCheckTime:any = null;
   @Output() submitFormHand = new EventEmitter();
   @Output() cancelFlagHand = new EventEmitter();
   yyDate = null; //预约日期-患者其他服务
@@ -25,11 +28,15 @@ export class EditInspectInfoComponent implements OnInit {
   constructor(
     private message: NzMessageService,
   ) { }
-
+	
   ngOnInit() {
     if(this.date){
       this.yyDate = new Date(this.date);
       this.yyTime = new Date(this.date);
+			this.mdData = format(this.yyDate, 'yyyy-MM-dd')
+			if(this.endCheckTime){
+				this.setTimeData();
+			}
     }
 
     if(this.execDeptList){
@@ -53,7 +60,42 @@ export class EditInspectInfoComponent implements OnInit {
   nextDay() {
     this.yyDate = addDays(this.yyDate, 1);
   }
-
+	
+	// 选择日期
+	mdData:any;
+	dateChange(e){
+		if(e){
+			this.mdData = format(e, 'yyyy-MM-dd')
+			this.setTimeData();
+		}else{
+			this.endTime = null
+		}
+	}
+	
+	// 选择时间
+	endTime:any;
+	timeChange(e){
+		if(e){
+			this.mdData = format(this.yyDate, 'yyyy-MM-dd')
+			this.setTimeData();
+		}else{
+			this.endTime = null
+		}
+	}
+	
+	// 设置结束时间
+	formEndCheckTime:any;
+	setTimeData(){
+		if(this.mdData && this.yyTime){
+			let num = this.extra1 ? Number(this.extra1) : undefined
+			let time = addMinutes(this.yyTime, num ? num : this.inspectAndPatientTransportConfig.yytimeGapMinute)
+			let time2 = format(time, 'HH:mm')
+			this.endTime = this.mdData +' '+ time2
+			let date = new Date(this.endTime);
+			this.formEndCheckTime = date.getTime()
+		}
+	}
+	
   // 隐藏模态框
   hideModal() {
     this.cancelFlagHand.emit(false)
@@ -73,7 +115,8 @@ export class EditInspectInfoComponent implements OnInit {
       deptId: this.deptId,
       remark: this.remark,
       date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),
-    });
+			endCheckTime: this.formEndCheckTime
+		});
   }
 }
 

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

@@ -59,8 +59,8 @@
           <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-date-picker [(ngModel)]="yyDate" [nzShowToday]="false" (ngModelChange)="dateChange($event)"></nz-date-picker>
+              <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false" (ngModelChange)="timeChange($event)">
               </nz-time-picker>
               <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
                 下一日
@@ -68,7 +68,16 @@
             </div>
           </div>
         </div>
-
+				
+				<div class="row" *ngIf="endTime">
+				  <div class="formItem flex_1">
+				    <div class="name"><i class="icon_transport transport-required red"></i>预约结束时间：</div>
+				    <div class="value">
+							{{endTime}}
+				    </div>
+				  </div>
+				</div>
+				
         <div class="row">
           <div class="formItem flex_1">
             <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>医生备注：</div>

src/app/share/edit-inspect-info2/edit-inspect-info2.component.ts

@@ -1,7 +1,7 @@
 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';
+import { addDays, startOfMinute, format, addMinutes } from 'date-fns';
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { ToolService } from 'src/app/services/tool.service';
@@ -19,7 +19,10 @@ export class EditInspectInfo2Component implements OnInit {
   @Input() remarkText:any;
   @Input() applyDept:any = {};
   @Input() patient:any = {};
-  @Input() execDeptList:any[] = [];
+  @Input() execDeptList:any;
+	@Input() extra1:any;
+	@Input() inspectAndPatientTransportConfig:any = {};
+	@Input() endCheckTime:any = null;
   @Output() submitFormHand = new EventEmitter();
   @Output() cancelFlagHand = new EventEmitter();
   yyDate = null; //预约日期-患者其他服务
@@ -63,6 +66,10 @@ export class EditInspectInfo2Component implements OnInit {
     if(this.date){
       this.yyDate = new Date(this.date);
       this.yyTime = new Date(this.date);
+			this.mdData = format(this.yyDate, 'yyyy-MM-dd')
+			if(this.endCheckTime){
+				this.setTimeData();
+			}
     }
 
     if(this.execDeptList){
@@ -91,7 +98,41 @@ export class EditInspectInfo2Component implements OnInit {
   changeApplyDept(e){
     this.inspectData.patientId = undefined;
   }
-
+	
+	// 选择日期
+	mdData:any;
+	dateChange(e){
+		if(e){
+			this.mdData = format(e, 'yyyy-MM-dd')
+			this.setTimeData();
+		}else{
+			this.endTime = null
+		}
+	}
+	
+	// 选择时间
+	endTime:any;
+	timeChange(e){
+		if(e){
+			this.mdData = format(this.yyDate, 'yyyy-MM-dd')
+			this.setTimeData();
+		}else{
+			this.endTime = null
+		}
+	}
+	
+	// 设置结束时间
+	setTimeData(){
+		if(this.mdData && this.yyTime){
+			let num = this.extra1 ? Number(this.extra1) : undefined
+			let time = addMinutes(this.yyTime, num ? num : this.inspectAndPatientTransportConfig.yytimeGapMinute)
+			let time2 = format(time, 'HH:mm')
+			this.endTime = this.mdData +' '+ time2
+			let date = new Date(this.endTime);
+			this.inspectData.endCheckTime = date.getTime()
+		}
+	}
+	
   // =========================申请科室=====================
   applyDeptList: Array<any>; //申请科室列表
   // 获取申请科室
@@ -198,7 +239,8 @@ export class EditInspectInfo2Component implements OnInit {
       deptId: this.deptId,
       remark: this.remark,
       date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),
-    });
+			endCheckTime: this.inspectData.endCheckTime
+		});
   }
 }
 

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

@@ -35,7 +35,7 @@
       #osComponentRef3
       style="height: 90%; flex: 1"
       *ngIf="
-        tabType == 1 && orderInfo.taskType.associationType.value == 'other'
+        tabType == 1 && orderInfo && orderInfo.taskType.associationType.value == 'other'
       "
     >
       <div class="content orders">
@@ -112,6 +112,13 @@
               特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
             </div>
           </div>
+					<!-- <div class="info" nz-row *ngIf="orderInfo.yyEndTime">
+					  <div nz-col nzSpan="24">
+					    预约结束时间：{{
+					      orderInfo.yyEndTime
+					    }}
+					  </div>
+					</div> -->
         </div>
         <div class="center" *ngIf="amplificationShow">
           <div class="box">
@@ -163,7 +170,7 @@
       #osComponentRef4
       style="height: 90%; flex: 1"
       *ngIf="
-        tabType == 1 && orderInfo.taskType.associationType.value == 'specimen'
+        tabType == 1 && orderInfo && orderInfo.taskType.associationType.value == 'specimen'
       "
     >
       <div class="content orders">
@@ -240,6 +247,13 @@
               特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
             </div>
           </div>
+					<!-- <div class="info" nz-row *ngIf="orderInfo.yyEndTime">
+					  <div nz-col nzSpan="24">
+					    预约结束时间：{{
+					      orderInfo.yyEndTime
+					    }}
+					  </div>
+					</div> -->
         </div>
         <div class="center" *ngIf="amplificationShow">
           <div class="box">
@@ -291,7 +305,7 @@
       #osComponentRef5
       style="height: 90%; flex: 1"
       *ngIf="
-        tabType == 1 &&
+        tabType == 1 && orderInfo && 
         orderInfo.taskType.associationType.value == 'specimenPlan'
       "
     >
@@ -325,7 +339,7 @@
                 orderInfo.createDeptDTO ? orderInfo.createDeptDTO.dept : ""
               }}
             </div>
-            <div nz-col nzSpan="10">目标科室：{{ endDepts }}</div>
+            <div nz-col nzSpan="6">目标科室：{{ endDepts }}</div>
             <div nz-col nzSpan="4">
               预计接收：{{ orderInfo.expectReceiveNum }}
             </div>
@@ -351,6 +365,13 @@
               特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
             </div>
           </div>
+				<!-- 	<div class="info" nz-row *ngIf="orderInfo.yyEndTime">
+						<div nz-col nzSpan="4">
+						  预约结束时间：{{
+						    orderInfo.yyEndTime
+						  }}
+						</div>
+					</div> -->
         </div>
         <div class="center" *ngIf="amplificationShow">
           <div class="box">
@@ -402,7 +423,7 @@
       #osComponentRef6
       style="height: 90%; flex: 1"
       *ngIf="
-        tabType == 1 &&
+        tabType == 1 && orderInfo &&
         (orderInfo.taskType.associationType.value == 'drugsBag' ||
           orderInfo.taskType.associationType.value == 'jPBag')
       "
@@ -462,6 +483,13 @@
               特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
             </div>
           </div>
+					<!-- <div class="info" nz-row *ngIf="orderInfo.yyEndTime">
+						<div nz-col nzSpan="24">
+						  预约结束时间：{{
+						    orderInfo.yyEndTime
+						  }}
+						</div>
+					</div> -->
         </div>
         <div class="center" *ngIf="amplificationShow">
           <div class="box">
@@ -599,7 +627,7 @@
       #osComponentRef1
       style="height: 90%; flex: 1"
       *ngIf="
-        tabType == 1 &&
+        tabType == 1 && orderInfo && 
         (orderInfo.taskType.associationType.value == 'inspect' ||
           orderInfo.taskType.associationType.value == 'patientTransport')
       "
@@ -707,6 +735,13 @@
               特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
             </div>
           </div>
+					<!-- <div class="info" nz-row *ngIf="orderInfo.yyEndTime">
+					  <div nz-col nzSpan="24">
+					    预约结束时间：{{
+					      orderInfo.yyEndTime
+					    }}
+					  </div>
+					</div> -->
         </div>
         <div class="center" *ngIf="amplificationShow">
           <div class="box">
@@ -822,7 +857,7 @@
                 <div nz-col nzSpan="8">
                   <p>
                     <span class="label">预约时间：</span>
-                    <span>{{ item.yyTime || "-" }}</span>
+                    <span>{{ item.yyEndTime || "-" }}</span>
                   </p>
                 </div>
                 <div nz-col nzSpan="8">
@@ -866,7 +901,7 @@
     #osComponentRef9
     style="height: 90%; flex: 1"
     *ngIf="
-      tabType == 1 && orderInfo.taskType.associationType.value == 'ordinary'
+      tabType == 1 && orderInfo && orderInfo.taskType.associationType.value == 'ordinary'
     "
   >
     <div class="content orders">
@@ -943,6 +978,13 @@
             特殊情况关闭原因：{{ orderInfo.specialCloseReason || "-" }}
           </div>
         </div>
+			<!-- 	<div class="info" nz-row *ngIf="orderInfo.yyEndTime">
+				  <div nz-col nzSpan="24">
+				    预约结束时间：{{
+				      orderInfo.yyEndTime
+				    }}
+				  </div>
+				</div> -->
       </div>
       <div class="center" *ngIf="amplificationShow">
         <div class="box">
@@ -1271,7 +1313,7 @@
       </div>
     </overlay-scrollbars>
   </div>
-  <div class="btns">
+  <div class="btns" *ngIf="orderInfo">
     <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'blood')">
       业务数据
     </button>

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

@@ -10,6 +10,8 @@ import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { NzMessageService } from "ng-zorro-antd";
 import { forkJoin } from "rxjs";
+import { ToolService } from "../../services/tool.service";
+import { startOfDay, endOfDay, format, startOfMinute, addMinutes } from 'date-fns';
 @Component({
   selector: "app-order-detail",
   templateUrl: "./order-detail.component.html",
@@ -65,7 +67,8 @@ export class OrderDetailComponent implements OnInit {
     private message: NzMessageService,
     private fb: FormBuilder,
     private route: ActivatedRoute,
-    private mainService: MainService
+    private mainService: MainService,
+		private tool: ToolService,
   ) {}
   maskFlag: any = false;
   id: number; //工单id
@@ -82,10 +85,11 @@ export class OrderDetailComponent implements OnInit {
   recLoading: boolean = false; //撤回并删除按钮loading状态
   btnLoading: boolean = false; //确认按钮loading状态
   amplificationShow = true;
-
+	hosId:any = this.tool.getCurrentHospital().id; //当前院区
+	
   ngOnInit() {
     this.tabType = this.route.snapshot.params.type || 1;
-    this.getInfo();
+		this.getInspectAndPatientTransportConfigTasktype()
     this.initForm();
   }
   ngOnDestroy() {}
@@ -94,7 +98,57 @@ export class OrderDetailComponent implements OnInit {
   amplification(){
     this.amplificationShow = !this.amplificationShow;
   }
-
+	
+  //获取检查页面任务类型
+  getInspectAndPatientTransportConfigTasktype() {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      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) {
+          let tasktype:any = result.list[0] || {};
+          this.getInspectAndPatientTransportConfig(tasktype);
+        }
+      });
+  }
+  // 获取检查页面信息配置
+	configObj:any;
+  getInspectAndPatientTransportConfig(tasktype) {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          associationType: tasktype.associationType
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.configObj = result.list[0] || {};
+					this.getInfo();
+        }
+      });
+  }
+	
   // 获取工单详情
   middleDept = []; //中间科室数组
   getInfo() {
@@ -105,7 +159,19 @@ export class OrderDetailComponent implements OnInit {
     this.mainService
       .getFetchData("api", "workOrder", this.id)
       .subscribe((data) => {
-        this.orderInfo = data.data;
+				let obj = data.data
+				if(obj.checkList){
+					obj.checkList.forEach(i =>{
+						i.newTime = format(new Date(i.yyTime), 'MM-dd HH:mm')
+						if(i.endCheckTime){
+							i.newTime2 = format(new Date(i.endCheckTime), 'HH:mm')
+							i.yyEndTime = i.newTime + '--' + i.newTime2
+						}else{
+							i.yyEndTime = i.newTime
+						}
+					})
+				}
+        this.orderInfo = obj;
         if (data.data.middleDept) {
           this.middleDept = data.data.middleDept.map((item) => item.dept);
         } else {

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

@@ -21,7 +21,7 @@ import { Subject, forkJoin } from "rxjs";
 import { debounceTime, filter, map } from "rxjs/operators";
 import { SourceId } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
-import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format, addHours, startOfDay, endOfDay } from 'date-fns';
+import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format, addHours, startOfDay, endOfDay, addMinutes } from 'date-fns';
 import { UploadFile } from 'ng-zorro-antd';
 import { HttpRequest, HttpClient, HttpResponse } from '@angular/common/http';
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -5631,14 +5631,21 @@ export class FuwutaiComponent implements OnInit {
       // 如果是患者陪检，则没有起点科室，终点科室
       if(taskType.associationTypeValue === 'inspect'){
         this.linkCheckLis = [];
-        if (data.data && Array.isArray(data.data.data) && data.data.data.length) {
+        if (data.data && Array.isArray(data.data.data) && data.data.data.length>0) {
           let arr = [];
           data.data.data.forEach((e) => {
+						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+						if(e.endCheckTime){
+							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+							e.yyEndTime = e.newTime + '--' + e.newTime2
+						}else{
+							e.yyEndTime = e.newTime
+						}
             arr.push({
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
-              label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
+              label: (e.yyEndTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName?e.inspectName:'' + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
               remark: e.remark,
@@ -7271,14 +7278,22 @@ export class FuwutaiComponent implements OnInit {
 
       this.mainService.getdeptList(value, this.applyDept, patientCode, (taskType.associationTypeValue === 'inspect' ? format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined), (taskType.associationTypeValue === 'inspect' ? format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined)).subscribe((data:any) => {
         this.linkCheckLis = [];
-        if(data.data && Array.isArray(data.data.data) && data.data.data.length) {
+        if(data.data && Array.isArray(data.data.data) && data.data.data.length>0) {
           let arr = [];
           data.data.data.forEach((e) => {
+						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+						if(e.endCheckTime){
+							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+							e.yyEndTime = e.newTime + '--' + e.newTime2
+						}else{
+							e.yyEndTime = e.newTime
+						}
+
             arr.push({
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
-              label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
+              label: (e.yyEndTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName?e.inspectName:'' + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
             });
@@ -7336,14 +7351,21 @@ export class FuwutaiComponent implements OnInit {
   refreshInspectList(){
     this.linkCheckLis = [];
     this.mainService.getdeptList(this.radioValueZy, this.applyDept, this.patientZy, format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss')).subscribe((data:any) => {
-      if (data.data && Array.isArray(data.data.data) && data.data.data.length) {
+      if (data.data && Array.isArray(data.data.data) && data.data.data.length>0) {
         let arr = [];
         data.data.data.forEach((e) => {
+					e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+					if(e.endCheckTime){
+						e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+						e.yyEndTime = e.newTime + '--' + e.newTime2
+					}else{
+						e.yyEndTime = e.newTime
+					}
           arr.push({
             execDeptId: e.execDept.id,
             yyTime: e.yyTime,
             priority: e.priority,
-            label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
+            label: (e.yyEndTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName?e.inspectName:'' + '-' + e.inspectCode || "检查"),
             value: e["id"],
             checked: false,
           });

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

@@ -2809,4 +2809,7 @@
 <app-specimen-package-list-modal *ngIf="isShowSpecimenPackageList" (closeModelHs)="closeSpecimenPackageList($event)" [specimenPackageStateValue]="specimenPackageStateValue"></app-specimen-package-list-modal>
 
 <!-- 追加检查 -->
-<app-add-inspect-two-modal *ngIf="isShowAddInspect" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-two-modal>
+<!-- <app-add-inspect-two-modal *ngIf="isShowAddInspect" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-two-modal> -->
+
+<!-- 追加检查项目 -->
+<app-add-inspect-three-modal *ngIf="isShowAddInspect" [inspectAndPatientTransportConfig]="inspectAndPatientTransportConfig" [patientDTO]="patientMsg" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-three-modal>

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

@@ -34,7 +34,9 @@ import {
   startOfDay,
   endOfDay,
   parse,
-	subHours
+	subHours,
+	startOfMinute,
+	addMinutes
 } from "date-fns";
 import { SourceId } from "src/app/type/types";
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -943,7 +945,7 @@ export class HushijiandanComponent implements OnInit {
         if (result.status == 200) {
           let inspectAndPatientTransportConfig = result.list[0] || {};
           this.inspectAndPatientTransportConfig = {...this.inspectAndPatientTransportConfig, ...inspectAndPatientTransportConfig};
-
+					
           // 是否显示排队信息
           if(this.inspectAndPatientTransportConfig.queuingInformation == 1){
             this.getQueuingInformation();
@@ -3510,19 +3512,28 @@ export class HushijiandanComponent implements OnInit {
         if (data.status == 200 && data.data && data.data.length) {
           let arr = [];
           data.data.forEach((e) => {
-            arr.push({
-              execDeptId: e.execDept.id,
-              yyTime: e.yyTime,
+						e.yyEndTime = e.yyTime
+						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+						if(e.endCheckTime){
+							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+							e.yyEndTime = e.newTime + '--' + e.newTime2
+						}else{
+							e.yyEndTime = e.newTime
+							// e.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
+						}
+						arr.push({
+						  execDeptId: e.execDept.id,
+						  yyTime: e.yyTime,
               priority: e.priority,
               manualCreate: e.manualCreate,
               label:
-                (e.yyTime || "") +
+                (e.yyEndTime || "") +
                 " " +
                 (this.deptDisplay == 2
                   ? e.execDept.deptalias
                   : e.execDept.dept) +
                 " 进行 " +
-                (e.inspectName + '-' + e.inspectCode || "检查"),
+                (e.inspectName?e.inspectName:'' + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
               remark: e.remark,
@@ -5696,19 +5707,27 @@ export class HushijiandanComponent implements OnInit {
         if (data.status == 200 && data.data && data.data.length) {
           let arr = [];
           data.data.forEach((e) => {
+						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+						if(e.endCheckTime){
+							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+							e.yyEndTime = e.newTime + '--' + e.newTime2
+						}else{
+							// e.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
+							e.yyEndTime = e.newTime
+						}
             arr.push({
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
               manualCreate: e.manualCreate,
               label:
-                (e.yyTime || "") +
+                (e.yyEndTime|| "") +
                 " " +
                 (this.deptDisplay == 2
                   ? e.execDept.deptalias
                   : e.execDept.dept) +
                 " 进行 " +
-                (e.inspectName + '-' + e.inspectCode || "检查"),
+                (e.inspectName?e.inspectName:'' + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
               remark: e.remark,
@@ -5745,8 +5764,8 @@ export class HushijiandanComponent implements OnInit {
     console.log(e);
     let obj = JSON.parse(e);
     this.isShowAddInspect = obj.show;
+		let user = JSON.parse(localStorage.getItem("user"));
     if(obj.type == 2){
-      let user = JSON.parse(localStorage.getItem("user"));
       // 手动添加
       let postData:any = {
         inspectList: obj.list.map(v => ({
@@ -5774,7 +5793,37 @@ export class HushijiandanComponent implements OnInit {
             this.message.error(data.msg || '追加检查失败！')
           }
         });
-    }
+    }else{
+			let postData:any = {
+			  inspectList: [{
+			    patientCode: this.patientMsg.patientCode,
+			    patientName: this.patientMsg.patientName,
+			    barCode: this.patientMsg.barCode,
+			    inspectCheckType: { id: obj.inspectData.id },
+			    applyDeptId: user.user.dept.id,
+			    execDeptId: obj.inspectData.execDeptId,
+			    bedNum: this.patientMsg.bedNum,
+			    hosId: this.patientMsg.hosId,
+			    yyTime: format(new Date(obj.inspectData.date), 'yyyy-MM-dd ') + format(startOfMinute(new Date(obj.inspectData.time)), 'HH:mm:ss'),
+					endCheckTime: obj.inspectData.endCheckTime
+				}] || 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.message.success('追加检查成功！')
+			      this.refreshInspectList();
+			    } else {
+			      this.message.error(data.msg || '追加检查失败！')
+			    }
+			  });
+		}
   }
 
   // 统计

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

@@ -195,6 +195,11 @@
           <nz-form-label class="label">是否开通非预约检查顺延</nz-form-label>
           <nz-checkbox-group [(ngModel)]="inspectDelayOneDay"></nz-checkbox-group>
         </div>
+				<!-- 默认预约间隔时长（分钟） -->
+				<div class="display_flex align-items_center mb8">
+				  <nz-form-label class="label" nzRequired>默认预约间隔时长（分钟）</nz-form-label>
+				  <nz-input-number [(ngModel)]="yytimeGapMinute" [nzMin]="1" [nzMax]="99999" [nzStep]="1"></nz-input-number>
+				</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

@@ -127,7 +127,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
     { label: '预约陪检', value: 1, },
     { label: '陪检信息配置', value: 2, },
   ];
-
+	
+	// 默认预约间隔时长
+	yytimeGapMinute:any;
+	
   changeBatchSignExecutionDept(e){
     if(!e[0].checked){
       this.batchSignExecutionParent = [
@@ -307,6 +310,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       this.msg.create("warning", "请选择批量陪检配置方式！");
       return;
     }
+		if(!this.yytimeGapMinute){
+		  this.msg.create("warning", "请输入默认预约间隔时长！");
+		  return;
+		}
     // if(!this.handoverMode){
     //   this.msg.create("warning", "请选择交接方式！");
     //   return;
@@ -350,7 +357,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
       batchInspectType: this.radioBatchInspectTypesValue || undefined,
-
+			yytimeGapMinute: this.yytimeGapMinute || undefined,
 
       timeMod: this.timeMod || undefined,
       batchInspectAutoClearTime: this.batchInspectAutoClearTime ? format(this.batchInspectAutoClearTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
@@ -454,7 +461,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           // this.radioCheckModesValue = this.configs.checkType.id;
           // this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
           // this.autoDepts[0].checked = this.configs.autoDept == 1;
-
+					this.yytimeGapMinute = this.configs.yytimeGapMinute || undefined;
           this.radioBatchInspectTypesValue = this.configs.batchInspectType || undefined;
           if(this.configs.signTypeIds){
             let ids = this.configs.signTypeIds.split(',');

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

@@ -2,7 +2,7 @@ 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 { startOfDay, endOfDay, format, startOfMinute, addMinutes } from 'date-fns';
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { Location } from '@angular/common';
@@ -218,10 +218,11 @@ export class InspectInfoConfigComponent implements OnInit {
   }
 
   // 修改检查项目-确定
-  submitSelectDate({date, deptId, remark}){
+  submitSelectDate({date, endCheckTime, deptId, remark}){
     let postData = {
       id: this.coopData.inspect.id,
       yyTime: date || undefined,
+			endCheckTime: endCheckTime,
       execDeptId: deptId,
       remark,
     }
@@ -329,6 +330,21 @@ export class InspectInfoConfigComponent implements OnInit {
         if (data.status == 200) {
           let listOfData = data.list || [];
           listOfData.forEach(v => {
+						for(let i of v.inspects){
+							if(i.yyTime){
+								i.newTime = format(new Date(i.yyTime), 'MM-dd HH:mm')
+								if(i.endCheckTime){
+									i.newTime2 = format(new Date(i.endCheckTime), 'HH:mm')
+									i.yyEndTime = i.newTime + '--' + i.newTime2
+								}else{
+									// i.newTime = format(new Date(i.yyTime), 'yyyy-MM-dd HH:mm')
+									i.yyEndTime = i.newTime
+								}
+							}else{
+								i.newTime = null
+								i.newTime2 = null
+							}
+						}
             if(v.illnessState){
               v.illnessStateCopy = v.illnessState.id;
             }
@@ -403,7 +419,8 @@ export class InspectInfoConfigComponent implements OnInit {
         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,
+				endCheckTime: obj.inspectData.endCheckTime
+			}] || undefined,
     };
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,

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

@@ -4,7 +4,7 @@ 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 { startOfDay, endOfDay, format, startOfMinute, addMinutes } from 'date-fns';
 import { NzMessageService } from 'ng-zorro-antd';
 
 @Component({
@@ -45,8 +45,10 @@ export class InspectSearchComponent implements OnInit {
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   changeInpSubject = new Subject();
-
+	hosId:any = this.tool.getCurrentHospital().id; //当前院区
+	
   ngOnInit() {
+		this.getTaskType();
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchWorker(v);
     });
@@ -100,8 +102,60 @@ export class InspectSearchComponent implements OnInit {
   getAllHospital() {
     this.allHospital = [this.tool.getCurrentHospital()];
     this.searchCriteria.hospital = this.tool.getCurrentHospital().id;
-    this.getList(1);
   }
+	
+	//获取任务类型
+	 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] || {};
+					 this.getList(1);
+	       }
+	     });
+	 }
+	 
   // 查看标本历史记录
   historyPromptModalShow = false; //标本历史记录弹窗开关
   scode = ""; //查看历史记录携带
@@ -178,6 +232,19 @@ export class InspectSearchComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data["status"] == 200) {
+					data["list"].forEach(i =>{
+						if(i.yyTime){
+							i.newTime = format(new Date(i.yyTime), 'MM-dd HH:mm')
+							if(i.endCheckTime){
+								i.newTime2 = format(new Date(i.endCheckTime), 'HH:mm')
+								i.yyEndTime = i.newTime + '--' + i.newTime2
+							}else{
+								i.yyEndTime = i.newTime
+							}
+						}else{
+							i.yyEndTime = null
+						}
+					})
           this.listOfData = data["list"];
           this.listLength = data["totalNum"];
         }
@@ -222,7 +289,8 @@ export class InspectSearchComponent implements OnInit {
         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,
+				endCheckTime: obj.inspectData.endCheckTime
+			}] || undefined,
     };
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
@@ -252,10 +320,11 @@ export class InspectSearchComponent implements OnInit {
 
   // 修改检查项目-确定
   maskFlag: any = false;
-  submitSelectDate({date, deptId, remark, applyDeptId, patientDTO}){
+  submitSelectDate({date, endCheckTime, deptId, remark, applyDeptId, patientDTO}){
     let postData = {
       id: this.coopData.id,
       yyTime: date || undefined,
+			endCheckTime: endCheckTime,
       execDeptId: deptId,
       remark,
       applyDeptId,