检查页面控制增加预约时间精准控制

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.4.240",
+    "target": "http://192.168.4.170",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -404,12 +404,9 @@
           <div
             class="nurseTitle display_flex justify-content_space-between align-items_center"
           >
-            <span
-              >护士端<span class="todayNum"
-                >当日建单数：{{ todayNum }}</span
-              ></span
-            >
+            <span>护士端<span class="todayNum">当日建单数：{{ todayNum }}</span></span>
             <p class="updateTipsForNurses red">{{ updateTipsForNurses }}</p>
+            <span class="todayNum">等待陪检：<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中：<span class="red">{{queuingInformationList[1]}}</span></span>
             <div class="nurseCode" (click)="showNurseCode()">
               <i class="nurseCodeIcon icon_transport transport-erweima"></i
               >二维码
@@ -2617,7 +2614,7 @@
                     [nzDisabled]="!isYyInspect || !yyDateZy"
                     class="ml8"
                     nzFormat="HH:mm"
-                    [nzMinuteStep]="30"
+                    [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
                     [nzSecondStep]="60"
                     [(ngModel)]="yyTimeZy"
                     (ngModelChange)="yyTimeZyChange($event)"
@@ -2671,7 +2668,7 @@
                     [nzDisabled]="!isYyInspect || !yyDate"
                     class="ml8"
                     nzFormat="HH:mm"
-                    [nzMinuteStep]="30"
+                    [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
                     [nzSecondStep]="60"
                     [(ngModel)]="yyTime"
                     (ngModelChange)="yyTimeChange($event)"

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

@@ -102,6 +102,7 @@ export class HushijiandanComponent implements OnInit {
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
   incidentSearchChangeSubject = new Subject(); //故障现象搜索防抖
   isYyInspect = false; //需要预约检查
+  inspectAndPatientTransportConfig:any = {timeMod: 30};
   constructor(
     private message: NzMessageService,
     private fb: FormBuilder,
@@ -155,6 +156,7 @@ export class HushijiandanComponent implements OnInit {
       }
     });
     this.getItsmIncident();
+    this.getInspectAndPatientTransportConfigTasktype();
     this.getUpdateTipsForNurses();
     this.getCloseTimeFlag();
     this.currentDept = this.tool.getCurrentUserDept();
@@ -427,6 +429,69 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+  //获取检查页面任务类型
+  getInspectAndPatientTransportConfigTasktype() {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskType: {
+        simpleQuery: true,
+        hosId: {
+          id: this.currentHospital.id
+        },
+        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);
+        }
+      });
+  }
+  // 获取检查页面信息配置
+  getInspectAndPatientTransportConfig(tasktype) {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.currentHospital.id
+          },
+          associationType: tasktype.associationType
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.inspectAndPatientTransportConfig = result.list[0] || {};
+
+          // 是否显示排队信息
+          if(this.inspectAndPatientTransportConfig.queuingInformation == 1){
+            this.getQueuingInformation();
+          }
+        }
+      });
+  }
+  // 获取排队信息
+  queuingInformationList:any[] = [];
+  getQueuingInformation() {
+    this.mainService
+      .coopWorkerOrder("queuingInformation", {})
+      .subscribe((result) => {
+        if(result.status == 200){
+          this.queuingInformationList = result.datalist || [];
+        }
+      });
+  }
   // 获取护士端更新提示
   updateTipsForNurses = "";
   getUpdateTipsForNurses() {
@@ -443,7 +508,7 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
-  // 获取护士端更新提示
+  // 获取标本按钮
   specimenButton = "";
   getSpecimenButton() {
     if(this.currentDept.typeValue == 'surgery'){
@@ -597,7 +662,7 @@ export class HushijiandanComponent implements OnInit {
         let now = new Date();
         let nHour = now.getHours();
         let nMinute = now.getMinutes();
-        if (nMinute > 30) {
+        if (nMinute > (60 - this.inspectAndPatientTransportConfig.timeMod)) {
           return range(0, nHour + 1);
         } else {
           return range(0, nHour);
@@ -609,13 +674,7 @@ export class HushijiandanComponent implements OnInit {
         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];
-          }
+          return this.integralDivision(0, nMinute, this.inspectAndPatientTransportConfig.timeMod);
         } else {
           return [];
         }
@@ -1675,11 +1734,8 @@ export class HushijiandanComponent implements OnInit {
           return differenceInCalendarDays(current, new Date()) < 0;
         };
       }
-      if (getMinutes(this.yyTime) > 0 && getMinutes(this.yyTime) < 30) {
-        this.yyTime = setMinutes(this.yyTime, 30);
-      } else if (getMinutes(this.yyTime) > 30 && getMinutes(this.yyTime) < 60) {
-        this.yyTime = setMinutes(this.yyTime, 0);
-      }
+      let end = this.getLgNumber(getMinutes(this.yyTime), this.inspectAndPatientTransportConfig.timeMod);
+      this.yyTime = setMinutes(this.yyTime, end);
     }
     this.clickYYFlag = false;
   }
@@ -1696,17 +1752,22 @@ export class HushijiandanComponent implements OnInit {
           return differenceInCalendarDays(current, new Date()) < 0;
         };
       }
-      if (getMinutes(this.yyTimeZy) > 0 && getMinutes(this.yyTimeZy) < 30) {
-        this.yyTimeZy = setMinutes(this.yyTimeZy, 30);
-      } else if (
-        getMinutes(this.yyTimeZy) > 30 &&
-        getMinutes(this.yyTimeZy) < 60
-      ) {
-        this.yyTimeZy = setMinutes(this.yyTimeZy, 0);
-      }
+      let end = this.getLgNumber(getMinutes(this.yyTimeZy), this.inspectAndPatientTransportConfig.timeMod);
+      this.yyTimeZy = setMinutes(this.yyTimeZy, end);
     }
     this.clickYYZyFlag = false;
   }
