护士端一键建单预约建单按钮和直接建单按钮按钮，调整为一个按钮

src/app/views/compre-statistics/compre-statistics.component.less

@@ -141,7 +141,6 @@
             .checkBox {
               position: absolute;
               right: 16px;
-              z-index: 9999;
             }
 
             .more {

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

@@ -770,7 +770,6 @@
       </div>
       <div>
         <form nz-form [formGroup]="patientForm" class="patientForm">
-
           <nz-form-item class="datesControl">
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="checkedType">任务类型</nz-form-label>
             <nz-form-control nzErrorTip="请选择任务类型!" class="checkedType">
@@ -803,33 +802,50 @@
               </nz-form-control>
               <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
             </nz-form-item>
+            <!-- 需要预约检查 -->
+            <nz-form-item>
+              <nz-form-control>
+                <label nz-checkbox
+                  [nzDisabled]="!linkCheckLisTrue&&currentTasktype.associationType.value === 'inspect'||linkCheckLisTrue&&allowUrgent==1&&currentTasktype.associationType.value === 'inspect'||allowUrgent==1&&currentTasktype.associationType.value ==='patientTransport'"
+                  [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)"
+                  [ngModelOptions]="{standalone: true}">需要预约检查</label>
+              </nz-form-control>
+            </nz-form-item>
             <!-- 预约建单时间-患者其他服务 -->
-            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTimeZy&&clickYYZyFlag}"
-              *ngIf="appointmentZyBuildFlag === '1'&&allowUrgent==0">
+            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:(!yyTimeZy||!yyDateZy)&&clickYYZyFlag}"
+              *ngIf="currentTasktype.associationType.value === 'patientTransport'">
               <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
               <nz-form-control [nzSm]="24" [nzXs]="24">
-                <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 *ngIf="yyTimeZy" nz-checkbox [(ngModel)]="nextDayZy" (ngModelChange)="nextDayZyChange($event)"
-                  class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
+                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" [ngModelOptions]="{standalone: true}"
+                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy"></nz-date-picker>
+                <nz-time-picker [nzDisabled]="!isYyInspect" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
+                  [nzSecondStep]="60" [(ngModel)]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)"
+                  [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
+                  [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
+                </nz-time-picker>
+                <button [disabled]="!isYyInspect||(isYyInspect&&!(yyDateZy&&yyTimeZy))" nz-button nzType="primary"
+                  class="ml8" (click)="nextDayZy()">下一日</button>
               </nz-form-control>
-              <div class="red w100" *ngIf="!yyTimeZy&&clickYYZyFlag">请填写预约建单时间!</div>
+              <div class="red w100" *ngIf="(!yyTimeZy||!yyDateZy)&&clickYYZyFlag">请填写预约建单时间!</div>
               <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
             </nz-form-item>
             <!-- 预约建单时间 -->
-            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTime&&clickYYFlag}"
-              *ngIf="linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0">
+            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:(!yyTime||!yyDate)&&clickYYFlag}"
+              *ngIf="currentTasktype.associationType.value === 'inspect'">
               <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
               <nz-form-control [nzSm]="24" [nzXs]="24">
-                <nz-date-picker [(ngModel)]="date" (ngModelChange)="onChange($event)"></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 *ngIf="yyTime" nz-checkbox [(ngModel)]="nextDay" (ngModelChange)="nextDayChange($event)"
-                  class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
+                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" [ngModelOptions]="{standalone: true}"
+                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate">
+                </nz-date-picker>
+                <nz-time-picker [nzDisabled]="!isYyInspect" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
+                  [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)"
+                  [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
+                  [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
+                </nz-time-picker>
+                <button [disabled]="!isYyInspect||(isYyInspect&&!(yyDate&&yyTime))" nz-button nzType="primary"
+                  class="ml8" (click)="nextDay()">下一日</button>
               </nz-form-control>
-              <div class="red w100" *ngIf="!yyTime&&clickYYFlag">请填写预约建单时间!</div>
+              <div class="red w100" *ngIf="(!yyTime||!yyDate)&&clickYYFlag">请填写预约建单时间!</div>
               <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
             </nz-form-item>
             <!-- 100009 科室任务类型状态码未配置 -->
@@ -856,7 +872,6 @@
             <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
             <nz-form-item
               *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100014||checkedShowMsg.status==100015)">
-              <!-- <nz-form-item> -->
               <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
               <nz-form-control nzErrorTip="请选择目标科室!">
                 <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false"
@@ -889,7 +904,8 @@
             <nz-form-item *ngIf="current_allowUrgent">
               <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
               <nz-form-control>
-                <nz-radio-group [(ngModel)]="allowUrgent" formControlName="allowUrgent">
+                <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)"
+                  formControlName="allowUrgent">
                   <label nz-radio nzValue="1">是</label>
                   <label nz-radio nzValue="0">否</label>
                 </nz-radio-group>
