Przeglądaj źródła

轮巡建单增加每日每月每年每周,时间点单选;其他功能BUG修复

seimin 3 lat temu
rodzic
commit
bf5823f718

+ 4 - 4
package-lock.json

@@ -853,7 +853,7 @@
853 853
     },
854 854
     "@types/zrender": {
855 855
       "version": "4.0.0",
856
-      "resolved": "https://registry.nlark.com/@types/zrender/download/@types/zrender-4.0.0.tgz",
856
+      "resolved": "https://registry.npm.taobao.org/@types/zrender/download/@types/zrender-4.0.0.tgz",
857 857
       "integrity": "sha1-poBvEuxOzKrr2bDYFvBJrKYYj70=",
858 858
       "dev": true
859 859
     },
@@ -2608,9 +2608,9 @@
2608 2608
       }
2609 2609
     },
2610 2610
     "core-js": {
2611
-      "version": "3.14.0",
2612
-      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.14.0.tgz",
2613
-      "integrity": "sha1-YjIrmMccwgGLAnlxppQZ4kJcKmw="
2611
+      "version": "3.15.1",
2612
+      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.15.1.tgz?cache=0&sync_timestamp=1624386897006&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.15.1.tgz",
2613
+      "integrity": "sha1-bAiriKvfVlRQRcz1/YH0f0B+fxo="
2614 2614
     },
2615 2615
     "core-util-is": {
2616 2616
       "version": "1.0.2",

+ 1 - 1
package.json

@@ -24,7 +24,7 @@
24 24
     "@angular/router": "~8.1.1",
25 25
     "@types/crypto-js": "^3.1.47",
26 26
     "@types/overlayscrollbars": "^1.9.0",
27
-    "core-js": "^3.14.0",
27
+    "core-js": "^3.15.1",
28 28
     "crypto-js": "^4.0.0",
29 29
     "datatables.net": "^1.10.25",
30 30
     "date-fns": "^2.22.1",

+ 6 - 6
src/app/share/appraise-detail/appraise-detail.component.html

@@ -8,7 +8,7 @@
8 8
       <div [ngClass]="{'item':true, 'flex_1':true, checked:tabType==3}" (click)="checkTab(3)">调解</div>
9 9
     </div>
10 10
     <!-- 其他类型工单信息 -->
11
-    <div *ngIf="(tabType==1)&&(orderInfo.workOrderObj.taskType.associationType.id==259)" class="content orders">
11
+    <div *ngIf="(tabType==1)&&(orderInfo.workOrderObj.taskType.associationType.value=='other')" class="content orders">
12 12
       <div class="top">
13 13
         <div class="num">
14 14
           <span class="left">单号:{{orderInfo.workOrderObj.gdcode}}</span>
@@ -56,7 +56,7 @@
56 56
     </div>
57 57
     <!-- 标本类型工单信息 -->
58 58
     <div
59
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.id==256||orderInfo.workOrderObj.taskType.associationType.id==380)"
59
+      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='specimen'||orderInfo.workOrderObj.taskType.associationType.value=='specimenPlan')"
60 60
       class="content orders">
61 61
       <div class="top">
62 62
         <div class="num">
@@ -143,7 +143,7 @@
143 143
     </div>
144 144
     <!-- 药品/静配配送类型工单信息 -->
145 145
     <div
146
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.id==257||orderInfo.workOrderObj.taskType.associationType.id==258)"
146
+      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='drugsBag'||orderInfo.workOrderObj.taskType.associationType.value=='jPBag')"
147 147
       class="content orders">
148 148
       <div class="top">
149 149
         <div class="num">
@@ -246,7 +246,7 @@
246 246
     </div>
247 247
     <!-- 患者陪检/患者转运类型工单信息 -->
248 248
     <div
249
-      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.id==260||orderInfo.workOrderObj.taskType.associationType.id==255)"
249
+      *ngIf="tabType==1&&(orderInfo.workOrderObj.taskType.associationType.value=='inspect'||orderInfo.workOrderObj.taskType.associationType.value=='patientTransport')"
250 250
       class="content orders">
251 251
       <div class="top">
252 252
         <div class="num">
@@ -304,7 +304,7 @@
304 304
                 <span class="label">床位</span>
305 305
                 <span>{{orderInfo.workOrderObj.patient.bedNum}}</span>
306 306
               </p>
307
-              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.id==260">
307
+              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
308 308
                 <span class="label">检查项目</span>
309 309
                 <span>
310 310
                   <span *ngFor="let item of orderInfo.workOrderObj.checkList;let i = index;">
@@ -323,7 +323,7 @@
323 323
                 <span class="label">携带物品</span>
324 324
                 <span>{{orderInfo.workOrderObj.goods}}</span>
325 325
               </p>
326
-              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.id==260">
326
+              <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">
327 327
                 <span class="label">预约时间</span>
328 328
                 <span>{{orderInfo.workOrderObj.yyTime?orderInfo.workOrderObj.yyTime:''}}</span>
329 329
               </p>

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

@@ -85,7 +85,7 @@
85 85
             </div>
86 86
           </div>
87 87
         </div>
88
-        <ng-container *ngIf="orderInfo.taskType.associationType.id==260">
88
+        <ng-container *ngIf="orderInfo.taskType.associationType.value=='inspect'">
89 89
           <div class="info" *ngFor="let item of orderInfo.checkList">
90 90
             <div nz-row class="top">
91 91
               <div nz-col nzSpan="8">

+ 2 - 1
src/app/share/hs-prompt-modal/hs-prompt-modal.component.html

@@ -35,7 +35,8 @@
35 35
             </nz-form-control>
36 36
           </nz-form-item>
37 37
           <nz-form-item>
38
-            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="dutyDeptFc">搜索当值科室
38
+            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="dutyDeptFc">搜索当值科室<span
39
+                class="red ml8">(可通过拼音首字母检索科室)</span>
39 40
             </nz-form-label>
40 41
             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择当值科室!">
