合并代码

src/app/share/dialog-delete/dialog-delete.component.html

@@ -1,7 +1,7 @@
 <!-- 删除模态框 -->
 <div class="dialog-delete" *ngIf="delModal">
   <div class="modalBody">
-    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal()"></i></div>
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal('x')"></i></div>
     <div class="content">
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
       <div class="defeat">{{content}}</div>
@@ -9,7 +9,7 @@
     </div>
     <div class="operate">
       <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">{{confirmTxt}}</button>
-      <button class="btn cancel ml8" nz-button nzType="default" (click)="hideDelModal()" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
+      <button class="btn cancel ml8" nz-button nzType="default" (click)="hideDelModal('cancel')" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
     </div>
   </div>
 </div>

src/app/share/dialog-delete/dialog-delete.component.ts

@@ -20,8 +20,8 @@ export class DialogDeleteComponent implements OnInit {
   ngOnInit() {
   }
   // 隐藏
-  hideDelModal() {
-    this.hideDelModalEvent.emit();
+  hideDelModal(e:string) {
+    this.hideDelModalEvent.emit(e);
   }
   // 确认删除
   confirmDel() {

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

@@ -1208,6 +1208,6 @@
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
 <!-- 是否需要医护陪同检查模态框 -->
-<app-dialog-delete [delModal]="accompanyModal" (hideDelModalEvent)="hideAccompanyModal()"
+<app-dialog-delete [delModal]="accompanyModal" (hideDelModalEvent)="hideAccompanyModal($event)"
   [btnLoading]="accompanyLoading" [cancenlLoading]="cancenlLoading" (confirmDelEvent)="confirmAccompany()"
   confirmTxt="是" cancelTxt="否" content="您选择的患者是危重或特级护理或一级护理患者，请问是否需要医护陪同检查？"></app-dialog-delete>

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

@@ -663,21 +663,19 @@ export class HushijiandanComponent implements OnInit {
       );
     }
     //是否需要医护陪同检查
-    let isAccompany = false;
-    if (this.patientMsg.careLevel && !isAccompany) {
+    if (this.patientMsg.careLevel && this.currentTasktype.isAccompany == 1) {
       //特级护理或一级护理
       if (
         this.patientMsg.careLevel.value === "0" ||
         this.patientMsg.careLevel.value === "1"
       ) {
-        isAccompany = true;
         this.btnLoading = false;
         this.btnLoading1 = false;
         this.accompany(this.confirmPostData, this.confirmYuyue, "patient-yy");
         return;
       }
     }
-    if (this.patientMsg.illnessState && !isAccompany) {
+    if (this.patientMsg.illnessState && this.currentTasktype.isAccompany == 1) {
       //病危或病重
       if (
         this.patientMsg.illnessState.value === "2" ||
@@ -970,21 +968,22 @@ export class HushijiandanComponent implements OnInit {
         postData.workOrder["isRemand"] = this.isRemand ? 1 : 0;
       }
       //是否需要医护陪同检查
-      let isAccompany = false;
-      if (this.patientMsg.careLevel && !isAccompany) {
+      if (this.patientMsg.careLevel && this.currentTasktype.isAccompany == 1) {
         //特级护理或一级护理
         if (
           this.patientMsg.careLevel.value === "0" ||
           this.patientMsg.careLevel.value === "1"
         ) {
-          isAccompany = true;
           this.btnLoading = false;
           this.btnLoading1 = false;
           this.accompany(postData, yuyue, "patient");
           return;
         }
       }
-      if (this.patientMsg.illnessState && !isAccompany) {
+      if (
+        this.patientMsg.illnessState &&
+        this.currentTasktype.isAccompany == 1
+      ) {
         //病危或病重
         if (
           this.patientMsg.illnessState.value === "2" ||
@@ -1077,7 +1076,13 @@ export class HushijiandanComponent implements OnInit {
         });
     }
   }
-  hideAccompanyModal() {
+  hideAccompanyModal(e) {
+    console.log(e);
+    if (e === "x") {
+      //关闭
+      this.accompanyModal = false;
+      return;
+    }
     this.accompanyPostData.workOrder.isAccompany = 0;
     this.cancenlLoading = true;
     if (this.accompanyType == "patient") {
@@ -1130,9 +1135,13 @@ export class HushijiandanComponent implements OnInit {
   // 切换患者送检检查项目
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
   current_allowUrgent = false; //当前任务类型是否允许加急
+  currentTasktype; //当前选中的任务类型对象
   changeCheckedType() {
     this.clickYYFlag = false;
     this.clickYYZyFlag = false;
+    this.currentTasktype = this.checkTypeLis.find(
+      (item) => item.id == this.patientForm.controls.checkedType.value
+    );
     // 获取患者其他服务，护士端是否预约建单
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
       (item) =>