预约建单时间的选择时间进行优化

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

@@ -732,7 +732,7 @@
           </nz-form-item>
           <!-- 检查 -->
           <nz-form-item *ngIf="checkedShowMsg.status==200">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
             <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
               <nz-checkbox-group class="linkCheckCheck" formControlName="linkCheck" [(ngModel)]="linkCheckLis"
                 (ngModelChange)="linkCheckLisChange()">
@@ -740,16 +740,16 @@
             </nz-form-control>
             <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
           </nz-form-item>
-          <!-- 预约时间-患者其他服务 -->
+          <!-- 预约建单时间-患者其他服务 -->
           <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTimeZy&&clickYYZyFlag}"
             *ngIf="appointmentZyBuildFlag === '1'&&allowUrgent==0">
             <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
             <nz-form-control [nzSm]="24" [nzXs]="24">
-              <nz-date-picker [nzShowToday]="false" nzFormat="yyyy-MM-dd HH:mm"
-                (nzOnOpenChange)="openYYTime($event,'parent-zy')" [nzDisabledDate]="disabledYYDate"
-                [nzDisabledTime]="disabledYYTime" [nzShowTime]="{nzDefaultOpenValue: timeDefaultValue}"
-                [ngModel]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{standalone: true}">
-              </nz-date-picker>
+              <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTimeZy"
+                (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{standalone: true}"
+                [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
+              <label nz-checkbox [(ngModel)]="nextDayZy" (ngModelChange)="nextDayZyChange($event)" class="ml8"
+                [ngModelOptions]="{standalone: true}">次日</label>
             </nz-form-control>
             <div class="red w100" *ngIf="!yyTimeZy&&clickYYZyFlag">请填写预约建单时间!</div>
             <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
@@ -759,11 +759,11 @@
             *ngIf="linkCheckLis.length&&linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0">
             <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
             <nz-form-control [nzSm]="24" [nzXs]="24">
-              <nz-date-picker [nzShowToday]="false" nzFormat="yyyy-MM-dd HH:mm"
-                (nzOnOpenChange)="openYYTime($event,'parent')" [nzDisabledDate]="disabledYYDate"
-                [nzDisabledTime]="disabledYYTime" [nzShowTime]="{nzDefaultOpenValue: timeDefaultValue}"
-                [ngModel]="yyTime" (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{standalone: true}">
-              </nz-date-picker>
+              <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTime"
+                (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{standalone: true}"
+                [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
+              <label nz-checkbox [(ngModel)]="nextDay" (ngModelChange)="nextDayChange($event)" class="ml8"
+                [ngModelOptions]="{standalone: true}">次日</label>
             </nz-form-control>
             <div class="red w100" *ngIf="!yyTime&&clickYYFlag">请填写预约建单时间!</div>
             <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -9,7 +9,7 @@
     flex-direction: column;
   }
   .yyTimeError {
-    ::ng-deep .ant-calendar-picker-input {
+    ::ng-deep .ant-time-picker-input {
       border: 1px solid red !important;
     }
   }

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

@@ -23,8 +23,15 @@ import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
-import { differenceInCalendarDays, format, setSeconds } from "date-fns";
-
+import { format, getMinutes, setMinutes, setSeconds, addDays } from "date-fns";
+// 日期禁用
+function range(start: number, end: number): number[] {
+  const result: number[] = [];
+  for (let i = start; i < end; i++) {
+    result.push(i);
+  }
+  return result;
+}
 @Component({
   selector: "app-hushijiandan",
   templateUrl: "./hushijiandan.component.html",
@@ -655,12 +662,9 @@ export class HushijiandanComponent implements OnInit {
   confirmInfo: string = "";
   btnLoading3 = false;
   confirm() {
-    this.btnLoading3 = true;
     if (this.confirmYuyue) {
-      this.confirmPostData.workOrder.yyTime = format(
-        new Date(this.yyTime),
-        "yyyy-MM-dd HH:mm:ss"
-      );
+      this.confirmPostData.workOrder.yyTime =
+        format(new Date(this.yyTime), "yyyy-MM-dd HH:mm") + ":00";
     }
     //是否需要医护陪同检查
     if (this.patientMsg.careLevel && this.currentTasktype.isAccompany == 1) {
@@ -687,6 +691,7 @@ export class HushijiandanComponent implements OnInit {
         return;
       }
     }
+    this.btnLoading3 = true;
     this.confirmPostData.workOrder.isAccompany = 0; //是否需要医护陪同检查
     this.mainService
       .postCustom(
@@ -805,30 +810,44 @@ export class HushijiandanComponent implements OnInit {
       });
   }
   yyTimeChange(e) {
-    if (e) {
-      this.yyTime = format(e, "yyyy-MM-dd HH:mm") + ":00";
-      this.timeOperate(this.yyTime);
-    } else {
-      this.yyTime = null;
+    if (this.yyTime) {
+      if (getMinutes(this.yyTime) != 30) {
+        this.yyTime = setMinutes(this.yyTime, 0);
+      }
     }
     this.clickYYFlag = false;
-    this.openYYTime(true, "parent");
   }
   yyTimeZyChange(e) {
-    if (e) {
-      this.yyTimeZy = format(e, "yyyy-MM-dd HH:mm") + ":00";
-      this.timeOperate(this.yyTimeZy);
-    } else {
-      this.yyTimeZy = null;
+    if (this.yyTimeZy) {
+      if (getMinutes(this.yyTimeZy) != 30) {
+        this.yyTimeZy = setMinutes(this.yyTimeZy, 0);
+      }
     }
     this.clickYYZyFlag = false;
-    this.openYYTime(true, "parent-zy");
   }
   hidePatientOrder() {
     this.patientModal = false;
     this.clickYYFlag = false;
     this.clickYYZyFlag = false;
   }
+  // 次日-陪检
+  nextDay = false;
+  nextDayChange(e) {
+    if (e) {
+      this.yyTime = addDays(this.yyTime, 1);
+    } else {
+      this.yyTime = addDays(this.yyTime, -1);
+    }
+  }
+  // 次日-陪检
+  nextDayZy = false;
+  nextDayZyChange(e) {
+    if (e) {
+      this.yyTimeZy = addDays(this.yyTimeZy, 1);
+    } else {
+      this.yyTimeZy = addDays(this.yyTimeZy, -1);
+    }
+  }
   // 预约建单
   btnLoading1 = false;
   confirmPatient1(type) {
@@ -958,10 +977,8 @@ export class HushijiandanComponent implements OnInit {
         delete postData.workOrder["checkList"];
         // 添加预约时间
         if (yuyue) {
-          postData.workOrder.yyTime = format(
-            new Date(this.yyTimeZy),
-            "yyyy-MM-dd HH:mm:ss"
-          );
+          postData.workOrder.yyTime =
+            format(new Date(this.yyTimeZy), "yyyy-MM-dd HH:mm") + ":00";
         }
       }
       if (that.checkedShowMsg.status != 200) {
@@ -1139,6 +1156,8 @@ export class HushijiandanComponent implements OnInit {
   changeCheckedType() {
     this.clickYYFlag = false;
     this.clickYYZyFlag = false;
+    this.nextDay = false;
+    this.nextDayZy = false;
     this.currentTasktype = this.checkTypeLis.find(
       (item) => item.id == this.patientForm.controls.checkedType.value
     );
@@ -1236,10 +1255,7 @@ export class HushijiandanComponent implements OnInit {
       let timeList = linkCheckLis
         .map((item) => new Date(item.yyTime).getTime())
         .sort();
-      this.yyTime = format(
-        new Date(timeList[0] - this.leadTime * 60 * 1000),
-        "yyyy-MM-dd HH:mm"
-      );
+      this.yyTime = new Date(timeList[0] - this.leadTime * 60 * 1000);
     }
     this.linkCheckLisTrue = this.linkCheckLis.some((item) => item.checked);
     if (!this.linkCheckLisTrue) {
@@ -1250,90 +1266,34 @@ export class HushijiandanComponent implements OnInit {
       );
     }
   }
-  // 日期禁用
-  range(start: number, end: number): number[] {
-    const result: number[] = [];
-    for (let i = start; i < end; i++) {
-      result.push(i);
-    }
-    return result;
-  }
-  // 打开预约时间，选择日期时间
-  disabledYYDate;
-  disabledYYTime;
-  openYYTime(flag: boolean, type) {
-    if (flag) {
-      let dataTime = "";
-      if (type === "parent") {
-        if (this.yyTime) {
-          dataTime = format(new Date(this.yyTime), "yyyy-MM-dd HH:mm") + ":00";
-        } else {
-          dataTime = format(new Date(), "yyyy-MM-dd HH:mm") + ":00";
-          this.timeDefaultValue = setSeconds(new Date(), 0);
-        }
-      } else if (type === "inspect") {
-        if (this.yyTimeInspect) {
-          dataTime =
-            format(new Date(this.yyTimeInspect), "yyyy-MM-dd HH:mm") + ":00";
-        } else {
-          dataTime = format(new Date(), "yyyy-MM-dd HH:mm") + ":00";
-          this.timeDefaultValue = setSeconds(new Date(), 0);
-        }
-      } else if (type === "parent-zy") {
-        if (this.yyTimeZy) {
-          dataTime =
-            format(new Date(this.yyTimeZy), "yyyy-MM-dd HH:mm") + ":00";
-        } else {
-          dataTime = format(new Date(), "yyyy-MM-dd HH:mm") + ":00";
-          this.timeDefaultValue = setSeconds(new Date(), 0);
-        }
-      }
-      this.disabledYYDate = (current: Date): boolean => {
-        return differenceInCalendarDays(current, new Date()) < 0;
-      };
-      this.timeOperate(dataTime);
+  // 禁用小时
+  disabledHours(): number[] {
+    let now = new Date();
+    let nHour = now.getHours();
+    let nMinute = now.getMinutes();
+    if (nMinute > 30) {
+      return range(0, nHour + 1);
+    } else {
+      return range(0, nHour);
     }
   }
-  /**
-   * 时间处理，禁用时间
-   * @param dataTime 对比的时间 yyyy-MM-dd HH:mm:ss
-   */
-  timeOperate(dataTime) {
-    dataTime = dataTime.split(" ");
-    let nowTime = (format(new Date(), "yyyy-MM-dd HH:mm") + ":00").split(" "); //当前时间 [yyyy-MM-dd,HH:mm:ss]
-    console.log(dataTime, nowTime);
-    let hours, minutes;
-    if (dataTime[0] !== nowTime[0]) {
-      //年月日不同，则时分都可选
-      hours = [];
-      minutes = [];
-    } else {
-      //年月日相同
-      let dTimeArr = dataTime[1]
-        .split(":")
-        .map((item) => parseInt(item))
-        .slice(0, 2); //[时,分]
-      let nTimeArr = nowTime[1]
-        .split(":")
-        .map((item): any => parseInt(item))
-        .slice(0, 2); //[时,分]
-      if (dTimeArr[0] !== nTimeArr[0]) {
-        //时，不相同
-        hours = this.range(0, nTimeArr[0]);
-        minutes = [];
+  // 禁用分钟
+  disabledMinutes(hour: number): number[] {
+    let now = new Date();
+    let nHour = now.getHours();
+    let nMinute = now.getMinutes();
+    console.log(hour, nHour);
+    if (hour === nHour || hour === undefined) {
+      if (nMinute == 0) {
+        return [];
+      } else if (nMinute <= 30 && nMinute > 0) {
+        return [0];
       } else {
-        //时,相同
-        hours = this.range(0, nTimeArr[0]);
-        minutes = this.range(0, nTimeArr[1]);
+        return [0, 30];
       }
+    } else {
+      return [];
     }
-    this.disabledYYTime = () => {
-      return {
-        nzDisabledHours: () => hours,
-        nzDisabledMinutes: () => minutes,
-        nzDisabledSeconds: () => this.range(1, 60),
-      };
-    };
   }
 
   // 快捷一键发起建单
@@ -1863,6 +1823,7 @@ export class HushijiandanComponent implements OnInit {
       that.closeRecallOrderModal();
       if (data.status == 200) {
         that.getOrderList();
+        that.changeInfo();
         that.showPromptModal("撤销", true, "");
       } else {
         that.showPromptModal("撤销", false, data.msg);