消毒供应1

proxy.conf.json

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

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

@@ -1372,6 +1372,23 @@
                                         </form>
                                       </div>
                                     </div>
+                                    <!-- 工号 -->
+                                    <div
+                                      style="width: 100%; margin: 10px auto 0"
+                                      *ngIf="buildMsg.reserveUserSwitch == 1"
+                                    >
+                                      <p>工号：</p>
+                                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择" [(ngModel)]="account">
+                                        <ng-container *ngFor="let option of accountList">
+                                          <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
                                       style="width: 100%; margin: 10px auto 0"
@@ -3830,3 +3847,7 @@
 <!-- 手术中患者-送回苏醒区 -->
 <app-dialog-delete [delModal]="sendAwakeningRoomModal" (hideDelModalEvent)="hideSendAwakeningRoomModal()" [btnLoading]="sLoading2"
 (confirmDelEvent)="confirmSendAwakeningRoom($event)" [content]="sendAwakeningRoomInfo" [isChecked]="surgeryConfigs && surgeryConfigs.remandClean == 1" [isSelected]="surgeryCarryingCourse && (surgeryCarryingCourse.departmentStrategy.value == 2 || surgeryCarryingCourse.departmentStrategy.value == 3)" [isSelectedArr]="surgeryCarryingCourseDepts" [deptDisplay]="deptDisplay"></app-dialog-delete>
+
+<!-- 是否限制业务发起时间模态框 -->
+<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单"></app-dialog-delete>

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

@@ -98,6 +98,7 @@ export class HushijiandanComponent implements OnInit {
   osComponentRef10: OverlayScrollbarsComponent;
   othersListOptions: any;
   sortableTimer = null;
+  searchAccountSubject = new Subject(); //查工号防抖
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
   incidentSearchChangeSubject = new Subject(); //故障现象搜索防抖
@@ -164,6 +165,10 @@ export class HushijiandanComponent implements OnInit {
     this.currentDept.typeValue == 'surgery' && this.getSurgeryConfig();
     this.getSpecimenButton();
     //防抖
+    this.getAccountList();
+    this.searchAccountSubject.pipe(debounceTime(500)).subscribe((v:any) => {
+      this.getAccountList(v);
+    });
     this.searchTabInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getPatient(v);
     });
@@ -1224,6 +1229,35 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+  // 工号输入搜索
+  searchAccount(e) {
+    this.searchAccountSubject.next(e);
+  }
+
+  // 根据工号获取用户
+  account = null;
+  accountList = [];
+  isLoading:boolean = false;
+  getAccountList(key = ''): void {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      user: {
+        account: key,
+        hospital: {
+          id: this.currentHospital.id
+        }
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.accountList = data.list || [];
+      });
+  }
+
   // 目标科室输入搜索
   searchDept(type, msg, e) {
     this.getDeptList(type, msg, e);
@@ -1443,13 +1477,18 @@ export class HushijiandanComponent implements OnInit {
     }
     this.btnLoading3 = true;
     this.confirmPostData.workOrder.isAccompany = 0; //是否需要医护陪同检查
-    this.mainService
+    this.newOrderTimeFun(this.confirmPostData.workOrder.taskType.id, () => {
+      this.btnLoading3 = false;
+      this.cancel();
+    }, () => {
+      this.mainService
       .postCustom(
         "api",
         this.confirmYuyue ? "appointmentOrder" : "startOrder",
         this.confirmPostData
       )
       .subscribe((data) => {
+        this.message.remove(this.jdFlagId);
         this.btnLoading3 = false;
         this.cancel();
         if (data.status == 200) {
@@ -1483,6 +1522,7 @@ export class HushijiandanComponent implements OnInit {
           this.showPromptModal("创建", false, data.msg);
         }
       });
+    })
   }
   cancel() {
     this.confirmSub = false;
@@ -1568,6 +1608,7 @@ export class HushijiandanComponent implements OnInit {
       return { required: true };
     }
   };
+
   pickUpModal: boolean = false; //模态框
   pickUpInfo:string = '';
   pickUpItem: any = {};
@@ -1981,37 +2022,42 @@ export class HushijiandanComponent implements OnInit {
         }
       }
       postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