@@ -908,13 +924,9 @@
       </div>
     </overlay-scrollbars>
     <div class="btns display_flex justify-content_flex-center">
-      <button *ngIf="linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0" nz-button
-        nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')">预约建单</button>
-      <button *ngIf="appointmentZyBuildFlag === '1'&&allowUrgent==0" nz-button nzType="primary"
-        [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')">预约建单</button>
-      <button
-        *ngIf="((checkedShowMsg.data&&linkCheckLisTrue)||(!checkedShowMsg.data&&!linkCheckLisTrue))&&((allowUrgent == 1 && urgentReason.trim() !== '')||allowUrgent == 0)"
-        nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis">直接建单</button>
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')" *ngIf="currentTasktype.associationType.value === 'inspect'&&isYyInspect">预约建单</button>
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')" *ngIf="currentTasktype.associationType.value === 'patientTransport'&&isYyInspect">预约建单</button>
+      <button nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis" *ngIf="!isYyInspect">直接建单</button>
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">取消</button>
     </div>
   </div>

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

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

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

@@ -23,7 +23,14 @@ import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
-import { format, getMinutes, setMinutes, setSeconds, addDays } from "date-fns";
+import {
+  format,
+  getMinutes,
+  setMinutes,
+  setSeconds,
+  addDays,
+  differenceInCalendarDays,
+} from "date-fns";
 // 日期禁用
 function range(start: number, end: number): number[] {
   const result: number[] = [];
@@ -83,7 +90,7 @@ export class HushijiandanComponent implements OnInit {
   sortableTimer = null;
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
-  timeDefaultValue = setSeconds(new Date(), 0);
+  isYyInspect = false; //需要预约检查
   constructor(
     private message: NzMessageService,
     private fb: FormBuilder,
@@ -231,8 +238,9 @@ export class HushijiandanComponent implements OnInit {
   recentInfoNum = 0;
   isRemand = true; //自动送回
   yyTime = null; //预约时间-患者列表
-  yyTimeInspect = null; //预约时间-检查列表
   yyTimeZy = null; //预约时间-患者列表-患者其他服务
+  yyDate = null; //预约日期-陪检
+  yyDateZy = null; //预约日期-转运
   getRecentInfo(patientCode) {
     this.recentInfo = "";
     clearTimeout(this.recentInfoTimer);
@@ -693,6 +701,24 @@ export class HushijiandanComponent implements OnInit {
     if (!this.deptTaskTypeRules.openInspection) return;
     this.searchTabInpSubject.next(e);
   }
+  // 下一日(陪检)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+    this.yyTime = addDays(this.yyTime, 1);
+  }
+  // 下一日(转运)
+  nextDayZy() {
+    this.yyDateZy = addDays(this.yyDateZy, 1);
+    this.yyTimeZy = addDays(this.yyTimeZy, 1);
+  }
+  // 禁用日期(陪检)
+  disabledyyDate = (current: Date): boolean => {
+    return differenceInCalendarDays(current, new Date()) < 0;
+  };
+  // 禁用日期(转运)
+  disabledyyDateZy = (current: Date): boolean => {
+    return differenceInCalendarDays(current, new Date()) < 0;
+  };
 
   // 一键建单确认弹框
   confirmSub: boolean = false;
@@ -858,8 +884,6 @@ export class HushijiandanComponent implements OnInit {
       if (getMinutes(this.yyTime) != 30) {
         this.yyTime = setMinutes(this.yyTime, 0);
       }
-    } else {
-      this.nextDay = false;
     }
     this.clickYYFlag = false;
   }
@@ -868,8 +892,6 @@ export class HushijiandanComponent implements OnInit {
       if (getMinutes(this.yyTimeZy) != 30) {
         this.yyTimeZy = setMinutes(this.yyTimeZy, 0);
       }
-    } else {
-      this.nextDayZy = false;
     }
     this.clickYYZyFlag = false;
   }
@@ -878,87 +900,6 @@ export class HushijiandanComponent implements OnInit {
     this.clickYYFlag = false;
     this.clickYYZyFlag = false;
   }
-  // 次日-陪检
-  nextDay = false;
-  nextDayChange(e) {
-    if (this.yyTime) {
-      if (e) {
-        this.yyTime = addDays(this.yyTime, 1);
-        this.disabledHours = () => [];
-        this.disabledMinutes = (hour) => [];
-      } else {
-        // this.yyTime = addDays(this.yyTime, -1);
-        this.yyTime = null;
-        this.disabledHours = () => {
-          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);
-          }
-        };
-        this.disabledMinutes = (hour) => {
-          let now = new Date();
-          let nHour = now.getHours();
-          let nMinute = now.getMinutes();
-          if (hour === nHour || hour === undefined) {
-            if (nMinute == 0) {
-              return [];
-            } else if (nMinute <= 30 && nMinute > 0) {
-              return [0];
-            } else {
-              return [0, 30];
-            }
-          } else {
-            return [];
-          }
-        };
-      }
-    }
-  }
-  // 次日-陪检
-  nextDayZy = false;
-  nextDayZyChange(e) {
-    if (this.yyTimeZy) {
-      if (e) {
-        this.yyTimeZy = addDays(this.yyTimeZy, 1);
-        this.disabledHours = () => [];
-        this.disabledMinutes = (hour) => [];
-      } else {
-        console.log("狗血");
-        // this.yyTimeZy = addDays(this.yyTimeZy, -1);
-        this.yyTimeZy = null;
-        this.disabledHours = () => {
-          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);
-          }
-        };
-        this.disabledMinutes = (hour) => {
-          let now = new Date();
-          let nHour = now.getHours();
-          let nMinute = now.getMinutes();
-          if (hour === nHour || hour === undefined) {
-            if (nMinute == 0) {
-              return [];
-            } else if (nMinute <= 30 && nMinute > 0) {
-              return [0];
-            } else {
-              return [0, 30];
-            }
-          } else {
-            return [];
-          }
-        };
-      }
-    }
-  }
   // 预约建单
   btnLoading1 = false;
   confirmPatient1(type) {
@@ -988,8 +929,8 @@ export class HushijiandanComponent implements OnInit {
     });
     //预约时间-患者陪检不能为空
     if (
-      (!this.yyTime && !flag && yuyue) ||
-      (!this.yyTimeZy && flag && yuyue === "patient-zy-yuyue")
+      (!this.yyTime && !this.yyDate && !flag && yuyue === "patient-yuyue") ||
+      (!this.yyTimeZy && !this.yyDateZy && flag && yuyue === "patient-zy-yuyue")
     ) {
       return;
     }