41 42
               <nz-select formControlName="dutyDeptFc" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch

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

@@ -9,7 +9,7 @@
9 9
     </div>
10 10
     <!-- 其他类型工单信息 -->
11 11
     <overlay-scrollbars #osComponentRef3 style="max-height: 400px;">
12
-      <div *ngIf="(tabType==1)&&(orderInfo.taskType.associationType.id==259)" class="content orders">
12
+      <div *ngIf="(tabType==1)&&(orderInfo.taskType.associationType.value=='other')" class="content orders">
13 13
         <div class="top">
14 14
           <div class="num">
15 15
             <span class="left">单号:{{orderInfo.gdcode}}</span>
@@ -64,7 +64,7 @@
64 64
     </overlay-scrollbars>
65 65
     <!-- 标本类型工单信息 -->
66 66
     <overlay-scrollbars #osComponentRef4 style="max-height: 400px;">
67
-      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.id==256" class="content orders">
67
+      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.value=='specimen'" class="content orders">
68 68
         <div class="top">
69 69
           <div class="num">
70 70
             <span class="left">单号:{{orderInfo.gdcode}}</span>
@@ -154,7 +154,7 @@
154 154
     </overlay-scrollbars>
155 155
     <!-- 标本轮巡工单信息 -->
156 156
     <overlay-scrollbars #osComponentRef5 style="max-height: 400px;">
157
-      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.id==380" class="content orders">
157
+      <div *ngIf="tabType==1&&orderInfo.taskType.associationType.value=='specimenPlan'" class="content orders">
158 158
         <div class="top">
159 159
           <div class="num">
160 160
             <span class="left">单号:{{orderInfo.gdcode}}</span>
@@ -244,7 +244,7 @@
244 244
     </overlay-scrollbars>
245 245
     <!-- 药品/静配配送类型工单信息 -->
246 246
     <overlay-scrollbars #osComponentRef6 style="max-height: 400px;">
247
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.id==257||orderInfo.taskType.associationType.id==258)"
247
+      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='drugsBag'||orderInfo.taskType.associationType.value=='jPBag')"
248 248
         class="content orders">
249 249
         <div class="top">
250 250
           <div class="num">
@@ -353,7 +353,7 @@
353 353
     </overlay-scrollbars>
354 354
     <!-- 患者陪检/患者转运类型工单信息 -->
355 355
     <overlay-scrollbars #osComponentRef1 style="max-height: 400px;">
356
-      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.id==260||orderInfo.taskType.associationType.id==255)"
356
+      <div *ngIf="tabType==1&&(orderInfo.taskType.associationType.value=='inspect'||orderInfo.taskType.associationType.value=='patientTransport')"
357 357
         class="content orders">
358 358
         <div class="top">
359 359
           <div class="num">
@@ -434,7 +434,7 @@
434 434
               </div>
435 435
             </div>
436 436
           </div>
437
-          <ng-container *ngIf="orderInfo.taskType.associationType.id==260">
437
+          <ng-container *ngIf="orderInfo.taskType.associationType.value=='inspect'">
438 438
             <div class="info" *ngFor="let item of orderInfo.checkList">
439 439
               <div nz-row class="top">
440 440
                 <div nz-col nzSpan="8">

+ 20 - 20
src/app/views/fuwutai/fuwutai.component.html

@@ -102,7 +102,7 @@
102 102
                 </div>
103 103
                 <!-- 地点 -->
104 104
                 <div class="didian" (click)='openDetails(data.id,data.taskType.associationType.id)'>
105
-                  <span class="left" *ngIf="data.taskType.associationType.id==260">
105
+                  <span class="left" *ngIf="data.taskType.associationType.value=='inspect'">
106 106
                     {{data.startDept?data.startDept.dept:''}}
107 107
                     <span *ngFor="let item of data.middleDept">
108 108
                       ->{{item.dept}}
@@ -121,14 +121,14 @@
121 121
                   <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
122 122
                     <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
123 123
                     <ng-container
124
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
124
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
125 125
                       <i *ngIf="data.patient.illnessState.value === '2'"
126 126
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
127 127
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
128 128
                         nz-tooltip nzTooltipTitle="病重"></i>
129 129
                     </ng-container>
130 130
                     <ng-container
131
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
131
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
132 132
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
133 133
                         nzTooltipTitle="特级护理"></i>
134 134
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -143,14 +143,14 @@
143 143
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
144 144
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
145 145
                     <ng-container
146
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
146
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
147 147
                       <i *ngIf="data.patient.illnessState.value === '2'"
148 148
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
149 149
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
150 150
                         nz-tooltip nzTooltipTitle="病重"></i>
151 151
                     </ng-container>
152 152
                     <ng-container
153
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
153
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
154 154
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
155 155
                         nzTooltipTitle="特级护理"></i>
156 156
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -266,7 +266,7 @@
266 266
                 </div>
267 267
                 <!-- 地点 -->
268 268
                 <div class="didian" (click)='openDetails(data.id,data.taskType.associationType.id)'>
269
-                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.id==260">
269
+                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
270 270
                     {{data.startDept?data.startDept.dept:''}}
271 271
                     <span *ngFor="let item of data.middleDept">
272 272
                       ->{{item.dept}}
@@ -285,14 +285,14 @@
285 285
                   <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
286 286
                     <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
287 287
                     <ng-container
288
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
288
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
289 289
                       <i *ngIf="data.patient.illnessState.value === '2'"
290 290
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
291 291
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
292 292
                         nz-tooltip nzTooltipTitle="病重"></i>
293 293
                     </ng-container>
294 294
                     <ng-container
295
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
295
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
296 296
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
297 297
                         nzTooltipTitle="特级护理"></i>
298 298
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -307,14 +307,14 @@
307 307
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
308 308
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
309 309
                     <ng-container
310
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
310
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
311 311
                       <i *ngIf="data.patient.illnessState.value === '2'"
