浏览代码

是否需要护士医生陪同

seimin 3 年之前
父节点
当前提交
f006da4882

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "/service": {
2
   "/service": {
3
-    "target": "http://192.168.3.87",
3
+    "target": "http://192.168.3.66",
4
     "logLevel": "debug",
4
     "logLevel": "debug",
5
     "changeOrigin": true,
5
     "changeOrigin": true,
6
     "pathRewrite": {
6
     "pathRewrite": {

+ 1 - 0
src/app/share/detail-patients/detail-patients.component.html

@@ -20,6 +20,7 @@
20
               <span *ngIf="i==orderInfo.endDepts.length-1">{{dep.dept}}</span>
20
               <span *ngIf="i==orderInfo.endDepts.length-1">{{dep.dept}}</span>
21
             </span>
21
             </span>
22
           </div>
22
           </div>
23
+          <div nz-col nzSpan="8">陪同情况:{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
23
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
24
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
24
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
25
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
25
             特殊情况关闭原因:{{orderInfo.specialCloseReason}}
26
             特殊情况关闭原因:{{orderInfo.specialCloseReason}}

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

@@ -8,8 +8,8 @@
8
       <div class="tips red" *ngIf="tips">({{tips}})</div>
8
       <div class="tips red" *ngIf="tips">({{tips}})</div>
9
     </div>
9
     </div>
10
     <div class="operate">
10
     <div class="operate">
11
-      <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">确认</button>
12
-      <button class="btn cancel ml8" nz-button nzType="default" (click)="hideDelModal()">取消</button>
11
+      <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">{{confirmTxt}}</button>
12
+      <button class="btn cancel ml8" nz-button nzType="default" (click)="hideDelModal()" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
13
     </div>
13
     </div>
14
   </div>
14
   </div>
15
 </div>
15
 </div>

+ 3 - 0
src/app/share/dialog-delete/dialog-delete.component.ts

@@ -9,9 +9,12 @@ export class DialogDeleteComponent implements OnInit {
9
   @Output() hideDelModalEvent = new EventEmitter<any>();
9
   @Output() hideDelModalEvent = new EventEmitter<any>();
10
   @Output() confirmDelEvent = new EventEmitter<any>();
10
   @Output() confirmDelEvent = new EventEmitter<any>();
11
   @Input() btnLoading: boolean = false;
11
   @Input() btnLoading: boolean = false;
12
+  @Input() cancenlLoading: boolean = false;
12
   @Input() delModal: boolean = false;
13
   @Input() delModal: boolean = false;
13
   @Input() content: string = '您确定要删除吗?';
14
   @Input() content: string = '您确定要删除吗?';
14
   @Input() tips: string = '';
15
   @Input() tips: string = '';
16
+  @Input() confirmTxt: string = '确定';
17
+  @Input() cancelTxt: string = '取消';
15
   constructor() { }
18
   constructor() { }
16
 
19
 
17
   ngOnInit() {
20
   ngOnInit() {

+ 10 - 6
src/app/share/order-detail/order-detail.component.html

@@ -18,8 +18,8 @@
18
           <div class="info" nz-row>
18
           <div class="info" nz-row>
19
             <div nz-col nzSpan="6">工单日期:{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
19
             <div nz-col nzSpan="6">工单日期:{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
20
             <div nz-col nzSpan="6">总耗时:{{orderInfo.showTimeNum}}</div>
20
             <div nz-col nzSpan="6">总耗时:{{orderInfo.showTimeNum}}</div>
21
-            <div nz-col nzSpan="8">申请类型:{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
22
-            <div nz-col nzSpan="4">支助人员信息:{{orderInfo.worker?orderInfo.worker.name:''}}</div>
21
+            <div nz-col nzSpan="6">申请类型:{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
22
+            <div nz-col nzSpan="6">支助人员信息:{{orderInfo.worker?orderInfo.worker.name:''}}</div>
23
           </div>
23
           </div>
24
           <div class="info" nz-row>
24
           <div class="info" nz-row>
25
             <div nz-col nzSpan="6">申请科室:{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
25
             <div nz-col nzSpan="6">申请科室:{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
@@ -27,7 +27,7 @@
27
             <div nz-col nzSpan="6">
27
             <div nz-col nzSpan="6">
28
               目标科室:{{endDepts}}
28
               目标科室:{{endDepts}}
29
             </div>
29
             </div>
30
-            <div nz-col nzSpan="8" *ngIf="orderInfo.urgentDetails">
30
+            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">
31
               加急状态:{{orderInfo.urgentDetails.checkStatus.name}}</div>
31
               加急状态:{{orderInfo.urgentDetails.checkStatus.name}}</div>
32
           </div>
32
           </div>
33
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
33
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
@@ -359,8 +359,8 @@
359
           <div class="info" nz-row>
359
           <div class="info" nz-row>
360
             <div nz-col nzSpan="6">工单日期:{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
360
             <div nz-col nzSpan="6">工单日期:{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
361
             <div nz-col nzSpan="6">总耗时:{{orderInfo.showTimeNum}}</div>
361
             <div nz-col nzSpan="6">总耗时:{{orderInfo.showTimeNum}}</div>
362
-            <div nz-col nzSpan="8">申请类型:{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
363
-            <div nz-col nzSpan="4">支助人员信息:{{orderInfo.worker?orderInfo.worker.name:''}}</div>
362
+            <div nz-col nzSpan="6">申请类型:{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
363
+            <div nz-col nzSpan="6">支助人员信息:{{orderInfo.worker?orderInfo.worker.name:''}}</div>
364
           </div>
364
           </div>
365
           <div class="info" nz-row>
365
           <div class="info" nz-row>
366
             <div nz-col nzSpan="6">申请科室:{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
366
             <div nz-col nzSpan="6">申请科室:{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
@@ -370,9 +370,13 @@
370
             <div nz-col nzSpan="6">
370
             <div nz-col nzSpan="6">
371
               目标科室:{{endDepts}}
371
               目标科室:{{endDepts}}
372
             </div>
372
             </div>
373
-            <div nz-col nzSpan="8" *ngIf="orderInfo.urgentDetails">加急状态:{{orderInfo.urgentDetails.checkStatus.name}}
373
+            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">加急状态:{{orderInfo.urgentDetails.checkStatus.name}}
374
             </div>
374
             </div>
375
           </div>
375
           </div>
376
+          <div class="info" nz-row>
377
+            <div nz-col nzSpan="6" *ngIf="orderInfo.isAccompany===1||orderInfo.isAccompany===0">
378
+              陪同情况:{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
379
+          </div>
376
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
380
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
377
             <div nz-col nzSpan="24" class="jiaji">加急原因:{{orderInfo.urgentDetails.urgentReason}}</div>
381
             <div nz-col nzSpan="24" class="jiaji">加急原因:{{orderInfo.urgentDetails.urgentReason}}</div>
378
           </div>
382
           </div>

+ 5 - 2
src/app/views/hushijiandan/hushijiandan.component.html

@@ -896,8 +896,7 @@
896
         [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')">预约建单</button>
896
         [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')">预约建单</button>
897
       <button
897
       <button
898
         *ngIf="!(checkedShowMsg.status==200&&!linkCheckLis.length)&&linkCheckLisTrue&&((allowUrgent == 1 && urgentReason.trim() !== '')||allowUrgent == 0)"
898
         *ngIf="!(checkedShowMsg.status==200&&!linkCheckLis.length)&&linkCheckLisTrue&&((allowUrgent == 1 && urgentReason.trim() !== '')||allowUrgent == 0)"
899
-        nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()"
900
-        class="orderThis">{{linkCheckLis.length&&linkCheckLisTrue?'直接建单':'确定'}}</button>
899
+        nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis">直接建单</button>
901
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">取消</button>
900
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">取消</button>
902
     </div>
901
     </div>
903
   </div>
902
   </div>
@@ -1335,3 +1334,7 @@
1335
 <router-outlet></router-outlet>
1334
 <router-outlet></router-outlet>
1336
 <!-- 遮罩 -->
1335
 <!-- 遮罩 -->
1337
 <app-mask *ngIf="maskFlag"></app-mask>
1336
 <app-mask *ngIf="maskFlag"></app-mask>
1337
+<!-- 是否需要医护陪同检查模态框 -->
1338
+<app-dialog-delete [delModal]="accompanyModal" (hideDelModalEvent)="hideAccompanyModal()"
1339
+  [btnLoading]="accompanyLoading" [cancenlLoading]="cancenlLoading" (confirmDelEvent)="confirmAccompany()"
1340
+  confirmTxt="是" cancelTxt="否" content="您选择的患者是危重或特级护理或一级护理患者,请问是否需要医护陪同检查?"></app-dialog-delete>

+ 249 - 9
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -722,6 +722,34 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
722
         "yyyy-MM-dd HH:mm:ss"
722
         "yyyy-MM-dd HH:mm:ss"
723
       );
723
       );
724
     }
724
     }
725
+    //是否需要医护陪同检查
726
+    let isAccompany = false;
727
+    if (this.patientMsg.careLevel && !isAccompany) {
728
+      //特级护理或一级护理
729
+      if (
730
+        this.patientMsg.careLevel.value === "0" ||
731
+        this.patientMsg.careLevel.value === "1"
732
+      ) {
733
+        isAccompany = true;
734
+        this.btnLoading = false;
735
+        this.btnLoading1 = false;
736
+        this.accompany(this.confirmPostData, this.confirmYuyue, "patient-yy");
737
+        return;
738
+      }
739
+    }
740
+    if (this.patientMsg.illnessState && !isAccompany) {
741
+      //病危或病重
742
+      if (
743
+        this.patientMsg.illnessState.value === "2" ||
744
+        this.patientMsg.illnessState.value === "3"
745
+      ) {
746
+        this.btnLoading = false;
747
+        this.btnLoading1 = false;
748
+        this.accompany(this.confirmPostData, this.confirmYuyue, "patient-yy");
749
+        return;
750
+      }
751
+    }
752
+    this.confirmPostData.workOrder.isAccompany = 0; //是否需要医护陪同检查
725
     this.mainService
753
     this.mainService
726
       .postCustom(
754
       .postCustom(
727
         "api",
755
         "api",
@@ -963,9 +991,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
963
         { id: that.checkedShowMsg.end.end.list[0].id },
991
         { id: that.checkedShowMsg.end.end.list[0].id },
964
       ];
992
       ];
965
     }
993
     }
966
-    // if (that.checkedShowMsg.status == 100013 || that.checkedShowMsg.status == 100012 || that.checkedShowMsg.status == 200) {
967
-    //   delete postData.workOrder['endDepts'];
968
-    // }
969
     let checkedArr = [];
994
     let checkedArr = [];
970
     let yy = false; //是否有预约时间
995
     let yy = false; //是否有预约时间
971
     if (
996
     if (
@@ -998,8 +1023,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
998
         urgentReason: that.urgentReason,
1023
         urgentReason: that.urgentReason,
999
       };
1024
       };
1000
     }
1025
     }
1001
-    console.log(postData);
1002
-    // return
1003
     if (
1026
     if (
1004
       yy &&
1027
       yy &&
1005
       that.checkedShowMsg.status == 200 &&
1028
       that.checkedShowMsg.status == 200 &&
@@ -1028,6 +1051,34 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
1028
       if (that.checkedShowMsg.status != 200) {
1051
       if (that.checkedShowMsg.status != 200) {
1029
         postData.workOrder["isRemand"] = this.isRemand ? 1 : 0;
1052
         postData.workOrder["isRemand"] = this.isRemand ? 1 : 0;
1030
       }
1053
       }
1054
+      //是否需要医护陪同检查
1055
+      let isAccompany = false;
1056
+      if (this.patientMsg.careLevel && !isAccompany) {
1057
+        //特级护理或一级护理
1058
+        if (
1059
+          this.patientMsg.careLevel.value === "0" ||
1060
+          this.patientMsg.careLevel.value === "1"
1061
+        ) {
1062
+          isAccompany = true;
1063
+          this.btnLoading = false;
1064
+          this.btnLoading1 = false;
1065
+          this.accompany(postData, yuyue, "patient");
1066
+          return;
1067
+        }
1068
+      }
1069
+      if (this.patientMsg.illnessState && !isAccompany) {
1070
+        //病危或病重
1071
+        if (
1072
+          this.patientMsg.illnessState.value === "2" ||
1073
+          this.patientMsg.illnessState.value === "3"
1074
+        ) {
1075
+          this.btnLoading = false;
1076
+          this.btnLoading1 = false;
1077
+          this.accompany(postData, yuyue, "patient");
1078
+          return;
1079
+        }
1080
+      }
1081
+      postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
1031
       that.mainService
1082
       that.mainService
1032
         .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
1083
         .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
1033
         .subscribe((data) => {
1084
         .subscribe((data) => {
@@ -1045,7 +1096,169 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
1045
         });
1096
         });
1046
     }
1097
     }
1047
   }
1098
   }
1048
-
1099
+  // 是否需要护士医生陪同模态框baba
1100
+  accompanyModal: boolean = false;
1101
+  accompanyLoading: boolean = false;
1102
+  cancenlLoading: boolean = false;
1103
+  accompanyPostData = null;
1104
+  accompanyYuyue;
1105
+  accompanyType = "";
1106
+  accompany(postData, yuyue, type) {
1107
+    this.accompanyModal = true;
1108
+    this.accompanyPostData = postData;
1109
+    this.accompanyYuyue = yuyue;
1110
+    this.accompanyType = type;
1111
+  }
1112
+  confirmAccompany() {
1113
+    this.accompanyPostData.workOrder.isAccompany = 1;
1114
+    this.accompanyLoading = true;
1115
+    if (this.accompanyType == "patient") {
1116
+      //患者列表直接建单
1117
+      this.mainService
1118
+        .postCustom(
1119
+          "api",
1120
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
1121
+          this.accompanyPostData
1122
+        )
1123
+        .subscribe((data) => {
1124
+          this.hidePatientOrder();
1125
+          this.accompanyModal = false;
1126
+          this.accompanyLoading = false;
1127
+          if (data.status == 200) {
1128
+            this.showPromptModal("创建", true, "");
1129
+            this.goodsLis = [];
1130
+            this.getOrderList();
1131
+            this.getDeptTaskType();
1132
+          } else if (data.status == 100042) {
1133
+            this.showPromptModal("创建", true, data.msg);
1134
+          } else {
1135
+            this.showPromptModal("创建", false, data.msg);
1136
+          }
1137
+        });
1138
+    } else if (this.accompanyType == "patient-yy") {
1139
+      //患者列表预约建单
1140
+      this.mainService
1141
+        .postCustom(
1142
+          "api",
1143
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
1144
+          this.accompanyPostData
1145
+        )
1146
+        .subscribe((data) => {
1147
+          this.btnLoading3 = false;
1148
+          this.accompanyModal = false;
1149
+          this.accompanyLoading = false;
1150
+          this.cancel();
1151
+          if (data.status == 200) {
1152
+            this.showPromptModal("创建", true, "");
1153
+            this.goodsLis = [];
1154
+            this.getOrderList();
1155
+            this.getDeptTaskType();
1156
+          } else {
1157
+            this.showPromptModal("创建", false, data.msg);
1158
+          }
1159
+        });
1160
+    } else if (this.accompanyType == "inspect") {
1161
+      this.mainService
1162
+        .postCustom(
1163
+          "api",
1164
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
1165
+          this.accompanyPostData
1166
+        )
1167
+        .subscribe((data) => {
1168
+          this.hideInspectionOrder();
1169
+          this.accompanyModal = false;
1170
+          this.accompanyLoading = false;
1171
+          if (data.status == 200) {
1172
+            this.showPromptModal("创建", true, "");
1173
+            this.goodsLis = [];
1174
+            this.getOrderList();
1175
+            this.getDeptTaskType();
1176
+          } else if (data.status == 100042) {
1177
+            this.showPromptModal("创建", true, data.msg);
1178
+            this.goodsLis = [];
1179
+            this.getOrderList();
1180
+            this.getDeptTaskType();
1181
+          } else {
1182
+            this.showPromptModal("创建", false, data.msg);
1183
+          }
1184
+        });
1185
+    }
1186
+  }
1187
+  hideAccompanyModal() {
1188
+    this.accompanyPostData.workOrder.isAccompany = 0;
1189
+    this.cancenlLoading = true;
1190
+    if (this.accompanyType == "patient") {
1191
+      //患者列表直接建单
1192
+      this.mainService
1193
+        .postCustom(
1194
+          "api",
1195
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
1196
+          this.accompanyPostData
1197
+        )
1198
+        .subscribe((data) => {
1199
+          this.hidePatientOrder();
1200
+          this.accompanyModal = false;
1201
+          this.cancenlLoading = false;
1202
+          if (data.status == 200) {
1203
+            this.showPromptModal("创建", true, "");
1204
+            this.goodsLis = [];
1205
+            this.getOrderList();
1206
+            this.getDeptTaskType();
1207
+          } else if (data.status == 100042) {
1208
+            this.showPromptModal("创建", true, data.msg);
1209
+          } else {
1210
+            this.showPromptModal("创建", false, data.msg);
1211
+          }
1212
+        });
1213
+    } else if (this.accompanyType == "patient-yy") {
1214
+      //患者列表预约建单
1215
+      this.mainService
1216
+        .postCustom(
1217
+          "api",
1218
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
1219
+          this.accompanyPostData
1220
+        )
1221
+        .subscribe((data) => {
1222
+          this.btnLoading3 = false;
1223
+          this.accompanyModal = false;
1224
+          this.cancenlLoading = false;
1225
+          this.cancel();
1226
+          if (data.status == 200) {
1227
+            this.showPromptModal("创建", true, "");
1228
+            this.goodsLis = [];
1229
+            this.getOrderList();
1230
+            this.getDeptTaskType();
1231
+          } else {
1232
+            this.showPromptModal("创建", false, data.msg);
1233
+          }
1234
+        });
1235
+    } else if (this.accompanyType == "inspect") {
1236
+      this.mainService
1237
+        .postCustom(
1238
+          "api",
1239
+          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
1240
+          this.accompanyPostData
1241
+        )
1242
+        .subscribe((data) => {
1243
+          this.hideInspectionOrder();
1244
+          this.accompanyModal = false;
1245
+          this.cancenlLoading = false;
1246
+          if (data.status == 200) {
1247
+            this.showPromptModal("创建", true, "");
1248
+            this.goodsLis = [];
1249
+            this.getOrderList();
1250
+            this.getDeptTaskType();
1251
+          } else if (data.status == 100042) {
1252
+            this.showPromptModal("创建", true, data.msg);
1253
+            this.goodsLis = [];
1254
+            this.getOrderList();
1255
+            this.getDeptTaskType();
1256
+          } else {
1257
+            this.showPromptModal("创建", false, data.msg);
1258
+          }
1259
+        });
1260
+    }
1261
+  }
1049
   // 切换患者送检检查项目
1262
   // 切换患者送检检查项目
1050
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
1263
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
1051
   // checkedShowFlag: any;//切换到患者检查
1264
   // checkedShowFlag: any;//切换到患者检查
@@ -1268,7 +1481,7 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
1268
         .slice(0, 2); //[时,分]
1481
         .slice(0, 2); //[时,分]
1269
       let nTimeArr = nowTime[1]
1482
       let nTimeArr = nowTime[1]
1270
         .split(":")
1483
         .split(":")
1271
-        .map((item):any => parseInt(item))
1484
+        .map((item): any => parseInt(item))
1272
         .slice(0, 2); //[时,分]
1485
         .slice(0, 2); //[时,分]
1273
       if (dTimeArr[0] !== nTimeArr[0]) {
1486
       if (dTimeArr[0] !== nTimeArr[0]) {
1274
         //时,不相同
1487
         //时,不相同
@@ -1461,8 +1674,35 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
1461
         "yyyy-MM-dd HH:mm:ss"
1674
         "yyyy-MM-dd HH:mm:ss"
1462
       );
1675
       );
1463
     }
1676
     }
1464
-    console.log(postData);
1465
-    // return
1677
+    console.log(this.inspectionInfo);
1678
+    //是否需要医护陪同检查
1679
+    let isAccompany = false;
1680
+    if (this.inspectionInfo.careLevel && !isAccompany) {
1681
+      //特级护理或一级护理
1682
+      if (
1683
+        this.inspectionInfo.careLevel.value === "0" ||
1684
+        this.inspectionInfo.careLevel.value === "1"
1685
+      ) {
1686
+        isAccompany = true;
1687
+        this.btnLoading = false;
1688
+        this.btnLoading2 = false;
1689
+        this.accompany(postData, yuyue, "inspect");
1690
+        return;
1691
+      }
1692
+    }
1693
+    if (this.inspectionInfo.illnessState && !isAccompany) {
1694
+      //病危或病重
1695
+      if (
1696
+        this.inspectionInfo.illnessState.value === "2" ||
1697
+        this.inspectionInfo.illnessState.value === "3"
1698
+      ) {
1699
+        this.btnLoading = false;
1700
+        this.btnLoading2 = false;
1701
+        this.accompany(postData, yuyue, "inspect");
1702
+        return;
1703
+      }
1704
+    }
1705
+    postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
1466
     that.mainService
1706
     that.mainService
1467
       .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
1707
       .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
1468
       .subscribe((data) => {
1708
       .subscribe((data) => {

+ 4 - 3
src/app/views/round-robin-detail/round-robin-detail.component.html

@@ -17,7 +17,8 @@
17
           <div nz-col nzSpan="24">
17
           <div nz-col nzSpan="24">
18
             <div class="item display_flex align-items_flex-start">
18
             <div class="item display_flex align-items_flex-start">
19
               <span>执行策略</span>
19
               <span>执行策略</span>
20
-              <span>{{ userInfo.timePlan&&userInfo.timePlan.name }}{{userInfo.dayType == 0?'':'('+dayType[userInfo.dayType]+')'}}
20
+              <span>{{ userInfo.timePlan&&userInfo.timePlan.name }}{{userInfo.dayType ==
21
+                0?'':'('+dayType[userInfo.dayType]+')'}}
21
               </span>
22
               </span>
22
             </div>
23
             </div>
23
           </div>
24
           </div>
@@ -35,11 +36,11 @@
35
           </div>
36
           </div>
36
         </div>
37
         </div>
37
       </div>
38
       </div>
38
-      <div class="top display_flex justify-content_space-between align-items_center">
39
+      <!-- <div class="top display_flex justify-content_space-between align-items_center">
39
         <p class="roundRobinTips">提示:起点科室即为标本开通科室;执行人即为科室绑定人员设定;前往设置<a
40
         <p class="roundRobinTips">提示:起点科室即为标本开通科室;执行人即为科室绑定人员设定;前往设置<a
40
             [routerLink]="['/main','officeManagement']">开通科室</a>、<a [routerLink]="['/main','workAssignment']">工作分配</a>>>
41
             [routerLink]="['/main','officeManagement']">开通科室</a>、<a [routerLink]="['/main','workAssignment']">工作分配</a>>>
41
         </p>
42
         </p>
42
-      </div>
43
+      </div> -->
43
     </div>
44
     </div>
44
     <div class="display_flex justify-content_flex-center">
45
     <div class="display_flex justify-content_flex-center">
45
       <button class="know" nz-button nzType="primary" nzGhost (click)="hideModal()">知道了</button>
46
       <button class="know" nz-button nzType="primary" nzGhost (click)="hideModal()">知道了</button>

+ 8 - 0
src/app/views/task-type-management/task-type-management.component.html

@@ -183,6 +183,14 @@
183
             <label nz-radio nzValue='0'>否</label>
183
             <label nz-radio nzValue='0'>否</label>
184
           </nz-radio-group>
184
           </nz-radio-group>
185
         </div>
185
         </div>
186
+        <div class="mb8 w100"
187
+          *ngIf="association['id'] == 255||association['id'] == 260">
188
+          <nz-form-label class="label" nzRequired>是否需要医护陪同检查</nz-form-label>
189
+          <nz-radio-group class="handlerType" [(ngModel)]="isAccompany">
190
+            <label nz-radio nzValue='1'>是</label>
191
+            <label nz-radio nzValue='0'>否</label>
192
+          </nz-radio-group>
193
+        </div>
186
         <div nz-row *ngIf='carryShow&&(association.id == 260 || association.id == 255)'>
194
         <div nz-row *ngIf='carryShow&&(association.id == 260 || association.id == 255)'>
187
           <div nz-col nzSpan="5" class="label ml8">携带设备:</div>
195
           <div nz-col nzSpan="5" class="label ml8">携带设备:</div>
188
           <div nz-col nzSpan="18">
196
           <div nz-col nzSpan="18">

+ 41 - 46
src/app/views/task-type-management/task-type-management.component.ts

@@ -95,6 +95,7 @@ export class TaskTypeManagementComponent implements OnInit {
95
   appointmentBuildFlag = "0"; //护士端是否允许预约建单,患者陪检业务
95
   appointmentBuildFlag = "0"; //护士端是否允许预约建单,患者陪检业务
96
   appointmentBuildFlagZy = "0"; //护士端是否允许预约建单,患者其他服务
96
   appointmentBuildFlagZy = "0"; //护士端是否允许预约建单,患者其他服务
97
   followFlag = "0"; //护士端是否能标记重点关注
97
   followFlag = "0"; //护士端是否能标记重点关注
98
+  isAccompany = "0"; //是否需要医护陪同检查
98
   wechatFocusSwitch = "0"; //支助中心端是否能标记重点关注
99
   wechatFocusSwitch = "0"; //支助中心端是否能标记重点关注
99
   isRemarks: any = "0"; //是否需要备注信息(其他类型)
100
   isRemarks: any = "0"; //是否需要备注信息(其他类型)
100
   remarks = ""; //备注信息提示用语(其他类型)
101
   remarks = ""; //备注信息提示用语(其他类型)
@@ -739,9 +740,13 @@ export class TaskTypeManagementComponent implements OnInit {
739
     this.appointmentBuildFlag =
740
     this.appointmentBuildFlag =
740
       data.appointmentSwitch === undefined ? "0" : data.appointmentSwitch + ""; //护士端是否允许预约建单,患者陪检业务
741
       data.appointmentSwitch === undefined ? "0" : data.appointmentSwitch + ""; //护士端是否允许预约建单,患者陪检业务
741
     this.appointmentBuildFlagZy =
742
     this.appointmentBuildFlagZy =
742
-      data.appointmentOtherSwitch === undefined ? "0" : data.appointmentOtherSwitch + ""; //护士端是否允许预约建单,患者其他服务
743
+      data.appointmentOtherSwitch === undefined
744
+        ? "0"
745
+        : data.appointmentOtherSwitch + ""; //护士端是否允许预约建单,患者其他服务
743
     this.followFlag =
746
     this.followFlag =
744
       data.focusSwitch === undefined ? "0" : data.focusSwitch + ""; //护士端是否能标记重点关注
747
       data.focusSwitch === undefined ? "0" : data.focusSwitch + ""; //护士端是否能标记重点关注
748
+    this.isAccompany =
749
+      data.isAccompany === undefined ? "0" : data.isAccompany + ""; //是否需要医护陪同检查
745
     this.wechatFocusSwitch =
750
     this.wechatFocusSwitch =
746
       data.wechatFocusSwitch === undefined ? "0" : data.wechatFocusSwitch + ""; //支助中心端是否能标记重点关注
751
       data.wechatFocusSwitch === undefined ? "0" : data.wechatFocusSwitch + ""; //支助中心端是否能标记重点关注
747
     this.leadTime =
752
     this.leadTime =
@@ -914,9 +919,8 @@ export class TaskTypeManagementComponent implements OnInit {
914
       }
919
       }
915
     }
920
     }
916
 
921
 
917
-    this.taskData.taskType[
918
-      "integralDetailedRules"
919
-    ] = this.integralDetailedRulesData;
922
+    this.taskData.taskType["integralDetailedRules"] =
923
+      this.integralDetailedRulesData;
920
     this.taskData.taskType["carryingCourses"] = this.carryingCourses;
924
     this.taskData.taskType["carryingCourses"] = this.carryingCourses;
921
     if (this.carryEquipmentIds.length > 0) {
925
     if (this.carryEquipmentIds.length > 0) {
922
       this.taskData.taskType["carryEquipmentIds"] = [];
926
       this.taskData.taskType["carryEquipmentIds"] = [];
@@ -964,15 +968,13 @@ export class TaskTypeManagementComponent implements OnInit {
964
     }
968
     }
965
     this.taskData.taskType["specialCloseButton"] = this.specialCloseButton;
969
     this.taskData.taskType["specialCloseButton"] = this.specialCloseButton;
966
     if (this.departmentStrategy.id) {
970
     if (this.departmentStrategy.id) {
967
-      this.taskData.taskType.carryingCourses[
968
-        this.indexs
969
-      ].departmentStrategy = this.departmentStrategy;
971
+      this.taskData.taskType.carryingCourses[this.indexs].departmentStrategy =
972
+        this.departmentStrategy;
970
     }
973
     }
971
     if (!this.departments || !this.departments.length) {
974
     if (!this.departments || !this.departments.length) {
972
       if (this.departmentIds) {
975
       if (this.departmentIds) {
973
-        this.taskData.taskType.carryingCourses[
974
-          this.indexs
975
-        ].departmentIds = this.departmentIds;
976
+        this.taskData.taskType.carryingCourses[this.indexs].departmentIds =
977
+          this.departmentIds;
976
       }
978
       }
977
       if (this.departmentTypeIds) {
979
       if (this.departmentTypeIds) {
978
         this.taskData.taskType.carryingCourses[this.indexs].deptTypeId = {
980
         this.taskData.taskType.carryingCourses[this.indexs].deptTypeId = {
@@ -981,9 +983,8 @@ export class TaskTypeManagementComponent implements OnInit {
981
       }
983
       }
982
     }
984
     }
983
     if (this.checkoutMethod.id) {
985
     if (this.checkoutMethod.id) {
984
-      this.taskData.taskType.carryingCourses[
985
-        this.indexs
986
-      ].checkoutMethod = this.checkoutMethod;
986
+      this.taskData.taskType.carryingCourses[this.indexs].checkoutMethod =
987
+        this.checkoutMethod;
987
     }
988
     }
988
     if (this.createRuleConfiguration.length > 0) {
989
     if (this.createRuleConfiguration.length > 0) {
989
       this.createRuleConfiguration.forEach((item) => {
990
       this.createRuleConfiguration.forEach((item) => {
@@ -1036,15 +1037,15 @@ export class TaskTypeManagementComponent implements OnInit {
1036
     this.taskData.taskType.appointmentTime =
1037
     this.taskData.taskType.appointmentTime =
1037
       this.appointmentBuildFlag === "1" ? Number(this.leadTime) : 0; //生效时间
1038
       this.appointmentBuildFlag === "1" ? Number(this.leadTime) : 0; //生效时间
1038
     this.taskData.taskType.focusSwitch = this.followFlag === "1" ? 1 : 0; //护士端重点关注开关
1039
     this.taskData.taskType.focusSwitch = this.followFlag === "1" ? 1 : 0; //护士端重点关注开关
1040
+    this.taskData.taskType.isAccompany = this.isAccompany === "1" ? 1 : 0; //是否需要医护陪同检查
1039
     this.taskData.taskType.wechatFocusSwitch =
1041
     this.taskData.taskType.wechatFocusSwitch =
1040
       this.wechatFocusSwitch === "1" ? 1 : 0; //支助中心端重点关注开关
1042
       this.wechatFocusSwitch === "1" ? 1 : 0; //支助中心端重点关注开关
1041
     this.taskData.taskType.remarksSwitch = this.isRemarks === "1" ? 1 : 0; //是否需要备注信息
1043
     this.taskData.taskType.remarksSwitch = this.isRemarks === "1" ? 1 : 0; //是否需要备注信息
1042
     this.taskData.taskType.remarksPrompts = this.remarks; //备注信息提示用语
1044
     this.taskData.taskType.remarksPrompts = this.remarks; //备注信息提示用语
1043
     this.taskData.taskType.customRemarks = this.quickRemarks; //备注快速输入
1045
     this.taskData.taskType.customRemarks = this.quickRemarks; //备注快速输入
1044
     if (this.addEndDeptIds.length) {
1046
     if (this.addEndDeptIds.length) {
1045
-      this.taskData.taskType.carryingCourses[0].addEndDeptIds = this.addEndDeptIds.join(
1046
-        ","
1047
-      ); //自动(手动)建单追加终点科室
1047
+      this.taskData.taskType.carryingCourses[0].addEndDeptIds =
1048
+        this.addEndDeptIds.join(","); //自动(手动)建单追加终点科室
1048
       this.taskData.taskType.carryingCourses[0].autoAddDeptSwitch = this
1049
       this.taskData.taskType.carryingCourses[0].autoAddDeptSwitch = this
1049
         .autoAddDeptSwitch
1050
         .autoAddDeptSwitch
1050
         ? 1
1051
         ? 1
@@ -1396,26 +1397,22 @@ export class TaskTypeManagementComponent implements OnInit {
1396
                   this.createRuleConfiguration[i].urgentTypeIds[j].id ==
1397
                   this.createRuleConfiguration[i].urgentTypeIds[j].id ==
1397
                   this.createRuleConfiguration[i].levelData1[j].id
1398
                   this.createRuleConfiguration[i].levelData1[j].id
1398
                 ) {
1399
                 ) {
1399
-                  this.createRuleConfiguration[i].levelData1[j][
1400
-                    "checked"
1401
-                  ] = true;
1400
+                  this.createRuleConfiguration[i].levelData1[j]["checked"] =
1401
+                    true;
1402
                 } else {
1402
                 } else {
1403
-                  this.createRuleConfiguration[i].levelData1[j][
1404
-                    "checked"
1405
-                  ] = false;
1403
+                  this.createRuleConfiguration[i].levelData1[j]["checked"] =
1404
+                    false;
1406
                 }
1405
                 }
1407
               } else {
1406
               } else {
1408
                 if (
1407
                 if (
1409
                   this.createRuleConfiguration[i].urgentTypeIds[k].id ==
1408
                   this.createRuleConfiguration[i].urgentTypeIds[k].id ==
1410
                   this.createRuleConfiguration[i].levelData1[j].id
1409
                   this.createRuleConfiguration[i].levelData1[j].id
1411
                 ) {
1410
                 ) {
1412
-                  this.createRuleConfiguration[i].levelData1[j][
1413
-                    "checked"
1414
-                  ] = true;
1411
+                  this.createRuleConfiguration[i].levelData1[j]["checked"] =
1412
+                    true;
1415
                 } else {
1413
                 } else {
1416
-                  this.createRuleConfiguration[i].levelData1[j][
1417
-                    "checked"
1418
-                  ] = false;
1414
+                  this.createRuleConfiguration[i].levelData1[j]["checked"] =
1415
+                    false;
1419
                 }
1416
                 }
1420
               }
1417
               }
1421
             }
1418
             }
@@ -1437,26 +1434,22 @@ export class TaskTypeManagementComponent implements OnInit {
1437
                   this.createRuleConfiguration[i].ordinaryTypeIds[j].id ==
1434
                   this.createRuleConfiguration[i].ordinaryTypeIds[j].id ==
1438
                   this.createRuleConfiguration[i].levelData2[j].id
1435
                   this.createRuleConfiguration[i].levelData2[j].id
1439
                 ) {
1436
                 ) {
1440
-                  this.createRuleConfiguration[i].levelData2[j][
1441
-                    "checked"
1442
-                  ] = true;
1437
+                  this.createRuleConfiguration[i].levelData2[j]["checked"] =
1438
+                    true;
1443
                 } else {
1439
                 } else {
1444
-                  this.createRuleConfiguration[i].levelData2[j][
1445
-                    "checked"
1446
-                  ] = false;
1440
+                  this.createRuleConfiguration[i].levelData2[j]["checked"] =
1441
+                    false;
1447
                 }
1442
                 }
1448
               } else {
1443
               } else {
1449
                 if (
1444
                 if (
1450
                   this.createRuleConfiguration[i].ordinaryTypeIds[k].id ==
1445
                   this.createRuleConfiguration[i].ordinaryTypeIds[k].id ==
1451
                   this.createRuleConfiguration[i].levelData2[j].id
1446
                   this.createRuleConfiguration[i].levelData2[j].id
1452
                 ) {
1447
                 ) {
1453
-                  this.createRuleConfiguration[i].levelData2[j][
1454
-                    "checked"
1455
-                  ] = true;
1448
+                  this.createRuleConfiguration[i].levelData2[j]["checked"] =
1449
+                    true;
1456
                 } else {
1450
                 } else {
1457
-                  this.createRuleConfiguration[i].levelData2[j][
1458
-                    "checked"
1459
-                  ] = false;
1451
+                  this.createRuleConfiguration[i].levelData2[j]["checked"] =
1452
+                    false;
1460
                 }
1453
                 }
1461
               }
1454
               }
1462
             }
1455
             }
@@ -1966,9 +1959,10 @@ export class TaskTypeManagementComponent implements OnInit {
1966
   }
1959
   }
1967
   // 标本选择->确定
1960
   // 标本选择->确定
1968
   newOrderOk3() {
1961
   newOrderOk3() {
1969
-    let obj = this.createRuleConfiguration[this.specimen_index][
1970
-      "specimenDataNow" + this.specimenList
1971
-    ];
1962
+    let obj =
1963
+      this.createRuleConfiguration[this.specimen_index][
1964
+        "specimenDataNow" + this.specimenList
1965
+      ];
1972
     console.log(this.specimens, obj, 11111);
1966
     console.log(this.specimens, obj, 11111);
1973
     for (var i = 0; i < this.specimenData.length; i++) {
1967
     for (var i = 0; i < this.specimenData.length; i++) {
1974
       for (var k = 0; k < this.specimens.length; k++) {
1968
       for (var k = 0; k < this.specimens.length; k++) {
@@ -1993,9 +1987,10 @@ export class TaskTypeManagementComponent implements OnInit {
1993
   }
1987
   }
1994
   // 开通科室选择->确定
1988
   // 开通科室选择->确定
1995
   newOrderOk31() {
1989
   newOrderOk31() {
1996
-    let obj = this.createRuleConfiguration[this.dept_index][
1997
-      "specimenDataNow" + this.deptList
1998
-    ];
1990
+    let obj =
1991
+      this.createRuleConfiguration[this.dept_index][
1992
+        "specimenDataNow" + this.deptList
1993
+      ];
1999
     for (var i = 0; i < this.jy_dept.length; i++) {
1994
     for (var i = 0; i < this.jy_dept.length; i++) {
2000
       for (var k = 0; k < this.dps.length; k++) {
1995
       for (var k = 0; k < this.dps.length; k++) {
2001
         if (this.jy_dept[i].id == this.dps[k]) {
1996
         if (this.jy_dept[i].id == this.dps[k]) {