-      this.mainService
-      .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
-      .subscribe((data) => {
+      this.newOrderTimeFun(postData.workOrder.taskType.id, () => {
         this.hidePatientOrder();
-        if (data.status == 200) {
-          if(this.currentDept.typeValue == 'recovery'){
-            this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: postData.workOrder.patient.patientCode}).subscribe((resultData) => {
-              this.showPromptModal("创建", true, "");
-              this.goodsLis = [];
-              this.getOrderList();
-              this.getDeptTaskType();
-              this.getTodayNum();
-            });
-          }else{
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-            this.getTodayNum();
-          }
-        } else if (data.status == 100042) {
-          this.showPromptModal("创建", false, data.msg);
-          this.getPatient(this.tabSearchCont);
-        } else if (data.status == 1000033) {
-          //重复建单那策略
-          this.repeatMsg = data.msg;
-          this.showDelModal(postData, "transport", yuyue);
-        } else {
-          this.showPromptModal("创建", false, data.msg);
-        }
-      });
+      }, () => {
+        this.mainService
+          .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
+          .subscribe((data) => {
+            this.message.remove(this.jdFlagId);
+            this.hidePatientOrder();
+            if (data.status == 200) {
+              if(this.currentDept.typeValue == 'recovery'){
+                this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: postData.workOrder.patient.patientCode}).subscribe((resultData) => {
+                  this.showPromptModal("创建", true, "");
+                  this.goodsLis = [];
+                  this.getOrderList();
+                  this.getDeptTaskType();
+                  this.getTodayNum();
+                });
+              }else{
+                this.showPromptModal("创建", true, "");
+                this.goodsLis = [];
+                this.getOrderList();
+                this.getDeptTaskType();
+                this.getTodayNum();
+              }
+            } else if (data.status == 100042) {
+              this.showPromptModal("创建", false, data.msg);
+              this.getPatient(this.tabSearchCont);
+            } else if (data.status == 1000033) {
+              //重复建单那策略
+              this.repeatMsg = data.msg;
+              this.showDelModal(postData, "transport", yuyue);
+            } else {
+              this.showPromptModal("创建", false, data.msg);
+            }
+          });
+      })
     }
   }
   // 是否需要护士医生陪同模态框
@@ -2032,91 +2078,106 @@ export class HushijiandanComponent implements OnInit {
     this.accompanyLoading = true;
     if (this.accompanyType == "patient") {
       //患者列表直接建单
-      this.mainService
-      .postCustom(
-        "api",
-        this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-        this.accompanyPostData
-      )
-      .subscribe((data) => {
+      this.newOrderTimeFun(this.accompanyPostData.workOrder.taskType.id, () => {
         this.hidePatientOrder();
         this.accompanyModal = false;
         this.accompanyLoading = false;
-        if (data.status == 200) {
-          if(this.currentDept.typeValue == 'recovery'){
-            this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+      }, () => {
+        this.mainService
+        .postCustom(
+          "api",
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+          this.accompanyPostData
+        )
+        .subscribe((data) => {
+          this.message.remove(this.jdFlagId);
+          this.hidePatientOrder();
+          this.accompanyModal = false;
+          this.accompanyLoading = false;
+          if (data.status == 200) {
+            if(this.currentDept.typeValue == 'recovery'){
+              this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+                this.showPromptModal("创建", true, "");
+                this.goodsLis = [];
+                this.getOrderList();
+                this.getDeptTaskType();
+                this.getTodayNum();
+              });
+            }else{
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
-            });
-          }else{
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-            this.getTodayNum();
+            }
+          } else if (data.status == 100042) {
+            this.showPromptModal("创建", false, data.msg);
+            this.getPatient(this.tabSearchCont);
+          } else if (data.status == 1000033) {
+            //重复建单那策略
+            this.repeatMsg = data.msg;
+            this.showDelModal(
+              this.accompanyPostData,
+              "accompany1",
+              this.accompanyYuyue
+            );
+          } else {
+            this.showPromptModal("创建", false, data.msg);
           }
-        } else if (data.status == 100042) {
-          this.showPromptModal("创建", false, data.msg);
-          this.getPatient(this.tabSearchCont);
-        } else if (data.status == 1000033) {
-          //重复建单那策略
-          this.repeatMsg = data.msg;
-          this.showDelModal(
-            this.accompanyPostData,
-            "accompany1",
-            this.accompanyYuyue
-          );
-        } else {
-          this.showPromptModal("创建", false, data.msg);
-        }
-      });
+        });
+      })
     } else if (this.accompanyType == "patient-yy") {
       //患者列表预约建单
-      this.mainService
-      .postCustom(
-        "api",
-        this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-        this.accompanyPostData
-      )
-      .subscribe((data) => {
+      this.newOrderTimeFun(this.accompanyPostData.workOrder.taskType.id, () => {
         this.btnLoading3 = false;
         this.accompanyModal = false;
         this.accompanyLoading = false;
         this.cancel();
-        if (data.status == 200) {
-          if(this.currentDept.typeValue == 'recovery'){
-            this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+      }, () => {
+        this.mainService
+        .postCustom(
+          "api",
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+          this.accompanyPostData
+        )
+        .subscribe((data) => {
+          this.message.remove(this.jdFlagId);
+          this.btnLoading3 = false;
+          this.accompanyModal = false;
+          this.accompanyLoading = false;
+          this.cancel();
+          if (data.status == 200) {
+            if(this.currentDept.typeValue == 'recovery'){
+              this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+                this.showPromptModal("创建", true, "");
+                this.goodsLis = [];
+                this.getOrderList();
+                this.getDeptTaskType();
+                this.getTodayNum();
+              });
+            }else{
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
-            });
-          }else{
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-            this.getTodayNum();
+            }
+          } else if (data.status == 100042) {
+            this.showPromptModal("创建", false, data.msg);
+            this.getPatient(this.tabSearchCont);
+          } else if (data.status == 1000033) {
+            //重复建单那策略
+            this.repeatMsg = data.msg;
+            this.showDelModal(
+              this.accompanyPostData,
+              "accompany2",
+              this.accompanyYuyue
+            );
+          } else {
+            this.showPromptModal("创建", false, data.msg);
           }
-        } else if (data.status == 100042) {
-          this.showPromptModal("创建", false, data.msg);
-          this.getPatient(this.tabSearchCont);
-        } else if (data.status == 1000033) {
-          //重复建单那策略
-          this.repeatMsg = data.msg;
-          this.showDelModal(
-            this.accompanyPostData,
-            "accompany2",
-            this.accompanyYuyue
-          );
-        } else {
-          this.showPromptModal("创建", false, data.msg);
-        }
-      });
+        });
+      })
     }
   }
 
