护士端加接口

proxy.conf.json

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

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

@@ -1443,7 +1443,15 @@ export class HushijiandanComponent implements OnInit {
     }
     this.btnLoading3 = true;
     this.confirmPostData.workOrder.isAccompany = 0; //是否需要医护陪同检查
-    this.mainService
+    if(this.currentDept.typeValue == 'recovery'){
+      this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.confirmPostData.workOrder.patient.patientCode}).subscribe((data) => {
+        confirmFun();
+      });
+    }else{
+      confirmFun();
+    }
+    function confirmFun(){
+      this.mainService
       .postCustom(
         "api",
         this.confirmYuyue ? "appointmentOrder" : "startOrder",
@@ -1473,6 +1481,7 @@ export class HushijiandanComponent implements OnInit {
           this.showPromptModal("创建", false, data.msg);
         }
       });
+    }
   }
   cancel() {
     this.confirmSub = false;
@@ -1971,29 +1980,38 @@ export class HushijiandanComponent implements OnInit {
         }
       }
       postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
-      that.mainService
-        .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
-        .subscribe((data) => {
-          that.hidePatientOrder();
-          if (data.status == 200) {
-            that.showPromptModal("创建", true, "");
-            that.goodsLis = [];
-            that.getOrderList();
-            that.getDeptTaskType();
-            that.getTodayNum();
-          } else if (data.status == 100042) {
-            that.showPromptModal("创建", false, data.msg);
-            this.getPatient(this.tabSearchCont);
-          } else if (data.status == 1000033) {
-            //重复建单那策略
-            this.repeatMsg = data.msg;
-            this.showDelModal(postData, "transport", yuyue);
-          } else {
-            that.showPromptModal("创建", false, data.msg);
-          }
+      if(this.currentDept.typeValue == 'recovery'){
+        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: postData.workOrder.patient.patientCode}).subscribe((data) => {
+          this.confirmPatientFun(yuyue, postData);
         });
+      }else{
+        this.confirmPatientFun(yuyue, postData);
+      }
     }
   }
+  confirmPatientFun(yuyue, postData){
+    this.mainService
+    .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
+    .subscribe((data) => {
+      this.hidePatientOrder();
+      if (data.status == 200) {
+        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);
+      }
+    });
+  }
   // 是否需要护士医生陪同模态框
   accompanyModal: boolean = false;
   accompanyLoading: boolean = false;
@@ -2012,73 +2030,91 @@ 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.hidePatientOrder();
-          this.accompanyModal = false;
-          this.accompanyLoading = false;
-          if (data.status == 200) {
-            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);
-          }
+      if(this.currentDept.typeValue == 'recovery'){
+        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((data) => {
+          this.confirmAccompanyFun();
         });
+      }else{
+        this.confirmAccompanyFun();
+      }
     } else if (this.accompanyType == "patient-yy") {
       //患者列表预约建单
-      this.mainService
-        .postCustom(
-          "api",
-          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-          this.accompanyPostData
-        )
-        .subscribe((data) => {
-          this.btnLoading3 = false;
-          this.accompanyModal = false;
-          this.accompanyLoading = false;
-          this.cancel();
-          if (data.status == 200) {
-            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);
-          }
+      if(this.currentDept.typeValue == 'recovery'){
+        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((data) => {
+          this.confirmAccompanyYYFun();
         });
+      }else{
+        this.confirmAccompanyYYFun();
+      }
     }
   }
+  confirmAccompanyFun(){
+    this.mainService
+    .postCustom(
+      "api",
+      this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+      this.accompanyPostData
+    )
+    .subscribe((data) => {
+      this.hidePatientOrder();
+      this.accompanyModal = false;
+      this.accompanyLoading = false;
+      if (data.status == 200) {
+        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);
+      }
+    });
+  }
+  confirmAccompanyYYFun(){
+    this.mainService
+    .postCustom(
+      "api",
+      this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+      this.accompanyPostData
+    )
+    .subscribe((data) => {
+      this.btnLoading3 = false;
+      this.accompanyModal = false;
+      this.accompanyLoading = false;
+      this.cancel();
+      if (data.status == 200) {
+        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);
+      }
+    });
+  }
   hideAccompanyModal(e) {
     console.log(e);
     if (e === "x") {
@@ -2090,73 +2126,91 @@ 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.hidePatientOrder();
-          this.accompanyModal = false;
-          this.cancenlLoading = false;
-          if (data.status == 200) {
-            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);
-          }
+      if(this.currentDept.typeValue == 'recovery'){
+        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((data) => {
+          this.hideAccompanyModalFun();
         });
+      }else{
+        this.hideAccompanyModalFun();
+      }
     } else if (this.accompanyType == "patient-yy") {
       //患者列表预约建单
-      this.mainService
-        .postCustom(
-          "api",
-          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-          this.accompanyPostData
-        )
-        .subscribe((data) => {
-          this.btnLoading3 = false;
-          this.accompanyModal = false;
-          this.cancenlLoading = false;
-          this.cancel();
-          if (data.status == 200) {
-            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);
-          }
+      if(this.currentDept.typeValue == 'recovery'){
+        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((data) => {
+          this.hideAccompanyModalYYFun();
         });
+      }else{
+        this.hideAccompanyModalYYFun();
+      }
     }
   }
+  hideAccompanyModalFun(){
+    this.mainService
+    .postCustom(
+      "api",
+      this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+      this.accompanyPostData
+    )
+    .subscribe((data) => {
+      this.hidePatientOrder();
+      this.accompanyModal = false;
+      this.cancenlLoading = false;
+      if (data.status == 200) {
+        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);
+      }
+    });
+  }
+  hideAccompanyModalYYFun(){
+    this.mainService
+    .postCustom(
+      "api",
+      this.accompanyYuyue ? "appointmentOrder" : "startOrder",
+      this.accompanyPostData
+    )
+    .subscribe((data) => {
+      this.btnLoading3 = false;
+      this.accompanyModal = false;
+      this.cancenlLoading = false;
+      this.cancel();
+      if (data.status == 200) {
+        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; //当前任务类型是否允许加急
@@ -2757,7 +2811,15 @@ export class HushijiandanComponent implements OnInit {
   confirmRepeat() {
     this.loadingRepeat = true;
     this.repeatPostData.tipsCreateOder = 1;
-    this.mainService
+    if(this.currentDept.typeValue == 'recovery'){
+      this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.repeatPostData.workOrder.patient.patientCode}).subscribe((data) => {
+        confirmRepeatFun();
+      });
+    }else{
+      confirmRepeatFun();
+    }
+    function confirmRepeatFun(){
+      this.mainService
       .postCustom(
         "api",
         this.isYuyue ? "appointmentOrder" : "startOrder",
@@ -2882,6 +2944,7 @@ export class HushijiandanComponent implements OnInit {
           }
         }
       });
+    }
   }
   // =======================end=================================