+
+  // 获取大于x，并且是n的倍数的数字
+  getLgNumber(x: number, n:number): number{
+    for(let i = x; i < 60; i++){
+      if(i % n === 0){
+        return i;
+      }
+    }
+    return 0;
+  }
+
   hidePatientOrder() {
     this.patientModal = false;
     this.clickYYFlag = false;
@@ -2124,13 +2185,9 @@ export class HushijiandanComponent implements OnInit {
       console.log(this.appointmentZyBuildFlag, "seimin");
       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);
+      let end = this.getLgNumber(this.yyTimeZy.getMinutes(), this.inspectAndPatientTransportConfig.timeMod);
+      this.yyTimeZy.setMinutes(end);
+      if(end === 0){
         this.yyTimeZy.setHours(this.yyTimeZy.getHours() + 1);
       }
     } else {
@@ -2371,34 +2428,39 @@ export class HushijiandanComponent implements OnInit {
     }
   }
   // 禁用小时
-  disabledHours(): number[] {
+  disabledHours = (): number[] => {
     let now = new Date();
     let nHour = now.getHours();
     let nMinute = now.getMinutes();
-    if (nMinute > 30) {
+    if (nMinute > (60 - this.inspectAndPatientTransportConfig.timeMod)) {
       return range(0, nHour + 1);
     } else {
       return range(0, nHour);
     }
   }
   // 禁用分钟
-  disabledMinutes(hour: number): number[] {
+  disabledMinutes = (hour: number): number[] => {
     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];
-      }
+      return this.integralDivision(0, nMinute, this.inspectAndPatientTransportConfig.timeMod);
     } else {
       return [];
     }
   }
 
+  // start和end之间能被n整除的所有数字集合
+  integralDivision(start:number, end:number, n:number): number[]{
+    let arr = [];
+    for(let i = start; i <= end; i++){
+      if(i % n === 0){
+        arr.push(i);
+      }
+    }
+    return arr;
+  }
+
   // 快捷一键发起建单
   shortcutMsg; //一键发起信息
   buildMsg: any = {}; //一键发起返回信息

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

@@ -30,6 +30,24 @@
           <nz-form-label class="label">签到方式</nz-form-label>
           <nz-checkbox-group class="w320px" [(ngModel)]="checkInModes"></nz-checkbox-group>
         </div>
+        <!-- 检查预约时间是否精准填写 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">检查预约时间是否精准填写</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="accurateTimeFilling" (ngModelChange)="changeAccurateTimeFilling($event)"></nz-checkbox-group>
+          <nz-select *ngIf="accurateTimeFilling[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择精确时间模式" [(ngModel)]="timeMod">
+            <ng-container *ngFor="let option of timeModes">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <!-- 是否显示排队信息 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否显示排队信息</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="queuingInformation"></nz-checkbox-group>
+        </div>
         <!-- 多人模式支持 -->
         <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">多人模式支持</nz-form-label>

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

@@ -13,6 +13,21 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
+  // 检查预约时间是否精准填写-时间模式
+  timeModes:any[] = [
+    {id: 1, name: '每分钟'},
+    {id: 10, name: '每10分钟'},
+    {id: 30, name: '每30分钟'},
+  ];
+  // 是否开通送回病房
+  accurateTimeFilling:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否显示排队信息
+  queuingInformation:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  timeMod:any;
   // 交接方式
   // handoverMode:any;
   // handoverModes:any[] = [];
@@ -56,6 +71,14 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       this.integralCalculationMethod = null;
     }
   }
+  // 修改检查预约时间是否精准填写
+  changeAccurateTimeFilling(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.timeMod = null;
+    }
+  }
   //获取积分计算方式
   integralCalculationMethods:any = [];
   dLoading = false;
@@ -90,6 +113,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       this.msg.create("warning", "请选择积分计算方式！");
       return;
     }
+    if(this.accurateTimeFilling[0].checked && !this.timeMod){
+      this.msg.create("warning", "请选择精确时间模式！");
+      return;
+    }
     // if(!this.handoverMode){
     //   this.msg.create("warning", "请选择交接方式！");
     //   return;
@@ -106,6 +133,9 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       hosId: this.hosId,
       multiplayerMode: this.multiplayerMode[0].checked ? 1 : 0,
       integralCalculationMethod: this.multiplayerMode[0].checked ? this.integralCalculationMethod : undefined,
+      accurateTimeFilling: this.accurateTimeFilling[0].checked ? 1 : 0,
+      queuingInformation: this.queuingInformation[0].checked ? 1 : 0,
+      timeMod: this.timeMod || undefined,
       // autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
       // autoDept: this.autoDepts[0].checked ? 1 : 0,
       // handoverType: {id: this.handoverMode},
@@ -212,6 +242,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           }
           this.multiplayerMode[0].checked = this.configs.multiplayerMode == 1;
           this.integralCalculationMethod = this.configs.integralCalculationMethod;
+          this.accurateTimeFilling[0].checked = this.configs.accurateTimeFilling == 1;
+          this.timeMod = this.configs.timeMod || null;
+          this.queuingInformation[0].checked = this.configs.queuingInformation == 1;
+
 
           // if(this.configs.closeTypeIds){
           //   let ids = this.configs.closeTypeIds.split(',');