@@ -2131,94 +2192,109 @@ export class HushijiandanComponent implements OnInit {
     this.cancenlLoading = true;
     if (this.accompanyType == "patient") {
       //患者列表直接建单
-      this.mainService
-      .postCustom(
-        "api",
-        this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-        this.accompanyPostData
-      )
-      .subscribe((data) => {
+      this.newOrderTimeFun(this.accompanyPostData.workOrder.taskType.id, () => {
         this.hidePatientOrder();
         this.accompanyModal = false;
         this.cancenlLoading = false;
-        if (data.status == 200) {
-          if(this.currentDept.typeValue == 'recovery'){
-            this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
-              this.showPromptModal("创建", true, "");
-              this.goodsLis = [];
-              this.getOrderList();
-              this.getDeptTaskType();
-              this.getTodayNum();
-            });
-          }else{
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-            this.getTodayNum();
-          }
-        } else if (data.status == 100042) {
-          this.showPromptModal("创建", false, data.msg);
-          this.getPatient(this.tabSearchCont);
-        } else if (data.status == 1000033) {
-          //重复建单那策略
-          this.repeatMsg = data.msg;
-          this.showDelModal(
-            this.accompanyPostData,
-            "accompany3",
-            this.accompanyYuyue
-          );
-        } else {
-          this.showPromptModal("创建", false, data.msg);
-        }
-      });
+      }, () => {
+        this.mainService
+          .postCustom(
+            "api",
+            this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+            this.accompanyPostData
+          )
+          .subscribe((data) => {
+            this.message.remove(this.jdFlagId);
+            this.hidePatientOrder();
+            this.accompanyModal = false;
+            this.cancenlLoading = false;
+            if (data.status == 200) {
+              if(this.currentDept.typeValue == 'recovery'){
+                this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+                  this.showPromptModal("创建", true, "");
+                  this.goodsLis = [];
+                  this.getOrderList();
+                  this.getDeptTaskType();
+                  this.getTodayNum();
+                });
+              }else{
+                this.showPromptModal("创建", true, "");
+                this.goodsLis = [];
+                this.getOrderList();
+                this.getDeptTaskType();
+                this.getTodayNum();
+              }
+            } else if (data.status == 100042) {
+              this.showPromptModal("创建", false, data.msg);
+              this.getPatient(this.tabSearchCont);
+            } else if (data.status == 1000033) {
+              //重复建单那策略
+              this.repeatMsg = data.msg;
+              this.showDelModal(
+                this.accompanyPostData,
+                "accompany3",
+                this.accompanyYuyue
+              );
+            } else {
+              this.showPromptModal("创建", false, data.msg);
+            }
+          });
+      })
     } else if (this.accompanyType == "patient-yy") {
       //患者列表预约建单
-      this.mainService
-      .postCustom(
-        "api",
-        this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-        this.accompanyPostData
-      )
-      .subscribe((data) => {
+      this.newOrderTimeFun(this.accompanyPostData.workOrder.taskType.id, () => {
         this.btnLoading3 = false;
         this.accompanyModal = false;
         this.cancenlLoading = false;
         this.cancel();
-        if (data.status == 200) {
-          if(this.currentDept.typeValue == 'recovery'){
-            this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
-              this.showPromptModal("创建", true, "");
-              this.goodsLis = [];
-              this.getOrderList();
-              this.getDeptTaskType();
-              this.getTodayNum();
-            });
-          }else{
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-            this.getTodayNum();
-          }
-        } else if (data.status == 100042) {
-          this.showPromptModal("创建", false, data.msg);
-          this.getPatient(this.tabSearchCont);
-        } else if (data.status == 1000033) {
-          //重复建单那策略
-          this.repeatMsg = data.msg;
-          this.showDelModal(
-            this.accompanyPostData,
-            "accompany4",
-            this.accompanyYuyue
-          );
-        } else {
-          this.showPromptModal("创建", false, data.msg);
-        }
-      });
+      }, () => {
+        this.mainService
+          .postCustom(
+            "api",
+            this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+            this.accompanyPostData
+          )
+          .subscribe((data) => {
+            this.message.remove(this.jdFlagId);
+            this.btnLoading3 = false;
+            this.accompanyModal = false;
+            this.cancenlLoading = false;
+            this.cancel();
+            if (data.status == 200) {
+              if(this.currentDept.typeValue == 'recovery'){
+                this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+                  this.showPromptModal("创建", true, "");
+                  this.goodsLis = [];
+                  this.getOrderList();
+                  this.getDeptTaskType();
+                  this.getTodayNum();
+                });
+              }else{
+                this.showPromptModal("创建", true, "");
+                this.goodsLis = [];
+                this.getOrderList();
+                this.getDeptTaskType();
+                this.getTodayNum();
+              }
+            } else if (data.status == 100042) {
+              this.showPromptModal("创建", false, data.msg);
+              this.getPatient(this.tabSearchCont);
+            } else if (data.status == 1000033) {
+              //重复建单那策略
+              this.repeatMsg = data.msg;
+              this.showDelModal(
+                this.accompanyPostData,
+                "accompany4",
+                this.accompanyYuyue
+              );
+            } else {
+              this.showPromptModal("创建", false, data.msg);
+            }
+          });
+      })
     }
   }