312 312
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
313 313
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
314 314
                         nz-tooltip nzTooltipTitle="病重"></i>
315 315
                     </ng-container>
316 316
                     <ng-container
317
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
317
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
318 318
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
319 319
                         nzTooltipTitle="特级护理"></i>
320 320
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -427,7 +427,7 @@
427 427
                 </div>
428 428
                 <!-- 地点 -->
429 429
                 <div class="didian">
430
-                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.id==260">
430
+                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
431 431
                     {{data.startDept?data.startDept.dept:''}}
432 432
                     <span *ngFor="let item of data.middleDept">
433 433
                       ->{{item.dept}}
@@ -446,14 +446,14 @@
446 446
                   <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
447 447
                     <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
448 448
                     <ng-container
449
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
449
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
450 450
                       <i *ngIf="data.patient.illnessState.value === '2'"
451 451
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
452 452
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
453 453
                         nz-tooltip nzTooltipTitle="病重"></i>
454 454
                     </ng-container>
455 455
                     <ng-container
456
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
456
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
457 457
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
458 458
                         nzTooltipTitle="特级护理"></i>
459 459
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -468,14 +468,14 @@
468 468
                   <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
469 469
                     <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
470 470
                     <ng-container
471
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
471
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
472 472
                       <i *ngIf="data.patient.illnessState.value === '2'"
473 473
                         class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
474 474
                       <i *ngIf="data.patient.illnessState.value === '3'" class="colorRed icon_transport transport-zhong"
475 475
                         nz-tooltip nzTooltipTitle="病重"></i>
476 476
                     </ng-container>
477 477
                     <ng-container
478
-                      *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
478
+                      *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
479 479
                       <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip
480 480
                         nzTooltipTitle="特级护理"></i>
481 481
                       <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -1143,7 +1143,7 @@
1143 1143
                     </div>
1144 1144
                     <!-- 地点 -->
1145 1145
                     <div class="didian">
1146
-                      <span class="left" *ngIf="data.taskType.associationType.id==260">
1146
+                      <span class="left" *ngIf="data.taskType.associationType.value=='inspect'">
1147 1147
                         {{data.startDept?data.startDept.dept:''}}
1148 1148
                         <span *ngFor="let item of data.middleDept">
1149 1149
                           ->{{item.dept}}
@@ -1162,14 +1162,14 @@
1162 1162
                       <span class="left" *ngIf="data.expectTimeNum&&data.timeOut!=true">
1163 1163
                         <i class="icon_transport transport-shouye10" nz-tooltip nzTooltipTitle="进行中"></i>
1164 1164
                         <ng-container
1165
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
1165
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
1166 1166
                           <i *ngIf="data.patient.illnessState.value === '2'"
1167 1167
                             class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
1168 1168
                           <i *ngIf="data.patient.illnessState.value === '3'"
1169 1169
                             class="colorRed icon_transport transport-zhong" nz-tooltip nzTooltipTitle="病重"></i>
1170 1170
                         </ng-container>
1171 1171
                         <ng-container
1172
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
1172
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
1173 1173
                           <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1"
1174 1174
                             nz-tooltip nzTooltipTitle="特级护理"></i>
1175 1175
                           <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"
@@ -1184,14 +1184,14 @@
1184 1184
                       <span class="left" *ngIf="data.timeOutLength&&data.timeOut==true">
1185 1185
                         <i class="colorRed icon_transport transport-daojishi" nz-tooltip nzTooltipTitle="超时"></i>
1186 1186
                         <ng-container
1187
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.illnessState">
1187
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.illnessState">
1188 1188
                           <i *ngIf="data.patient.illnessState.value === '2'"
1189 1189
                             class="colorRed icon_transport transport-tubiao_wei" nz-tooltip nzTooltipTitle="病危"></i>
1190 1190
                           <i *ngIf="data.patient.illnessState.value === '3'"
1191 1191
                             class="colorRed icon_transport transport-zhong" nz-tooltip nzTooltipTitle="病重"></i>
1192 1192
                         </ng-container>
1193 1193
                         <ng-container
1194
-                          *ngIf="(data.taskType.associationType.id==255||data.taskType.associationType.id==260)&&data.patient?.careLevel">
1194
+                          *ngIf="(data.taskType.associationType.value=='patientTransport'||data.taskType.associationType.value=='inspect')&&data.patient?.careLevel">
1195 1195
                           <i *ngIf="data.patient.careLevel.value === '0'" class="icon_transport transport-te1"
1196 1196
                             nz-tooltip nzTooltipTitle="特级护理"></i>
1197 1197
                           <i *ngIf="data.patient.careLevel.value === '1'" class="icon_transport transport-1_round_solid"

+ 3 - 3
src/app/views/hushijiandan/hushijiandan.component.html

@@ -647,7 +647,7 @@
647 647
                             <div nz-col nzSpan="12" class="col txtL">
648 648
                               {{item.taskType.taskName}}
649 649
                               <span
650
-                                *ngIf="item.patient&&(item.taskType.associationType.id == 255||item.taskType.associationType.id == 260)">
650
+                                *ngIf="item.patient&&(item.taskType.associationType.value=='patientTransport'||item.taskType.associationType.value=='inspect')">
651 651
                                 ({{item.patient.patientName}})
652 652
                               </span>
653 653
                             </div>
@@ -726,7 +726,7 @@
726 726
 
727 727
 <!-- 返回系统按钮 -->
728 728
 <!-- 右侧悬浮框 -->
729
-<div id="fixedMenu" class="fixed" *ngIf="mainRole">
729
+<!-- <div id="fixedMenu" class="fixed" *ngIf="mainRole">
730 730
   <div class="right">
731 731
     <div class="fixedMenu hujiaozhongxin">
732 732
       <div class="menuItems">
@@ -752,7 +752,7 @@
752 752
   </div>
753 753
   <div *ngIf="showLastItems&&fixedTab!=''" (click)="fixedMenuShangla()" class="fixedMark">
754 754
   </div>