@@ -1273,11 +1214,10 @@ export class HushijiandanComponent implements OnInit {
   currentTasktype; //当前选中的任务类型对象
   cLoading = false;
   changeCheckedType() {
+    this.isYyInspect = false;
     this.linkCheckLisTrue = false;
     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
     );
@@ -1290,6 +1230,17 @@ export class HushijiandanComponent implements OnInit {
     if (appointmentZyBuildFlag.length) {
       this.appointmentZyBuildFlag =
         appointmentZyBuildFlag[0].appointmentOtherSwitch == 1 ? "1" : "0";
+      this.yyDateZy = new Date();
+      this.yyTimeZy = new Date();
+      if (this.yyTimeZy.getMinutes() >= 0 && this.yyTimeZy.getMinutes() <= 30) {
+        this.yyTimeZy.setMinutes(30);
+      } else if (
+        this.yyTimeZy.getMinutes() > 30 &&
+        this.yyTimeZy.getMinutes() < 60
+      ) {
+        this.yyTimeZy.setMinutes(0);
+        this.yyTimeZy.setHours(this.yyTimeZy.getHours() + 1);
+      }
     } else {
       this.appointmentZyBuildFlag = "0";
     }
@@ -1352,22 +1303,62 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+  // 需要预约建单-事件
+  yyInspectChange(e) {
+    if (this.filterLinkCheckLis.length) {
+      this.showDateTime();
+    } else {
+      this.yyTime = null;
+      this.yyDate = null;
+      console.log(this.isYyInspect);
+    }
+  }
+  //回显时间日期
+  showDateTime() {
+    //当前时间要大于生效时间
+    let isYyInspect = this.filterLinkCheckLis.every((item) => {
+      return (
+        new Date(item.yyTime).getTime() - new Date().getTime() >
+        this.leadTime * 60 * 1000
+      );
+    });
+    //如果勾选需要预约检查
+    if (isYyInspect) {
+      //筛选离当前时间最近的
+      let timeList = this.filterLinkCheckLis
+        .map((item) => new Date(item.yyTime).getTime())
+        .sort();
+      this.yyTime = new Date(timeList[0] - this.leadTime * 60 * 1000); //回显预约时间,需要减去生效时间
+      this.yyDate = new Date(timeList[0] - this.leadTime * 60 * 1000); //回显预约日期,需要减去生效时间
+    } else {
+      this.yyTime = null;
+      this.yyDate = null;
+    }
+  }
   // 患者送检检查项目-选择检查项目
   linkCheckLisTrue = false; //是否有已选择(患者)
   isInspectPriority = false; //选择的检查是否紧急(患者)
-  hasTime = false; //是否有已选择,并且是否有预约时间(患者)
-  lessTime = false; //预约时间列表中预约时间少于生效时长，则是false
+  filterLinkCheckLis = []; //有预约时间并且选中的
   linkCheckLisChange(e) {
     console.log(e, this.linkCheckLis);
     let flag = false; //检查是否紧急
     this.linkCheckLis.forEach((item) => {
-      e.forEach((v) => {
-        if (v.priority == 1) {
-          flag = true;
-        }
-        item.checked = v.value == item.value;
-      });
+      if (e.length) {
+        //有选中的检查
+        e.forEach((v) => {
+          //检查是否有紧急度
+          if (v.priority == 1) {
+            flag = true;
+          }
+          //选中的检查设置checked
+          item.checked = v.value == item.value;
+        });
+      } else {
+        item.checked = false;
+      }
     });
+
+    //检查有紧急度,则加急
     if (flag) {
       this.allowUrgent = "1";
       this.urgentReason = "系统根据检查信息，自动进行加急";
@@ -1376,40 +1367,45 @@ export class HushijiandanComponent implements OnInit {
       this.urgentReason = "";
     }
     this.clickYYFlag = false;
-    let linkCheckLis = this.linkCheckLis.filter(
+    // 有预约时间并且选中的
+    this.filterLinkCheckLis = this.linkCheckLis.filter(
       (item) => Boolean(item.yyTime) && item.checked
     );
-    this.lessTime = linkCheckLis.every((item) => {
-      return (
-        new Date(item.yyTime).getTime() - new Date().getTime() >
-        this.leadTime * 60 * 1000
-      );
-    });
-    //回显预约时间2021年5月10日
-    if (this.lessTime && linkCheckLis.length) {
-      let timeList = linkCheckLis
-        .map((item) => new Date(item.yyTime).getTime())
-        .sort();
-      this.yyTime = new Date(timeList[0] - this.leadTime * 60 * 1000);
+    //有预约时间并且选中的检查数组不为空
+    if (this.filterLinkCheckLis.length) {
+      //当前时间要大于生效时间
+      this.isYyInspect = this.filterLinkCheckLis.every((item) => {
+        return (
+          new Date(item.yyTime).getTime() - new Date().getTime() >
+          this.leadTime * 60 * 1000
+        );
+      });
+      this.showDateTime();
+    } else {
+      //有预约时间并且选中的检查数组为空
+      this.isYyInspect = false;
+      this.yyTime = null;
+      this.yyDate = null;
     }
     this.linkCheckLisTrue = e.length > 0;
     this.isInspectPriority = e.some((item) => item.priority == 1);
-    if (!this.linkCheckLisTrue) {
-      this.hasTime = false;
+  }
+  // 是否加急
+  allowUrgentChange(e) {
+    if (this.isYyInspect) {
+      this.isYyInspect = e == 0;
+      if (!this.isYyInspect) {
+        this.yyDate = null;
+        this.yyDateZy = null;
+        this.yyTime = null;
+        this.yyTimeZy = null;
+      }
     } else {
-      this.hasTime = this.linkCheckLis.some(
-        (item) => Boolean(item.yyTime) && item.checked
-      );
+      this.yyDate = null;
+      this.yyDateZy = null;
+      this.yyTime = null;
+      this.yyTimeZy = null;
     }
-    console.log(
-      this.linkCheckLisTrue,
-      this.hasTime,
-      this.lessTime,
-      this.appointmentBuildFlag,
-      this.allowUrgent,
-      this.isInspectPriority,
-      this.checkedShowMsg
-    );
   }
   // 禁用小时
   disabledHours(): number[] {