-  
+
   // 切换患者送检检查项目
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
   current_allowUrgent = false; //当前任务类型是否允许加急
@@ -2615,11 +2691,15 @@ export class HushijiandanComponent implements OnInit {
     let postData;
     that.buildType = "other";
     if (that.buildType == "other") {
+      let userAccount = null;
+      if(this.account){
+        userAccount = this.accountList.find(v => v.id == this.account);
+      }
       // 其他
       postData = {
         workOrder: {
           sourceId: SourceId.hushi,
-          workOrderRemark: this.workOrderRemark,
+          workOrderRemark: userAccount ? `${userAccount.account}-${userAccount.name}:${this.workOrderRemark}` : this.workOrderRemark,
           taskType: { id: that.shortcutMsg.id },
           createDept: that.loginUserDeptId,
           startDept: { id: that.buildMsg.startDept },
@@ -2643,9 +2723,13 @@ export class HushijiandanComponent implements OnInit {
       }
     }
     console.log(postData);
-    that.mainService
-      .postCustom("api", "startOrder", postData)
+    this.newOrderTimeFun(postData.workOrder.taskType.id, () => {
+      that.loading5 = false;
+    }, () => {
+      that.mainService
+      .postCustom("api", this.shortcutMsg.reserveSwitch == 1 && this.currentDept.typeValue != 'recovery' && this.currentDept.typeValue != 'surgery' ? "reserveOrder" :"startOrder", postData)
       .subscribe((data) => {
+        this.message.remove(this.jdFlagId);
         that.loading5 = false;
         if (data.status == 200 && that.buildType == "other") {
           that.showPromptModal("创建", true, "", "other");
@@ -2664,6 +2748,7 @@ export class HushijiandanComponent implements OnInit {
           that.showPromptModal("创建", false, data.msg);
         }
       });
+    })
   }
   // ======================start===============================
   // 快捷一键发起建单
@@ -2750,6 +2835,46 @@ export class HushijiandanComponent implements OnInit {
       return { required: true };
     }
   };
+  // 建单判断时间-护士端建单通用方法
+  newOrderTimeFun(taskTypeId, fun1, fun2){
+    if(this.currentDept.typeValue != 'recovery' && this.currentDept.typeValue != 'surgery'){
+      let maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+      this.mainService
+      .postCustom("api", "compareReserveDate", {taskTypeId})
+      .subscribe((data) => {
+        this.message.remove(maskFlag);
+        if(!data.data){
+          fun2.call(this);
+        }else{
+          fun1.call(this);
+          this.limitTimeModal = true;
+          this.limitTimeItem = {taskTypeId, fun1, fun2};
+          this.limitTimeInfo = data.data;
+        }
+      })
+    }else{
+      fun2.call(this);
+    }
+  }
+  limitTimeModal: boolean = false; //模态框
+  limitTimeInfo:string = '';
+  limitTimeItem: any = {};
+  hideLimitTimeModal() {
+    this.limitTimeModal = false;
+  }
+  // 确认
+  jdFlagId;
+  confirmLimitTime() {
+    console.log(this.limitTimeItem);
+    this.btnLoading = true;
+    this.limitTimeModal = false;
+    this.jdFlagId = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.limitTimeItem.fun2.call(this);
+  }
   // 一键发起建单保存
   confirmShortcut1() {
     var that = this;
@@ -2775,30 +2900,35 @@ export class HushijiandanComponent implements OnInit {
       };
     }
     console.log(postData);
-    that.mainService
-      .postCustom("api", "startOrder", postData)
-      .subscribe((data) => {
-        this.hideShortcutOrder();
-        console.log(that.buildType, data.status);
-        if (data.status == 200 && that.buildType == "other") {
-          that.showPromptModal("创建", true, "", "other");
-          this.getTodayNum();
-        } else if (data.status == 200 && that.buildType == "bb") {
-          that.showPromptModal("创建", true, "", "bb");
-          this.getTodayNum();
-        } else if (that.buildType == "bb" && data.status == 100043) {
-          that.showPromptModal("创建", true, data.msg);
-          this.getOrderList();
-          this.getSpecimenWorkOrderMsg();
-          this.getTodayNum();
-        } else if (data.status == 1000033) {
-          //重复建单那策略
-          this.repeatMsg = data.msg;
-          this.showDelModal(postData, "specimen");
-        } else {
-          that.showPromptModal("创建", false, data.msg);
-        }
-      });
+    this.newOrderTimeFun(postData.workOrder.taskType.id, () => {
+      this.hideShortcutOrder();
+    }, () => {
+      that.mainService
+        .postCustom("api", "startOrder", postData)
+        .subscribe((data) => {
+          this.message.remove(this.jdFlagId);
+          this.hideShortcutOrder();
+          console.log(that.buildType, data.status);
+          if (data.status == 200 && that.buildType == "other") {
+            that.showPromptModal("创建", true, "", "other");
+            this.getTodayNum();
+          } else if (data.status == 200 && that.buildType == "bb") {
+            that.showPromptModal("创建", true, "", "bb");
+            this.getTodayNum();
+          } else if (that.buildType == "bb" && data.status == 100043) {
+            that.showPromptModal("创建", true, data.msg);
+            this.getOrderList();
+            this.getSpecimenWorkOrderMsg();
+            this.getTodayNum();
+          } else if (data.status == 1000033) {
+            //重复建单那策略
+            this.repeatMsg = data.msg;
+            this.showDelModal(postData, "specimen");
+          } else {
+            that.showPromptModal("创建", false, data.msg);
+          }
+        });
+    });
   }
   repeatModal: boolean = false; //删除模态框
   repeatMsg = "";
@@ -2819,13 +2949,18 @@ export class HushijiandanComponent implements OnInit {
   confirmRepeat() {
     this.loadingRepeat = true;
     this.repeatPostData.tipsCreateOder = 1;
-    this.mainService
+    this.newOrderTimeFun(this.repeatPostData.workOrder.taskType.id, () => {
+      this.loadingRepeat = false;
+      this.repeatModal = false;
+    }, () => {
+      this.mainService
       .postCustom(
         "api",
         this.isYuyue ? "appointmentOrder" : "startOrder",
         this.repeatPostData
       )
       .subscribe((data) => {
+        this.message.remove(this.jdFlagId);
         this.loadingRepeat = false;
         this.repeatModal = false;
         if(this.currentDept.typeValue == 'recovery'){
@@ -2836,6 +2971,7 @@ export class HushijiandanComponent implements OnInit {
           this.confirmRepeatFun(data);
         }
       });
+    })
   }
   confirmRepeatFun(data){
     if (this.sourceType === "specimen") {

src/app/views/task-type-management/task-type-management.component.html

@@ -129,6 +129,13 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
+        <div class="mb8 w100" *ngIf="association.value == 'other'">
+          <nz-form-label class="label" nzRequired>是否需要填写工号</nz-form-label>
+          <nz-radio-group class="handlerType" [(ngModel)]="reserveUserSwitch" (ngModelChange)="isReserveUserSwitchChange()">
+            <label nz-radio nzValue='1'>是</label>
+            <label nz-radio nzValue='0'>否</label>
+          </nz-radio-group>
+        </div>
         <div class="mb8 w100" *ngIf="association.value == 'patientTransport' || association.value == 'inspect' || association.value == 'specimen' || association.value == 'other'">
           <nz-form-label class="label" nzRequired>是否需要备注信息</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="isRemarks" (ngModelChange)="isRemarksChange()">
@@ -232,6 +239,7 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
+        
         <div class="mb8 w100" *ngIf="association.value == 'other'">
           <nz-form-label class="label" nzRequired>是否预定工单</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="reserveSwitch">
@@ -239,13 +247,6 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
-        <div class="mb8 w100" *ngIf="association.value == 'other'">
-          <nz-form-label class="label" nzRequired>是否需要填写工号</nz-form-label>
-          <nz-radio-group class="handlerType" [(ngModel)]="reserveUserSwitch">
-            <label nz-radio nzValue='1'>是</label>
-            <label nz-radio nzValue='0'>否</label>
-          </nz-radio-group>
-        </div>
         <div class="mb8 w100">
           <nz-form-label class="label" nzRequired>是否限制业务发起时间</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="reserveType" (ngModelChange)="changeReserveType($event)">

src/app/views/task-type-management/task-type-management.component.ts

@@ -901,7 +901,7 @@ export class TaskTypeManagementComponent implements OnInit {
       !data.reserveType
         ? '1'
         : data.reserveType.value + ""; //是否限制业务发起时间
-    this.reserveDate =  data.reserveDate === undefined ? null : data.reserveDate; //是否限制业务发起时间-时间
+    this.reserveDate =  data.reserveDate === undefined ? null : new Date(data.reserveDate); //是否限制业务发起时间-时间
     this.reserveMsg =  data.reserveMsg === undefined ? '' : data.reserveMsg; //是否限制业务发起时间-提示
     // this.wechatFocusSwitch =
     //   data.wechatFocusSwitch === undefined ? "0" : data.wechatFocusSwitch + ""; //支助中心端是否能标记重点关注
@@ -1245,7 +1245,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.taskData.taskType.reserveSwitch = this.reserveSwitch === "1" ? 1 : 0; //是否预定工单
     this.taskData.taskType.reserveUserSwitch = this.reserveUserSwitch === "1" ? 1 : 0; //是否需要填写工号
     this.taskData.taskType.reserveType = this.reserveTypes.find(v => v.value == this.reserveType); //是否限制业务发起时间-字典
-    
+
     // 根据时间限制
     if(this.reserveType == '3'){
       this.taskData.taskType.reserveDate = this.reserveDate ? format(startOfSecond(this.reserveDate), 'yyyy-MM-dd HH:mm:ss') : undefined; //是否限制业务发起时间-时间
@@ -2561,6 +2561,13 @@ export class TaskTypeManagementComponent implements OnInit {
     }
   }
 
+   //修改是否需要填写工号
+   isReserveUserSwitchChange(){
+    if(this.reserveUserSwitch == '1'){
+      this.isRemarks = '1';
+    }
+  }
+
   // 修改是否支持多院区签到
   changeActionsSwitch(e){
     if(!e){