755
-</div>
755
+</div> -->
756 756
 
757 757
 <!-- 患者信息一键建单模态框 -->
758 758
 <div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal">

+ 8 - 7
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -614,13 +614,13 @@ export class HushijiandanComponent implements OnInit {
614 614
           that.othersList = [];
615 615
           that.patientMsgList = [];
616 616
           data.data.allTaskTypes.forEach((e) => {
617
-            if (e.associationType.id == 259) {
617
+            if (e.associationType.value=='other') {
618 618
               that.othersList.push(e);
619
-            } else if (e.associationType.id == 256) {
619
+            } else if (e.associationType.value=='specimen') {
620 620
               that.bbMsg = e;
621 621
             } else if (
622
-              e.associationType.id == 255 ||
623
-              e.associationType.id == 260
622
+              e.associationType.value=='patientTransport' ||
623
+              e.associationType.value=='inspect'
624 624
             ) {
625 625
               that.patientMsgList.push(e);
626 626
             }
@@ -669,9 +669,10 @@ export class HushijiandanComponent implements OnInit {
669 669
     }
670 670
     let postData = {
671 671
       idx: 0,
672
-      sum: 50,
672
+      sum: 20,
673 673
       department: {
674 674
         searchType: 1,
675
+        hospital: { id: this.currentHospital.id },
675 676
       },
676 677
     };
677 678
     if (key) {
@@ -996,7 +997,7 @@ export class HushijiandanComponent implements OnInit {
996 997
     let flag = this.checkTypeLis.some((item) => {
997 998
       return (
998 999
         item.id == this.patientForm.controls.checkedType.value &&
999
-        item.associationType.id == 255
1000
+        item.associationType.value=='patientTransport'
1000 1001
       );
1001 1002
     });
1002 1003
     //预约时间-患者陪检不能为空
@@ -1318,7 +1319,7 @@ export class HushijiandanComponent implements OnInit {
1318 1319
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
1319 1320
       (item) =>
1320 1321
         item.id == this.patientForm.controls.checkedType.value &&
1321
-        item.associationType.id == 255
1322
+        item.associationType.value=='patientTransport'
1322 1323
     );
1323 1324
     if (appointmentZyBuildFlag.length) {
1324 1325
       this.appointmentZyBuildFlag =

+ 5 - 3
src/app/views/main/main.component.ts

@@ -170,9 +170,11 @@ export class MainComponent implements OnInit {
170 170
       menus.forEach((item1) => {
171 171
         item1.flagBg = false;
172 172
         // item1.flag = false;
173
-        item1.childrens.forEach((value) => {
174
-          value.flag = false;
175
-        });
173
+        if (item1.childrens) {
174
+          item1.childrens.forEach((value) => {
175
+            value.flag = false;
176
+          });
177
+        }
176 178
       });
177 179
       localStorage.setItem("menu", JSON.stringify(menus));
178 180
       // 操作菜单一级 二级

+ 72 - 25
src/app/views/round-robin/round-robin.component.html

@@ -45,11 +45,20 @@
45 45
             <td>{{ i+1 }}</td>
46 46
             <td>{{ data.title }}</td>
47 47
             <td>{{ data.taskType.taskName }}</td>
48
-            <td>{{ data.timePlan&&data.timePlan.name }}
49
-              {{data.dayType == 0?'':'('+dayType[data.dayType]+')'}}</td>
50
-            <td>
51
-              <div class="orderPlanTimeShow" nz-tooltip nzTooltipTitle="{{data.orderPlanTimeShow.join()}}">{{
52
-                data.orderPlanTimeShow.join() }}</div>
48
+            <td [ngSwitch]="data.timeStep">
49
+              <ng-container *ngSwitchCase="'day'">每日{{data.dayType == 0?'':'('+dayType[data.dayType]+')'}</ng-container>
50
+              <ng-container *ngSwitchCase="'week'">每周{{data.dayType == 0?'':'('+dayType[data.dayType]+')'}
51
+              </ng-container>
52
+              <ng-container *ngSwitchCase="'month'">每月{{data.dayType == 0?'':'('+dayType[data.dayType]+')'}
53
+              </ng-container>
54
+              <ng-container *ngSwitchCase="'year'">每年{{data.dayType == 0?'':'('+dayType[data.dayType]+')'}
55
+              </ng-container>
56
+            </td>
57
+            <td [ngSwitch]="data.timeStep">
58
+              <ng-container *ngSwitchCase="'day'">{{ data.executeTime|date:'HH时mm分' }}</ng-container>
59
+              <ng-container *ngSwitchCase="'week'">{{data.weekName}} {{ data.executeTime|date:'HH时mm分' }}</ng-container>
60
+              <ng-container *ngSwitchCase="'month'">{{data.extra1}}日 {{ data.executeTime|date:'HH时mm分' }}</ng-container>
61
+              <ng-container *ngSwitchCase="'year'">{{ data.executeTime|date:'MM月dd日HH时mm分' }}</ng-container>
53 62
             </td>
54 63
             <td>
55 64
               <div class="targetDept" nz-tooltip nzTooltipTitle="{{data.targetDeptShow}}">{{ data.targetDeptShow }}
@@ -57,7 +66,7 @@
57 66
             </td>
58 67
             <td>
59 68
               <div class="coop">
60
-                <span *ngIf="coopBtns.edit&&data.taskType.associationType.id == 259&&!data.taskTypeDeptOrder"
69
+                <span *ngIf="coopBtns.edit&&data.taskType.associationType.value=='other'&&!data.taskTypeDeptOrder"
61 70
                   (click)="batchOrdersHandler(data)">批量建单设置</span>
62 71
                 <span *ngIf="coopBtns.look" (click)="detail(data.id)">查看</span>
63 72
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">修改</span>
@@ -111,22 +120,21 @@
111 120
             </nz-form-control>
112 121
           </nz-form-item>
113 122
           <nz-form-item>
114
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="roundRobinStrategy">轮巡策略</nz-form-label>
115
-            <nz-form-control nzErrorTip="请选择轮巡策略!">
116
-              <nz-select [nzDropdownMatchSelectWidth]="false" [nzDisabled]="true" formControlName="roundRobinStrategy"
117
-                nzShowSearch nzAllowClear nzPlaceHolder="请选择轮巡策略">
118
-                <nz-option nzLabel="{{data.hosName}}" nzValue="{{data.id}}" *ngFor="let data of roundRobinStrategys">
119
-                </nz-option>
120
-              </nz-select>
121
-            </nz-form-control>
122
-          </nz-form-item>
123
-          <nz-form-item class="datesControl">
124
-            <nz-form-control nzErrorTip="请选择适用日期类型!" class="datesGroup">
123
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="datesType">工作日或节假日</nz-form-label>
124
+            <nz-form-control nzErrorTip="请选择工作日或节假日!" class="datesGroup">
125 125
               <nz-checkbox-group formControlName="datesType" [(ngModel)]="oneOption">
126 126
               </nz-checkbox-group>
127 127
             </nz-form-control>
128 128
           </nz-form-item>
129 129
           <nz-form-item>
130
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="timeStep">轮巡策略</nz-form-label>
131
+            <nz-form-control nzErrorTip="请选择轮巡策略!">
132
+              <nz-radio-group formControlName="timeStep" (ngModelChange)="timeStepChange($event)">
133
+                <label nz-radio [nzValue]="data.key" *ngFor="let data of timeSteps">{{data.name}}</label>
134
+              </nz-radio-group>
135
+            </nz-form-control>
136
+          </nz-form-item>
137
+          <!-- <nz-form-item>
130 138
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="executionTime">执行时间</nz-form-label>
131 139
             <nz-form-control nzErrorTip="请选择执行时间!">
132 140
               <nz-select formControlName="executionTime" class="select-seimin" nzMode="multiple" nzPlaceHolder="请选择执行时间"
@@ -142,11 +150,49 @@
142 150
                 <button nz-button nzSize="small" nzType="primary" (click)="timePickerClick()">确定</button>
143 151
               </ng-template>
144 152
             </nz-form-control>
153
+          </nz-form-item> -->
154
+          <nz-form-item *ngIf="validateForm.value.timeStep == 'week'">
155
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="doWeek">计划执行周(每周)</nz-form-label>
156
+            <nz-form-control nzErrorTip="请选择周!">
157
+              <nz-select formControlName="doWeek" nzPlaceHolder="请选择周">
158
+                <nz-option nzValue="1" nzLabel="周一"></nz-option>
159
+                <nz-option nzValue="2" nzLabel="周二"></nz-option>
160
+                <nz-option nzValue="3" nzLabel="周三"></nz-option>
161
+                <nz-option nzValue="4" nzLabel="周四"></nz-option>
162
+                <nz-option nzValue="5" nzLabel="周五"></nz-option>
163
+                <nz-option nzValue="6" nzLabel="周六"></nz-option>
164
+                <nz-option nzValue="7" nzLabel="周日"></nz-option>
165
+              </nz-select>
166
+            </nz-form-control>
167
+          </nz-form-item>
168
+          <nz-form-item *ngIf="validateForm.value.timeStep == 'month'">
169
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="doMonth">计划执行(每月)</nz-form-label>
170
+            <nz-form-control nzErrorTip="请选择日!">
171
+              <nz-select formControlName="doMonth" nzPlaceHolder="请选择日">
172
+                <nz-option nzValue="{{item}}" nzLabel="{{item}}号" *ngFor="let item of months">
173
+                </nz-option>
174
+              </nz-select>
175
+            </nz-form-control>
176
+          </nz-form-item>
177
+          <nz-form-item *ngIf="validateForm.value.timeStep == 'year'">
178
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="doYear">计划执行(每年)</nz-form-label>
179
+            <nz-form-control nzErrorTip="请选择月日!">
180
+              <nz-date-picker nzFormat="MM-dd" formControlName="doYear" nzPlaceHolder="请选择月日"></nz-date-picker>
181
+            </nz-form-control>
182
+          </nz-form-item>
183
+          <nz-form-item>
184
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="executeTime">执行时间</nz-form-label>
185
+            <nz-form-control nzErrorTip="请选择执行时间!">
186
+              <nz-time-picker nzFormat="HH:mm" formControlName="executeTime" class="w100" nzPlaceHolder="请选择执行时间"
187
+                [nzAllowEmpty]="false">
188
+              </nz-time-picker>
189
+            </nz-form-control>
145 190
           </nz-form-item>
146 191
           <ng-container *ngIf="selectedTasktype">
147
-            <nz-form-item *ngIf="selectedTasktype.associationType.id == 380">
148
-              <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="selectedTasktype.associationType.id == 380"
149
-                nzFor="endDepartment">终点科室</nz-form-label>
192
+            <nz-form-item *ngIf="selectedTasktype.associationType.value=='specimenPlan'">
193
+              <nz-form-label [nzSm]="6" [nzXs]="24"
194
+                [nzRequired]="selectedTasktype.associationType.value=='specimenPlan'" nzFor="endDepartment">终点科室
195
+              </nz-form-label>
150 196
               <nz-form-control nzErrorTip="请选择终点科室!">
151 197
                 <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
152 198
                   nzShowSearch nzAllowClear nzPlaceHolder="请选择终点科室" nzServerSearch
@@ -161,7 +207,7 @@
161 207
               </nz-form-control>
162 208
             </nz-form-item>
163 209
             <nz-form-item
164
-              *ngIf="selectedTasktype.associationType.id == 259&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)">
210
+              *ngIf="selectedTasktype.associationType.value=='other'&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)">
165 211
               <nz-form-control>
166 212
                 <label nz-checkbox formControlName="openDepartments">
167 213
                   <span>是否根据开通科室建单</span>
@@ -172,14 +218,14 @@
172 218
           </ng-container>
173 219
         </form>
174 220
         <ng-container *ngIf="selectedTasktype">
175
-          <p *ngIf="selectedTasktype.associationType.id == 380" class="roundRobinTips">
221
+          <p *ngIf="selectedTasktype.associationType.value=='specimenPlan'" class="roundRobinTips">
176 222
             提示:起点科室即为标本开通科室;执行人即为科室绑定人员设定;前往设置<a [routerLink]="['/main','officeManagement']">开通科室</a>、<a
177 223
               [routerLink]="['/main','workAssignment']">工作分配</a>>>
178 224
           </p>
179
-          <p *ngIf="selectedTasktype.associationType.id == 259&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)"
225
+          <p *ngIf="selectedTasktype.associationType.value=='other'&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)"
180 226
             class="roundRobinTips">
181 227
             提示:您选择的任务类型,需要根据发起科室进行建单,您需要再批量建单中增加发起科室。</p>
182
-          <p *ngIf="selectedTasktype.associationType.id == 259&&selectedTasktype.carryingCourses[0].departmentStrategy.value!=1&&selectedTasktype.carryingCourses[1].departmentStrategy.value!=1"
228
+          <p *ngIf="selectedTasktype.associationType.value=='other'&&selectedTasktype.carryingCourses[0].departmentStrategy.value!=1&&selectedTasktype.carryingCourses[1].departmentStrategy.value!=1"
183 229
             class="roundRobinTips">
184 230
             提示:您选择的任务类型,需要选择起点科室和终点科室,请在”批量建单“中进行设置。</p>
185 231
         </ng-container>
@@ -204,4 +250,5 @@
204 250
 <!-- 遮罩 -->
205 251
 <app-mask *ngIf="maskFlag"></app-mask>
206 252
 <!-- 批量建单设置 -->
207
-<app-batch-orders *ngIf="batchOrdersFlag" [selectedBatchOrder]="selectedBatchOrder" (close)="close($event)"></app-batch-orders>
253
+<app-batch-orders *ngIf="batchOrdersFlag" [selectedBatchOrder]="selectedBatchOrder" (close)="close($event)">
254
+</app-batch-orders>

+ 5 - 5
src/app/views/round-robin/round-robin.component.less

@@ -9,7 +9,7 @@
9 9
     text-overflow: ellipsis;
10 10
     white-space: nowrap;
11 11
   }
12
-  .orderPlanTimeShow {
12
+  .executeTime {
13 13
     overflow: hidden;
14 14
     width: 142px;
15 15
     text-overflow: ellipsis;
@@ -28,10 +28,10 @@
28 28
   }
29 29
 }
30 30
 // 时间选择框相关
31
-::ng-deep .ant-time-picker-panel[ng-reflect-nz-place-holder="请选择执行时间"] {
32
-  left: -155px;
33
-  top: -103px;
34
-}
31
+// ::ng-deep .ant-time-picker-panel[ng-reflect-nz-place-holder="请选择执行时间"] {
32
+//   left: -155px;
33
+//   top: -103px;
34
+// }
35 35
 
36 36
 .save {
37 37
   position: fixed;

+ 113 - 52
src/app/views/round-robin/round-robin.component.ts

@@ -13,6 +13,7 @@ import { ToolService } from "../../services/tool.service";
13 13
 import { Subject } from "rxjs";
14 14
 import { debounceTime } from "rxjs/operators";
15 15
 import { NzMessageService } from "ng-zorro-antd";
16
+import { format } from "date-fns";
16 17
 @Component({
17 18
   selector: "app-round-robin",
18 19
   templateUrl: "./round-robin.component.html",
@@ -42,7 +43,13 @@ export class RoundRobinComponent implements OnInit {
42 43
     endDepartment: null,
43 44
   };
44 45
   roundRobinTypes = []; //轮巡类型
45
-  roundRobinStrategys = [{ id: "381", hosName: "每天轮巡" }]; //轮巡类型
46
+  timeSteps = [
47
+    // { id: "381", name: "每天轮巡" },
48
+    { key: "day", name: "每天" },
49
+    { key: "week", name: "每周" },
50
+    { key: "month", name: "每月" },
51
+    { key: "year", name: "每年" },
52
+  ]; //轮巡类型
46 53
   createUser = "";
47 54
   dayType = ["全部", "节假日", "工作日"]; //执行策略里的复选框数据字典
48 55
   department = []; // 院区下的科室列表
@@ -154,7 +161,7 @@ export class RoundRobinComponent implements OnInit {
154 161
   selectedTasktypeHandler(e) {
155 162
     this.selectedTasktype = this.roundRobinTypes.find((item) => item.id == e);
156 163
     this.requiredChange(
157
-      this.selectedTasktype.associationType.id == 380,
164
+      this.selectedTasktype.associationType.value == "specimenPlan",
158 165
       "endDepartment"
159 166
     );
160 167
     console.log(this.selectedTasktype);
@@ -255,6 +262,20 @@ export class RoundRobinComponent implements OnInit {
255 262
         if (data.status == 200) {
256 263
           this.listOfData = data.list;
257 264
           this.listLength = data.totalNum;
265
+          this.listOfData.forEach((item) => {
266
+            if (item.timeStep == "week") {
267
+              let weeks = [
268
+                "周一",
269
+                "周二",
270
+                "周三",
271
+                "周四",
272
+                "周五",
273
+                "周六",
274
+                "周日",
275
+              ];
276
+              item.weekName = weeks[item.extra1 - 1];
277
+            }
278
+          });
258 279
         }
259 280
       });
260 281
   }
@@ -317,18 +338,52 @@ export class RoundRobinComponent implements OnInit {
317 338
     this.validateForm = this.fb.group({
318 339
       roundRobinName: [null, [Validators.required]],
319 340
       roundRobinType: [null, [Validators.required]],
320
-      roundRobinStrategy: [null, [Validators.required]],
341
+      timeStep: [null, [Validators.required]],
321 342
       datesType: [null, [this.dateValidator]],
322
-      executionTime: [null, [Validators.required]],
323
-      time: [null],
343
+      executeTime: [null, [Validators.required]],
344
+      // executionTime: [null, [Validators.required]],
345
+      // time: [null],
324 346
       endDepartment: [null, [Validators.required]],
325 347
       openDepartments: [false],
326 348
     });
327
-    this.validateForm.controls.roundRobinStrategy.setValue(
328
-      this.roundRobinStrategys[0].id
329
-    );
349
+    this.validateForm.controls.timeStep.setValue(this.timeSteps[0].key);
330 350
     this.timeSelectedValue = [];
331 351
   }
352
+  // 修改轮巡策略
353
+  months = [...Array(32).keys()].slice(1);
354
+  timeStepChange(e) {
355
+    switch (e) {
356
+      case "day":
357
+        this.validateForm.removeControl("doWeek");
358
+        this.validateForm.removeControl("doMonth");
359
+        this.validateForm.removeControl("doYear");
360
+        break;
361
+      case "week":
362
+        this.validateForm.addControl(
363
+          "doWeek",
364
+          new FormControl(null, Validators.required)
365
+        );
366
+        this.validateForm.removeControl("doMonth");
367
+        this.validateForm.removeControl("doYear");
368
+        break;
369
+      case "month":
370
+        this.validateForm.addControl(
371
+          "doMonth",
372
+          new FormControl(null, Validators.required)
373
+        );
374
+        this.validateForm.removeControl("doWeek");
375
+        this.validateForm.removeControl("doYear");
376
+        break;
377
+      case "year":
378
+        this.validateForm.addControl(
379
+          "doYear",
380
+          new FormControl(null, Validators.required)
381
+        );
382
+        this.validateForm.removeControl("doWeek");
383
+        this.validateForm.removeControl("doMonth");
384
+        break;
385
+    }
386
+  }
332 387
 
333 388
   //创建自定义校验规则dateValidator,用于复选框组校验时调用。
334 389
   selectedDate: any = [];
@@ -372,63 +427,66 @@ export class RoundRobinComponent implements OnInit {
372 427
       this.btnLoading = false;
373 428
       return;
374 429
     }
375
-    let data: any = {};
430
+    let postData: any = {};
376 431
 
377 432
     if (this.add) {
378 433
       //增加
379
-      data = {
434
+      postData = {
380 435
         orderPlan: {
381 436
           title: this.validateForm.value.roundRobinName,
382 437
           hospital: this.hosId,
383 438
           taskType: { id: this.validateForm.value.roundRobinType },
384
-          timePlan: {
385
-            id: this.validateForm.value.roundRobinStrategy,
386
-          },
439
+          timeStep: this.validateForm.value.timeStep,
387 440
           dayType: this.validateForm.value.datesType,
388
-          orderPlanTimeShow: this.validateForm.value.executionTime,
441
+          executeTime: new Date(this.validateForm.value.executeTime).getTime(),
389 442
         },
390 443
       };
391
-      if (this.selectedTasktype.associationType.id == 380) {
444
+      if (this.selectedTasktype.associationType.value == "specimenPlan") {
392 445
         //标本轮巡
393
-        data.orderPlan.targetDept =
446
+        postData.orderPlan.targetDept =
394 447
           this.validateForm.value.endDepartment.join();
395
-      } else if (this.selectedTasktype.associationType.id == 259) {
448
+      } else if (this.selectedTasktype.associationType.value == "other") {
396 449
         //其他配送
397
-        data.orderPlan.taskTypeDeptOrder =
450
+        postData.orderPlan.taskTypeDeptOrder =
398 451
           this.validateForm.value.openDepartments;
399 452
       }
400 453
     } else {
401 454
       //编辑
402
-      let timeSelectedValue = JSON.parse(
403
-        JSON.stringify(this.timeSelectedValue)
404
-      );
405
-      let diff =
406
-        timeSelectedValue.sort().join("-") ===
407
-        this.executionTimeTemporaryStorage.sort().join("-")
408
-          ? []
409
-          : this.timeSelectedValue;
410
-      data = {
455
+      postData = {
411 456
         id: this.coopId,
412 457
         title: this.validateForm.value.roundRobinName,
413 458
         hospital: this.hosId,
414 459
         taskType: { id: this.validateForm.value.roundRobinType },
415
-        timePlan: {
416
-          id: this.validateForm.value.roundRobinStrategy,
417
-        },
460
+        timeStep: this.validateForm.value.timeStep,
418 461
         dayType: this.validateForm.value.datesType,
419
-        orderPlanTimeShow: diff,
462
+        executeTime: new Date(this.validateForm.value.executeTime).getTime(),
420 463
       };
421
-      if (this.selectedTasktype.associationType.id == 380) {
464
+      if (this.selectedTasktype.associationType.value == "specimenPlan") {
422 465
         //标本轮巡
423
-        data.targetDept = this.validateForm.value.endDepartment.join();
424
-      } else if (this.selectedTasktype.associationType.id == 259) {
466
+        postData.targetDept = this.validateForm.value.endDepartment.join();
467
+      } else if (this.selectedTasktype.associationType.value == "other") {
425 468
         //其他配送
426
-        data.taskTypeDeptOrder = this.validateForm.value.openDepartments;
469
+        postData.taskTypeDeptOrder = this.validateForm.value.openDepartments;
427 470
       }
428 471
     }
429
-    console.log(data);
472
+    if (this.validateForm.value.timeStep == "day") {
473
+      delete postData.extra1;
474
+    } else if (this.validateForm.value.timeStep == "week") {
475
+      postData.extra1 = this.validateForm.value.doWeek;
476
+    } else if (this.validateForm.value.timeStep == "month") {
477
+      postData.extra1 = this.validateForm.value.doMonth;
478
+    } else if (this.validateForm.value.timeStep == "year") {
479
+      delete postData.extra1;
480
+      postData.executeTime = new Date(
481
+        format(new Date(this.validateForm.value.doYear), "yyyy-MM-dd") +
482
+          " " +
483
+          format(new Date(this.validateForm.value.executeTime), "HH:mm:ss")
484
+      ).getTime();
485
+    }
486
+    console.log(postData);
487
+    return; //baba
430 488
     this.mainService
431
-      .addRoundRobin(this.add ? "addPlan" : "updatePlan", data)
489
+      .addRoundRobin(this.add ? "addPlan" : "updatePlan", postData)
432 490
       .subscribe((data) => {
433 491
         this.btnLoading = false;
434 492
         this.hideAddModal();
@@ -449,7 +507,7 @@ export class RoundRobinComponent implements OnInit {
449 507
   maskFlagLoading2 = false;
450 508
   edit(data) {
451 509
     this.requiredChange(
452
-      data.taskType.associationType.id == 380,
510
+      data.taskType.associationType.value == "specimenPlan",
453 511
       "endDepartment"
454 512
     );
455 513
     this.maskFlag = this.message.loading("正在加载中..", {
@@ -461,7 +519,7 @@ export class RoundRobinComponent implements OnInit {
461 519
     this.coopId = data.id;
462 520
     this.createUser = data.createUser ? data.createUser.name : ""; //创建人
463 521
     this.validateForm.controls.roundRobinName.setValue(data.title); //名称
464
-    // 轮巡类型
522
+    // 轮巡类型 start
465 523
     {
466 524
       this.selectedTasktype = data.taskType;
467 525
       let postData = {
@@ -496,19 +554,22 @@ export class RoundRobinComponent implements OnInit {
496 554
           }
497 555
         });
498 556
     }
499
-    // 轮巡类型
500
-    this.validateForm.controls.roundRobinStrategy.setValue(
501
-      this.roundRobinStrategys[0].id
502
-    ); //轮巡策略
503
-    this.defaultSelectTimesOption = JSON.parse(
504
-      JSON.stringify(data.orderPlanTimeShow)
505
-    ); //轮巡策略(时间)
506
-    this.timeSelectedValue = JSON.parse(JSON.stringify(data.orderPlanTimeShow)); //轮巡策略(时间)
507
-    this.executionTimeTemporaryStorage = JSON.parse(
508
-      JSON.stringify(data.orderPlanTimeShow)
509
-    ); //轮巡策略(时间暂存)
557
+    // 轮巡类型end
558
+    this.validateForm.controls.timeStep.setValue(data.timeStep); //轮巡策略
559
+    this.defaultSelectTimesOption = data.executeTime;
560
+    //轮巡策略(时间) start
561
+    if (data.timeStep == "year") {
562
+      this.validateForm.controls.doYear.setValue(
563
+        format(data.executeTime, "yyyy-MM-dd HH:mm:ss")
564
+      );
565
+    } else if (data.timeStep == "month") {
566
+      this.validateForm.controls.doMonth.setValue(data.extra1);
567
+    } else if (data.timeStep == "week") {
568
+      this.validateForm.controls.doWeek.setValue(data.extra1);
569
+    }
570
+    //轮巡策略(时间)end
510 571
     // --------终点科室---
511
-    if (data.taskType.associationType.id == 380) {
572
+    if (data.taskType.associationType.value == "specimenPlan") {
512 573
       //标本轮巡,则回显
513 574
       let targetDeptArr = [];
514 575
       let targetDept = data.targetDept.split(",");
@@ -550,7 +611,7 @@ export class RoundRobinComponent implements OnInit {
550 611
     }
551 612
     // --------/终点科室---
552 613
     if (
553
-      data.taskType.associationType.id == 259 &&
614
+      data.taskType.associationType.value == "other" &&
554 615
       (data.taskType.carryingCourses[0].departmentStrategy.value == 1 ||
555 616
         data.taskType.carryingCourses[1].departmentStrategy.value == 1)
556 617
     ) {

+ 2 - 1
src/app/views/task-type-management/task-type-management.component.html

@@ -51,8 +51,9 @@
51 51
           </div>
52 52
         </div>
53 53
         <nz-form-label class="label" nzRequired>关联类型</nz-form-label>
54
+        <!-- 关联类型禁止修改 -->
54 55
         <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联类型" [(ngModel)]="association.id"
55
-          (ngModelChange)="asso(association)">
56
+          (ngModelChange)="asso(association)" [nzDisabled]="!add">
56 57
           <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
57 58
         </nz-select>
58 59
         <nz-form-label *ngIf="association['id'] == 256" class="label" nzRequired>空单默认科室</nz-form-label>

+ 2 - 3
src/app/views/task-type-management/task-type-management.component.ts

@@ -673,12 +673,12 @@ export class TaskTypeManagementComponent implements OnInit {
673 673
 
674 674
       if (this.allScheduleClass[i].checked) {
675 675
         this.scheduleClassChecked.push(this.allScheduleClass[i]);
676
-        if (data.associationType.id == 256) {
676
+        if (data.associationType.value=='specimen') {
677 677
           this.autoClass.push(this.allScheduleClass[i]);
678 678
         }
679 679
       }
680 680
     }
681
-    if (data.associationType.id == 256) {
681
+    if (data.associationType.value=='specimen') {
682 682
       let ids = data.carryingCourses[0].createRuleConfiguration
683 683
         ? data.carryingCourses[0].createRuleConfiguration.map(
684 684
             (item) => item.classesId
@@ -739,7 +739,6 @@ export class TaskTypeManagementComponent implements OnInit {
739 739
       data.remarksPrompts === undefined ? "" : data.remarksPrompts + ""; //备注信息提示用语
740 740
     this.quickRemarks =
741 741
       data.customRemarks === undefined ? "" : data.customRemarks; //备注快速输入
742
-    // this.optionList
743 742
     let addEndDeptIdsArr = data.carryingCourses[0].endDepartmentList || [];
744 743
     let ids = [];
745 744
     let arrMiddle = [];