提交代码

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

@@ -135,6 +135,7 @@ 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;

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.ts

@@ -20,7 +20,9 @@ export class EditInspectInfo2Component implements OnInit {
   @Input() applyDept:any = {};
   @Input() patient:any = {};
   @Input() execDeptList:any;
+	@Input() extra1:any;
 	@Input() inspectAndPatientTransportConfig:any = {};
+	@Input() endCheckTime:any = null;
   @Output() submitFormHand = new EventEmitter();
   @Output() cancelFlagHand = new EventEmitter();
   yyDate = null; //预约日期-患者其他服务
@@ -65,7 +67,9 @@ export class EditInspectInfo2Component implements OnInit {
       this.yyDate = new Date(this.date);
       this.yyTime = new Date(this.date);
 			this.mdData = format(this.yyDate, 'yyyy-MM-dd')
-			this.setTimeData();
+			if(this.endCheckTime){
+				this.setTimeData();
+			}
     }
 
     if(this.execDeptList){
@@ -120,7 +124,7 @@ export class EditInspectInfo2Component implements OnInit {
 	// 设置结束时间
 	setTimeData(){
 		if(this.mdData && this.yyTime){
-			let num = this.execDeptList.extra1 ? Number(this.execDeptList.extra1) : undefined
+			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

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

@@ -857,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">

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

@@ -160,16 +160,16 @@ export class OrderDetailComponent implements OnInit {
       .getFetchData("api", "workOrder", this.id)
       .subscribe((data) => {
 				let obj = data.data
-				if(obj.yyTime){
-					obj.newTime = format(new Date(obj.yyTime), 'MM-dd HH:mm')
-					if(obj.endCheckTime){
-						obj.newTime2 = format(new Date(obj.endCheckTime), 'HH:mm')
-					}else{
-						obj.newTime2 = format(addMinutes(new Date(obj.yyTime), this.configObj.yytimeGapMinute), 'HH:mm')
-					}
-					obj.yyEndTime = obj.newTime + '--' + obj.newTime2
-				}else{
-					obj.yyEndTime = null
+				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) {

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

@@ -5635,16 +5635,17 @@ export class FuwutaiComponent implements OnInit {
           let arr = [];
           data.data.data.forEach((e) => {
 						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-						if(e.inspectCheckType.extra1){
-							e.newTime2 = format(addMinutes(new Date(e.yyTime), e.inspectCheckType.extra1), '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,
-              label: (e.newTime + '--' + e.newTime2 || "") + " " + 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,
@@ -7281,16 +7282,18 @@ export class FuwutaiComponent implements OnInit {
           let arr = [];
           data.data.data.forEach((e) => {
 						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-						if(e.inspectCheckType.extra1){
-							e.newTime2 = format(addMinutes(new Date(e.yyTime), e.inspectCheckType.extra1), '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,
-              label: (e.newTime + '--' + e.newTime2 || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName + '-' + e.inspectCode || "检查"),
+              label: (e.yyEndTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName?e.inspectName:'' + '-' + e.inspectCode || "检查"),
               value: e["id"],
               checked: false,
             });
@@ -7352,16 +7355,17 @@ export class FuwutaiComponent implements OnInit {
         let arr = [];
         data.data.data.forEach((e) => {
 					e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-					if(e.inspectCheckType.extra1){
-						e.newTime2 = format(addMinutes(new Date(e.yyTime), e.inspectCheckType.extra1), '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,
-            label: (e.newTime + '--' + e.newTime2 || "") + " " + 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.ts

@@ -3503,11 +3503,14 @@ export class HushijiandanComponent implements OnInit {
         if (data.status == 200 && data.data && data.data.length) {
           let arr = [];
           data.data.forEach((e) => {
+						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.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
+							e.yyEndTime = e.newTime
+							// e.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
 						}
 						arr.push({
 						  execDeptId: e.execDept.id,
@@ -3515,13 +3518,13 @@ export class HushijiandanComponent implements OnInit {
               priority: e.priority,
               manualCreate: e.manualCreate,
               label:
-                (e.newTime + '--' + e.newTime2 || "") +
+                (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,
@@ -5698,8 +5701,10 @@ export class HushijiandanComponent implements OnInit {
 						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.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
+							e.yyEndTime = e.newTime
 						}
             arr.push({
               execDeptId: e.execDept.id,
@@ -5707,13 +5712,13 @@ export class HushijiandanComponent implements OnInit {
               priority: e.priority,
               manualCreate: e.manualCreate,
               label:
-                (e.newTime + '--' + e.newTime2 || "") +
+                (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,

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

@@ -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,
     }
@@ -334,10 +335,11 @@ export class InspectInfoConfigComponent implements OnInit {
 								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.newTime2 = format(addMinutes(new Date(i.yyTime), this.configs.yytimeGapMinute), 'HH:mm')
+									// i.newTime = format(new Date(i.yyTime), 'yyyy-MM-dd HH:mm')
+									i.yyEndTime = i.newTime
 								}
-								i.yyEndTime = i.newTime + '--' + i.newTime2
 							}else{
 								i.newTime = null
 								i.newTime2 = null

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

@@ -237,10 +237,10 @@ export class InspectSearchComponent implements OnInit {
 							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.newTime2 = format(addMinutes(new Date(i.yyTime), this.configs.yytimeGapMinute), 'HH:mm')
+								i.yyEndTime = i.newTime
 							}
-							i.yyEndTime = i.newTime + '--' + i.newTime2
 						}else{
 							i.yyEndTime = null
 						}