Преглед на файлове

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

陈少旭 преди 6 месеца
родител
ревизия
c329b6f29b
променени са 20 файла, в които са добавени 2276 реда и са изтрити 2034 реда
  1. 9 0
      src/api/dialysis.js
  2. 43 1
      src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue
  3. 120 117
      src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue
  4. 11 10
      src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue
  5. 3 4
      src/xt_pages/dialysis/batch_print/batch_print_order_six.vue
  6. 2 1
      src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue
  7. 68 12
      src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue
  8. 5 6
      src/xt_pages/dialysis/details/dialog/monitor_dialog.vue
  9. 9 2
      src/xt_pages/dialysis/details/dialysisComputer.vue
  10. 6 6
      src/xt_pages/dialysis/details/index.vue
  11. 7 6
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue
  12. 4 3
      src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue
  13. 1 1
      src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue
  14. 85 3
      src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue
  15. 93 28
      src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue
  16. 4 4
      src/xt_pages/outpatientCharges/components/prescriptionTable.vue
  17. 12 6
      src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue
  18. 46 10
      src/xt_pages/user/components/PatientDetail.vue
  19. 13 7
      src/xt_pages/user/inspection.vue
  20. 1735 1807
      src/xt_pages/workforce/scheduleTablePrintTwo.vue

+ 9 - 0
src/api/dialysis.js Целия файл

@@ -566,4 +566,13 @@ export function getDialysisProject(params){
566 566
     method:"Get",
567 567
     params:params
568 568
   })
569
+}
570
+
571
+export function getPatientBefor(params){
572
+ 
573
+  return request({
574
+    url:"/api/schedule/getpatientbefor",
575
+    method:"Get",
576
+    params:params,
577
+  })
569 578
 }

+ 43 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue Целия файл

@@ -43,7 +43,8 @@
43 43
               年龄:
44 44
               <div class="under_line" style="width: 30px; text-align: center">
45 45
                 <!-- {{ record.patient.age }} -->
46
-                {{ getAge(record.patient) }}
46
+                <!-- {{ getAge(record.patient) }} -->
47
+                {{ calculateAge(record.patient.id_card_no,record.schedule_date) }}
47 48
               </div>
48 49
49 50
             </div>
@@ -1931,6 +1932,47 @@ export default {
1931 1932
       });
1932 1933
   },
1933 1934
   methods: {
1935
+    calculateAge(idNumber,created_time) {
1936
+    var year = this.getTimeOne(created_time)
1937
+
1938
+    var month = this.getTimeTwo(created_time)
1939
+
1940
+    var day = this.getTimeThree(created_time)
1941
+    console.log("start_time=====",year)
1942
+    // 假设身份证号码是18位,且生日在第7位到第14位
1943
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
1944
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
1945
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
1946
+ 
1947
+    const today = new Date();
1948
+    // console.log("today============",today)
1949
+    var ageYear = year - birthYear;
1950
+    let ageMonth = month - birthMonth; // 月份是从0开始的
1951
+    let ageDay = day - birthDay;
1952
+ 
1953
+    // 调整月份和日期,以便于正确计算
1954
+      if (ageDay < 0) {
1955
+          ageMonth -= 1;
1956
+          // 获取上个月的天数
1957
+          const pastMonthDay = new Date(year,month, 0).getDate();
1958
+          ageDay += pastMonthDay;
1959
+      }
1960
+      if (ageMonth < 0) {
1961
+          ageYear -= 1;
1962
+          ageMonth += 12;
1963
+      }
1964
+   
1965
+     return ageYear 
1966
+    },
1967
+    getTimeOne(val) {
1968
+      return uParseTime(val, "{y}");
1969
+    },
1970
+    getTimeTwo(val) {
1971
+      return uParseTime(val, "{m}");
1972
+    },
1973
+    getTimeThree(val) {
1974
+      return uParseTime(val, "{h}");
1975
+    },
1934 1976
     getmode(id){
1935 1977
       const options = this.modeOptions
1936 1978
       if(id !=0){

+ 120 - 117
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue Целия файл

@@ -139,7 +139,7 @@
139 139
                         </div>
140 140
                       </div>
141 141
                       <div class="inline_block" style="flex: 1">
142
-                        首次透析时间
142
+                        首次透析时间:
143 143
                         <div class="under_line" style="width: 70px; text-align: center">
144 144
                           {{
145 145
                             record.patient.first_treatment_date ? getTime(record.patient.first_treatment_date,"{y}-{m}-{d}"):'/'
@@ -147,7 +147,7 @@
147 147
                         </div>
148 148
                       </div>
149 149
                       <div class="inline_block" style="flex: 1">
150
-                        透析次数
150
+                        透析次数:
151 151
                         <div class="under_line" style="width: 70px; text-align: center">
152 152
                           {{
153 153
                             record.Count +
@@ -159,7 +159,7 @@
159 159
                         </div>
160 160
                       </div>
161 161
                       <div class="inline_block" style="flex: 1">
162
-                        透前症状
162
+                        透前症状:
163 163
                         <div class="under_line" style="width: 60%; text-align: center">
164 164
                           {{
165 165
                             record.assessment_before_dislysis.symptom_before_dialysis
@@ -171,7 +171,7 @@
171 171
                     </div>
172 172
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex">
173 173
                       <div class="inline_block" style="flex: 1;">
174
-                        T
174
+                        T:
175 175
                         <div class="under_line" style="width: 50px; text-align: center">
176 176
                           {{
177 177
                             record.assessment_before_dislysis.temperature
@@ -182,7 +182,7 @@
182 182
                         °C
183 183
                       </div>
184 184
                       <div class="inline_block" style="flex: 1;">
185
-                        P
185
+                        P:
186 186
                         <div class="under_line" style="width: 50px; text-align: center">
187 187
                           {{
188 188
                             record.assessment_before_dislysis.pulse_frequency
@@ -193,7 +193,7 @@
193 193
                         次/分
194 194
                       </div>
195 195
                       <div class="inline_block" style="flex: 1;">
196
-                        R
196
+                        R:
197 197
                         <div class="under_line" style="width: 50px; text-align: center">
198 198
                           {{
199 199
                             record.assessment_before_dislysis.breathing_rate
@@ -204,7 +204,7 @@
204 204
                         次/分
205 205
                       </div>
206 206
                       <div class="inline_block" style="flex: 1.5;">
207
-                        BP
207
+                        BP
208 208
                         <div class="under_line" style="width: 50px; text-align: center">
209 209
                           {{
210 210
                             record.assessment_before_dislysis.systolic_blood_pressure
@@ -223,8 +223,8 @@
223 223
                         mmHg
224 224
                       </div>
225 225
                       <div class="inline_block" style="flex: 1.5;">
226
-                        穿刺方式
227
-                        <div class="under_line" style="width: 68%;white-space: normal;">
226
+                        穿刺方式:
227
+                        <div class="under_line" style="width: 66%;white-space: normal;">
228 228
                           {{record.assessment_before_dislysis.puncture_way ? 
229 229
                             record.assessment_before_dislysis.puncture_way : '/'}}
230 230
                         </div>
@@ -232,7 +232,7 @@
232 232
                     </div>
233 233
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
234 234
                       <div class="inline_block" style="flex: 1.5;">
235
-                        血管通路
235
+                        血管通路:
236 236
                         <div class="under_line" style="width: 68%;white-space: normal;">
237 237
                           {{ record.assessment_before_dislysis.blood_access_part_id
238 238
                               ? record.assessment_before_dislysis.blood_access_part_id:  "" 
@@ -243,7 +243,7 @@
243 243
                         </div>
244 244
                       </div>
245 245
                       <div class="inline_block" style="flex: 1;">
246
-                        内瘘
246
+                        内瘘:
247 247
                         <div class="under_line" style="width: 68%;white-space: normal;">
248 248
                           {{ record.assessment_before_dislysis.internal_fistula ? 
249 249
                             record.assessment_before_dislysis.internal_fistula : '/' 
@@ -252,7 +252,7 @@
252 252
                       </div>
253 253
                       
254 254
                       <div class="inline_block" style="flex: 1">
255
-                        导管
255
+                        导管:
256 256
                         <div class="under_line"
257 257
                           style="width: 60%; text-align: center;white-space: normal;"
258 258
                         >
@@ -263,7 +263,7 @@
263 263
                       </div>
264 264
 
265 265
                       <div class="inline_block" style="flex: 1">
266
-                        穿刺针
266
+                        穿刺针:
267 267
                         <div class="under_line"
268 268
                           style="width: 60%; text-align: center;white-space: normal;"
269 269
                         >
@@ -275,7 +275,7 @@
275 275
                     </div>
276 276
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
277 277
                       <div class="inline_block" style="flex: 1">
278
-                        透析方式
278
+                        透析方式:
279 279
                         <div class="under_line"
280 280
                           style="width: 50%;text-align: center;white-space: normal;"
281 281
                         >
@@ -283,7 +283,7 @@
283 283
                         </div>
284 284
                       </div>
285 285
                       <div class="inline_block" style="flex: 1">
286
-                        置换方式
286
+                        置换方式:
287 287
                         <div class="under_line"
288 288
                           style="width: 100px; text-align: center"
289 289
                         >
@@ -294,13 +294,14 @@
294 294
                       </div>
295 295
 
296 296
                       <div class="inline_block" style="flex: 1">
297
-                        置换量
297
+                        置换量:
298 298
                         <div class="under_line"
299 299
                           style="width: 70px; text-align: center"
300 300
                         >
301
-                          <span> {{
302
-                            record.prescription.displace_liqui_value
303
-                              ? record.prescription.displace_liqui_value
301
+                          <span> 
302
+                            {{
303
+                            record.prescription.replacement_total
304
+                              ? record.prescription.replacement_total
304 305
                               : "/"
305 306
                           }}
306 307
                           </span>
@@ -309,7 +310,7 @@
309 310
                       </div>
310 311
 
311 312
                       <div class="inline_block" style="flex: 1">
312
-                        血流量
313
+                        血流量:
313 314
                         <div class="under_line"
314 315
                           style="width: 50px; text-align: center"
315 316
                         >
@@ -323,7 +324,7 @@
323 324
                     </div>
324 325
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
325 326
                       <div class="inline_block" style="flex: 1">
326
-                        透析(滤)器
327
+                        透析(滤)器:
327 328
                         <div class="under_line"
328 329
                           style="width: 40%; text-align: center"
329 330
                         >
@@ -342,7 +343,7 @@
342 343
                         </div>
343 344
                       </div>
344 345
                       <div class="inline_block" style="flex: 1">
345
-                        灌流器
346
+                        灌流器:
346 347
                         <div class="under_line" style="width: 80px; text-align: center">
347 348
                           {{
348 349
                            record.prescription.dialysis_irrigation
@@ -352,7 +353,7 @@
352 353
                         </div>
353 354
                       </div>
354 355
                       <div class="inline_block" style="flex: 1;">
355
-                        预透时间
356
+                        预透时间:
356 357
                         <div class="under_line"
357 358
                           style=" width: 50%; text-align: center; white-space: normal; "
358 359
                         >
@@ -361,7 +362,7 @@
361 362
                         </div>
362 363
                       </div>
363 364
                       <div class="inline_block" style="flex: 1">
364
-                        干体重
365
+                        干体重:
365 366
                         <div class="under_line" style="width: 100px; text-align: center">
366 367
                           {{
367 368
                             record.assessment_before_dislysis.dry_weight 
@@ -371,7 +372,7 @@
371 372
                         kg
372 373
                       </div>
373 374
                       <!-- <div class="inline_block" style="flex: 1.3">
374
-                        可复用透析器使用次数
375
+                        可复用透析器使用次数:
375 376
                         <div class="under_line"
376 377
                           style="width: 20%; text-align: center"
377 378
                         >
@@ -380,7 +381,7 @@
380 381
                       </div>
381 382
 
382 383
                       <div class="inline_block" style="flex: 1">
383
-                        消毒液浓度
384
+                        消毒液浓度:
384 385
                         <div class="under_line"
385 386
                           style="width: 70px; text-align: center"
386 387
                         >
@@ -389,7 +390,7 @@
389 390
                       </div>
390 391
 
391 392
                       <div class="inline_block" style="flex: 1">
392
-                        残余浓度
393
+                        残余浓度:
393 394
                         <div class="under_line"
394 395
                           style="width: 50px; text-align: center"
395 396
                         >
@@ -400,14 +401,15 @@
400 401
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
401 402
                       
402 403
                       <div class="inline_block" style="flex: 1">
403
-                        上次透后体重
404
+                        上次透后体重:
404 405
                         <div class="under_line" style="width: 50px; text-align: center">
405
-                          {{record.lastafterweight.weight_after ? record.lastafterweight.weight_after:"未称重"}}
406
+                          <span v-if="record.lastafterweight.weight_after>0"> {{record.lastafterweight.weight_after ? record.lastafterweight.weight_after:"未称重"}}</span>
407
+                          <span v-if="record.lastafterweight.weight_after<=0"> {{record.assessment_after_dislysis.last_after_weight ? record.assessment_after_dislysis.last_after_weight:"未称重"}}</span>
406 408
                         </div>
407 409
                         kg
408 410
                       </div>
409 411
                       <div class="inline_block" style="flex: 1">
410
-                        透前体重
412
+                        透前体重:
411 413
                         <div class="under_line" style="width: 70px; text-align: center">
412 414
                           <span>{{
413 415
                                record.assessment_before_dislysis.weight_before
@@ -424,17 +426,24 @@
424 426
                         kg
425 427
                       </div>
426 428
                       <div class="inline_block" style="flex: 1">
427
-                        体重增加
429
+                        体重增加:
428 430
                         <div class="under_line" style="width: 70px; text-align: center">
429
-                          {{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
430
-                            ? parseFloat(record.assessment_before_dislysis.weight_before 
431
+                          <span v-if="record.lastafterweight.weight_after>0">{{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
432
+                            ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
431 433
                             - record.lastafterweight.weight_after).toFixed(2): "/" 
432 434
                           }}
435
+                          </span> 
436
+
437
+                          <span v-if="record.lastafterweight.weight_after<=0">{{ record.assessment_before_dislysis.weight_before > 0 && record.assessment_after_dislysis.last_after_weight > 0 
438
+                            ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
439
+                            - record.assessment_after_dislysis.last_after_weight).toFixed(2): "/" 
440
+                          }}
441
+                          </span> 
433 442
                         </div>
434 443
                         kg
435 444
                       </div>
436 445
                       <div class="inline_block" style="flex: 1">
437
-                        超滤总量:
446
+                        超滤总量:
438 447
                         <div class="under_line" style="width: 100px; text-align: center">
439 448
                           {{
440 449
                             record.prescription.target_ultrafiltration
@@ -447,9 +456,9 @@
447 456
                     </div>
448 457
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
449 458
                       <div class="inline_block" style="flex: 1.3;">
450
-                        透析液成分:钾
459
+                        透析液成分:钾:
451 460
                         <div class="under_line"
452
-                          style="width: 50px; text-align: center"
461
+                          style="width: 40px; text-align: center"
453 462
                         >
454 463
                         {{ record.prescription.kalium ? record.prescription.kalium : "/" }}
455 464
                         
@@ -457,7 +466,7 @@
457 466
                         mmol/L
458 467
                       </div>
459 468
                       <div class="inline_block" style="flex: 1;">
460
-                        钠
469
+                        钠:
461 470
                         <div
462 471
                           class="under_line"
463 472
                           style="width: 50px; text-align: center"
@@ -467,7 +476,7 @@
467 476
                         mmol/L
468 477
                       </div>
469 478
                       <div class="inline_block" style="flex: 1;">
470
-                        钙
479
+                        钙:
471 480
                         <div
472 481
                           class="under_line"
473 482
                           style="width: 50px; text-align: center"
@@ -477,7 +486,7 @@
477 486
                         mmol/L
478 487
                       </div>
479 488
                       <div class="inline_block" style="flex: 1.2;">
480
-                        碳酸氢根
489
+                        碳酸氢根:
481 490
                         <div class="under_line"
482 491
                           style="width: 50px; text-align: center"
483 492
                         >
@@ -490,7 +499,7 @@
490 499
                         mmol/L
491 500
                       </div>
492 501
                       <div class="inline_block" style="flex: 1;">
493
-                        流量
502
+                        流量:
494 503
                         <div class="under_line"
495 504
                           style="width: 50px; text-align: center"
496 505
                         >
@@ -504,10 +513,10 @@
504 513
                       </div>
505 514
                     </div>
506 515
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
507
-                      <div class="inline_block" style="flex: 1;">
508
-                        抗凝剂
516
+                      <div class="inline_block" style="flex: 1.1;">
517
+                        抗凝剂:
509 518
                         <div class="under_line"
510
-                          style="width: 60%; text-align: center"
519
+                          style="width: 55%; text-align: center"
511 520
                         >
512 521
                           <span v-if="record.prescription.anticoagulant== 6">低分子量肝素钙</span>
513 522
                           <span v-if="record.prescription.anticoagulant!= 6 && record.prescription.anticoagulant !=0">
@@ -518,7 +527,7 @@
518 527
                       <div class="inline_block" style="flex: 1;"
519 528
                         v-if="record.prescription.anticoagulant != 5"
520 529
                       >
521
-                        首剂
530
+                        首剂:
522 531
                         <div class="under_line"
523 532
                           style="width: 50px; text-align: center"
524 533
                         >
@@ -534,7 +543,7 @@
534 543
                         
535 544
                       </div>
536 545
                       <div class="inline_block" style="flex: 1;">
537
-                        追加
546
+                        追加:
538 547
                         <div class="under_line"
539 548
                           style="width: 50px; text-align: center"
540 549
                         >
@@ -552,7 +561,7 @@
552 561
                       <div class="inline_block" style="flex: 1;"
553 562
                         v-if="record.prescription.anticoagulant == 5"
554 563
                       >
555
-                        钙名称
564
+                        钙名称:
556 565
                         <div
557 566
                           class="under_line"
558 567
                           style="width: 150px; text-align: center"
@@ -567,7 +576,7 @@
567 576
                       <div class="inline_block" style="flex: 1;"
568 577
                         v-if="record.prescription.anticoagulant == 5"
569 578
                       >
570
-                        钙剂量
579
+                        钙剂量:
571 580
                         <div
572 581
                           class="under_line"
573 582
                           style="width: 50px; text-align: center"
@@ -583,7 +592,7 @@
583 592
                       <div class="inline_block" style="flex: 1;"
584 593
                         v-if="record.prescription.anticoagulant != 5"
585 594
                       >
586
-                        总量
595
+                        总量:
587 596
                         <div class="under_line"
588 597
                           style="width: 50px; text-align: center"
589 598
                         >
@@ -599,7 +608,7 @@
599 608
                         
600 609
                       </div>
601 610
                       <div class="inline_block" style="flex: 1">
602
-                        透析机号
611
+                        透析机号:
603 612
                         <div class="under_line" style="width: 70px; text-align: center">
604 613
                           {{
605 614
                             record.dialysis_order &&
@@ -610,8 +619,8 @@
610 619
                           }}
611 620
                         </div>
612 621
                       </div>
613
-                      <div class="inline_block" style="flex: 1">
614
-                        型号
622
+                      <div class="inline_block" style="flex: 0.9">
623
+                        型号:
615 624
                         <div class="under_line" style="width: 60%; text-align: center">
616 625
                           <span v-if="record.bed_id !=0 && record.bed_id !=''">
617 626
                             {{ getnumberlist(record.bed_id) ? getnumberlist(record.bed_id) :'东丽' }} 
@@ -760,9 +769,7 @@
760 769
                           </td>
761 770
                           <td style="font-size: 16px" width="10%">医生签名</td>
762 771
                           <td style="font-size: 16px" width="10%">执行时间</td>
763
-                          <td style="font-size: 16px" width="10%">
764
-                            执行人员
765
-                          </td>
772
+                          <td style="font-size: 16px" width="10%">执行人员</td>
766 773
                         </tr>
767 774
 
768 775
                         <template v-if="record.advices">
@@ -865,41 +872,16 @@
865 872
                               />
866 873
                             </td>
867 874
                           </tr>
868
-
869
-                          <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index">
870
-                            <td height="32px;padding:1px 1px">
871
-                                <span v-if="advice.start_time">
872
-                                    {{ getTime(advice.start_time, "{h}:{i}") }}
873
-                                </span>
874
-                            </td>
875
-                            <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
876
-                                <span style="padding-left:5px;display:inline-block;">
877
-                                  <span v-if="advice.type ==2">{{ advice && advice.project ? advice.project.project_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
878
-                                  <span v-if="advice.type ==3">{{ advice && advice.good_info ? advice.good_info.good_name : '' }}  {{ advice && advice.good_info ? advice.good_info.specification_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
879
-                                </span>
880
-                            </td>
881
-
882
-                            <td height="32px">
883
-                                <span v-if="setAdminUserES(advice, 'doctor') == ''">
884
-                                    {{getAdminUser(advice, 'doctor')}}
885
-                                </span>
886
-                                <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
887
-                                    <img style="height:30px;" :src="setAdminUserES(advice, 'doctor')" alt srcset />
888
-                                </span>
889
-                            </td>
890
-                            <td height="32px">
891
-                                <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
892
-                                    {{getAdminUser(advice, 'execution_staff')}}
893
-                                </span>
894
-                                <span v-else>
895
-                                    <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
896
-                                </span>
897
-                            </td>
898
-                            <td height="32px">
899
-                                <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
900
-                            </td>
901
-                          </tr>
902
-                        
875
+                          <template v-if="record.advices.length<3">
876
+                            <tr v-for="item in 3">
877
+                              <td height="35px"></td>
878
+                              <td colspan="2"></td>
879
+                              <td></td>
880
+                              <td></td>
881
+                              <td></td>
882
+                            </tr>
883
+                          </template>
884
+                          
903 885
                         </template>
904 886
                       </tbody>
905 887
                     </table>
@@ -1253,8 +1235,8 @@
1253 1235
                     <div class="row"
1254 1236
                       style="padding: 2px 0; line-height: 23px; display: flex"
1255 1237
                     > 
1256
-                      <div class="inline_block" style="flex: 1">
1257
-                        穿刺护士:
1238
+                      <div class="inline_block" style="flex: 1" v-if="record.assessment_before_dislysis.internal_fistula>0">
1239
+                        上机护士:
1258 1240
                         <div class="under_line"
1259 1241
                           style="width: 80px; text-align: center"
1260 1242
                         >
@@ -1281,6 +1263,35 @@
1281 1263
                           />
1282 1264
                         </div>
1283 1265
                       </div>
1266
+
1267
+                      <div class="inline_block" style="flex: 1" v-if="record.assessment_before_dislysis.catheter>0">
1268
+                        上机护士:
1269
+                        <div class="under_line"
1270
+                          style="width: 80px; text-align: center"
1271
+                        >
1272
+                          <span style="display: inline-block"
1273
+                            v-if=" setAdminUserES(
1274
+                                record.dialysis_order,'change_nurse'
1275
+                              ) == ''
1276
+                            "
1277
+                          >
1278
+                            {{ getAdminUser(record.dialysis_order, "change_nurse")
1279
+                              ? getAdminUser(record.dialysis_order,"change_nurse"): "/"
1280
+                              }}
1281
+                          </span>
1282
+                          <img
1283
+                            style="height: 30px"
1284
+                            :src="
1285
+                              setAdminUserES(
1286
+                                record.dialysis_order,'change_nurse'
1287
+                                )
1288
+                            "
1289
+                            alt=""
1290
+                            srcset=""
1291
+                            v-else
1292
+                          />
1293
+                        </div>
1294
+                      </div>
1284 1295
                       <div class="inline_block" style="flex: 1">
1285 1296
                         治疗护士:
1286 1297
                         <div class="under_line"
@@ -1703,20 +1714,20 @@ export default {
1703 1714
 
1704 1715
                tempmonitorflag = false;
1705 1716
             }
1706
-            if(this.org_id!=10515){
1707
-              if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1708
-                if(this.org_id!=10683){
1709
-                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
1710
-                }
1711
-
1712
-             }
1713
-             if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1714
-               if(this.org_id!=10683){
1715
-                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血100ml/min"
1716
-               }
1717
-
1718
-             }
1719
-            }
1717
+            // if(this.org_id!=10515){
1718
+            //   if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1719
+            //     if(this.org_id!=10683){
1720
+            //       this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
1721
+            //     }
1722
+
1723
+            //  }
1724
+            //  if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1725
+            //    if(this.org_id!=10683){
1726
+            //       this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血100ml/min"
1727
+            //    }
1728
+
1729
+            //  }
1730
+            // }
1720 1731
 
1721 1732
             }
1722 1733
           }
@@ -1778,10 +1789,6 @@ export default {
1778 1789
               }
1779 1790
             }
1780 1791
 
1781
-
1782
-
1783
-
1784
-
1785 1792
             if(this.org_id == 10206){
1786 1793
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
1787 1794
               var delghThree = 0
@@ -1882,11 +1889,7 @@ export default {
1882 1889
             }
1883 1890
           }
1884 1891
           console.log("数据我哦我我", this.records);
1885
-
1886
-
1887
-
1888 1892
           if(this.records!=null && this.records.length>0){
1889
-           
1890 1893
             for(let i=0;i<this.records.length;i++){
1891 1894
               this.records[i].new_his_advices = []
1892 1895
                 for(let j=0;j<this.records[i].his_advices.length;j++){
@@ -1947,12 +1950,11 @@ export default {
1947 1950
 
1948 1951
               this.records[i].new_his_advices = []
1949 1952
               this.records[i].new_his_advices.push(...newArr)
1950
-
1953
+              console.log('this.records[i].new_his_advices',this.records[i].new_his_advices);
1954
+              
1951 1955
             }
1952 1956
           }
1953
-
1954 1957
           console.log("时间我哦我",this.records)
1955
-
1956 1958
           // this.records.forEach(o => {
1957 1959
           //   console.log(o,'jj')
1958 1960
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
@@ -2081,7 +2083,7 @@ export default {
2081 2083
     },
2082 2084
     printAction: function () {
2083 2085
       const style =
2084
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
2086
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 15px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 15px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 15px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
2085 2087
 
2086 2088
       printJS({
2087 2089
         printable: "print_content",
@@ -2310,6 +2312,7 @@ export default {
2310 2312
       // }
2311 2313
       // return "";
2312 2314
     },
2315
+    
2313 2316
   },
2314 2317
 };
2315 2318
 </script>

+ 11 - 10
src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue Целия файл

@@ -570,7 +570,7 @@
570 570
                       <div class="inline_block" style=" flex: 1">
571 571
                         处方脱水量:
572 572
                         <div class="under_line" style="width: 50px; text-align: center" >
573
-                          {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "/" }}
573
+                          {{ record.prescription.prescription_water ? record.prescription.prescription_water : "/" }}
574 574
                         </div>ml
575 575
                       </div>             
576 576
                       <div class="inline_block" style=" flex: 1">
@@ -578,7 +578,8 @@
578 578
                         <div class="under_line"
579 579
                           style="width: 50px; text-align: center"
580 580
                         >
581
-                        {{ record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : '/' }}
581
+                        {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "/" }}
582
+                        <!-- {{ record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : '/' }} -->
582 583
                         </div>ml
583 584
                       </div>
584 585
                       <div class="inline_block" style=" flex: 1">
@@ -2014,14 +2015,14 @@ export default {
2014 2015
               this.records[i].monitor_records[j].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
2015 2016
               tempmonitorflag = false;
2016 2017
             }
2017
-            if(this.org_id!=10515 ){
2018
-              if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
2019
-              this.records[i].monitor_records[j].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
2020
-             }
2021
-             if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
2022
-               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
2023
-             }
2024
-            }
2018
+            // if(this.org_id!=10515 ){
2019
+            //   if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
2020
+            //   this.records[i].monitor_records[j].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
2021
+            //  }
2022
+            //  if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
2023
+            //    this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
2024
+            //  }
2025
+            // }
2025 2026
 
2026 2027
             }
2027 2028
           }

+ 3 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Целия файл

@@ -912,13 +912,12 @@
912 912
                         class="inline_block"
913 913
                         style="margin-left: 10px; flex: 1"
914 914
                       >
915
-                        置换量:
915
+                        <span v-if="org_id!=9538">置换量:</span>
916
+                        <span v-if="org_id==9538">预计置换液量:</span>
916 917
                         <div
917 918
                           class="under_line"
918
-                          style="width: 70px; text-align: center"
919
+                          style="width: 50px; text-align: center"
919 920
                         >
920
-
921
-
922 921
                           <span v-if="org_id==10206 || org_id == 10624">
923 922
                               {{
924 923
                             record.prescription.replacement_total

+ 2 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue Целия файл

@@ -2980,9 +2980,10 @@
2980 2980
                           />
2981 2981
                         </div>
2982 2982
                       </div>
2983
-                      <div class="inline_block" style="flex: 1">
2983
+                      <div class="inline_block" style="flex: 1" >
2984 2984
                         治疗医生:
2985 2985
                         <div
2986
+                          v-if="org_id!=10677"
2986 2987
                           class="under_line"
2987 2988
                           style="width: 80px; text-align: center"
2988 2989
                         >

+ 68 - 12
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Целия файл

@@ -952,18 +952,20 @@
952 952
 
953 953
                     </el-col>
954 954
 
955
-                    <el-col :span="8"
956
-                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10721)"
957
-                            v-show="totalShow">
958
-                        <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
955
+                    <el-col :span="8">
956
+                       
957
+                    </el-col>
958
+
959
+                    <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
960
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
959 961
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
960 962
                         </el-form-item>
961 963
 
962
-                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id ==26">
964
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id ==26">
963 965
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
964 966
                         </el-form-item>
965 967
                     </el-col>
966
-                    <el-col :span="8"
968
+                    <!-- <el-col :span="8"
967 969
                             v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53 && this.$store.getters.xt_user.template_info.org_id != 10206) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10721"
968 970
                             v-show="totalShow">
969 971
                         <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26"
@@ -972,7 +974,7 @@
972 974
                         <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
973 975
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
974 976
                         </el-form-item>
975
-                    </el-col>
977
+                    </el-col> -->
976 978
 
977 979
                     <el-col :span="8" v-if="isShows('目标KT/V')">
978 980
                         <el-form-item label="目标KT/V" prop="target_ktv" :rules="isCheckmust('目标KT/V')">
@@ -1476,7 +1478,7 @@
1476 1478
 </template>
1477 1479
 
1478 1480
 <script>
1479
-  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList } from '@/api/dialysis'
1481
+  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList,getPatientBefor } from '@/api/dialysis'
1480 1482
   import { getDataConfig } from '@/utils/data'
1481 1483
   import { calculateAnticoagulantZL, uParseTime,replacementFlow } from '@/utils/tools'
1482 1484
   import store from '@/store'
@@ -2634,16 +2636,17 @@ mu
2634 2636
         }
2635 2637
       },
2636 2638
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
2637
-
2639
+        console.log("除非=======================")
2640
+      
2638 2641
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721){
2639 2642
           if(this.predialysis!=undefined){
2640 2643
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2641
-              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
2644
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
2642 2645
             }
2643 2646
 
2644 2647
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
2645
-              if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
2646
-                this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
2648
+              if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)>0){
2649
+                this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
2647 2650
               }
2648 2651
 
2649 2652
             }
@@ -3100,6 +3103,10 @@ mu
3100 3103
         this.pre = pre
3101 3104
         // console.log("pre1", pre);
3102 3105
         this.getPermission()
3106
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0){
3107
+          this.getPatientBefor()
3108
+        }
3109
+      
3103 3110
 
3104 3111
         let last_weight_after = 0
3105 3112
         let weight_before = 0
@@ -3358,6 +3365,8 @@ mu
3358 3365
                 ParamsQuery['mode'] = '1'
3359 3366
                 ParamsQuery['patient_id'] = this.patient.id
3360 3367
                 console.log('第一', ParamsQuery)
3368
+             
3369
+
3361 3370
                 postPrescription(ParamsQuery).then(response => {
3362 3371
                   if (response.data.state == 0) {
3363 3372
                     this.$message.error(response.data.msg)
@@ -4884,6 +4893,53 @@ mu
4884 4893
           }
4885 4894
         })
4886 4895
     },
4896
+    getPatientBefor(){
4897
+     
4898
+       var patient_id = 0
4899
+       var record_date =""
4900
+       if(this.$route.query.patient_id!=undefined){
4901
+        patient_id =this.$route.query.patient_id
4902
+        record_date = uParseTime(this.$route.query.date, '{y}-{m}-{d}')
4903
+       }else{
4904
+        patient_id = this.patient.id
4905
+        record_date = this.record_date
4906
+       }
4907
+       var params = {
4908
+        patient_id:patient_id,
4909
+        record_date:record_date
4910
+       }
4911
+       console.log("param----------------",params)
4912
+      getPatientBefor(params).then(response=>{
4913
+         if(response.data.state == 1){
4914
+          var patientBefor = response.data.data.patientBefor
4915
+          var prescription = response.data.data.prescription
4916
+          if(patientBefor!=undefined){
4917
+            if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
4918
+              this.dialysisPrescription.target_ultrafiltration = (patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)
4919
+            }
4920
+
4921
+            if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
4922
+              if((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)>0){
4923
+                this.dialysisPrescription.prescription_water = (patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)
4924
+              }
4925
+
4926
+            }
4927
+
4928
+            // if(this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0){
4929
+            //   this.dialysisPrescription.target_ultrafiltration = prescription.target_ultrafiltration
4930
+            //   this.dialysisPrescription.prescription_water = prescription.prescription_water
4931
+
4932
+            // }
4933
+          }
4934
+          if(prescription!=undefined){
4935
+           
4936
+            this.dialysisPrescription.target_ultrafiltration = prescription.target_ultrafiltration
4937
+            this.dialysisPrescription.prescription_water = prescription.prescription_water
4938
+          }
4939
+
4940
+         }
4941
+      }) 
4942
+    },
4887 4943
     unique(arr) {
4888 4944
       const res = new Map()
4889 4945
       return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1))

+ 5 - 6
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Целия файл

@@ -784,7 +784,7 @@
784 784
                 org_id!=10558 &&
785 785
                 org_id!=10517 && 
786 786
                 org_id!=10414 && 
787
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644) ||
787
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721) ||
788 788
                 org_id == 9779 ||
789 789
                 template_id == 11 ||
790 790
                 template_id == 20 ||
@@ -797,8 +797,8 @@
797 797
                 org_id == 10340 ||
798 798
                 org_id == 10432 ||
799 799
                 org_id == 10445 ||
800
-                org_id == 10395 ||
801
-                org_id == 10721)
800
+                org_id == 10395 
801
+                )
802 802
             "
803 803
           >
804 804
             <template slot-scope="scope">
@@ -817,7 +817,7 @@
817 817
             width="100"
818 818
             v-if="
819 819
               isShow('置换量') &&
820
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644) &&
820
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721) &&
821 821
               template_id != 9779 &&
822 822
               template_id != 11 &&
823 823
               template_id != 20 &&
@@ -831,8 +831,7 @@
831 831
               org_id !=10340 &&
832 832
               org_id !=10432 &&
833 833
               org_id !=10445 && 
834
-              org_id!=10395  &&
835
-              org_id!=10721
834
+              org_id!=10395 
836 835
             "
837 836
           >
838 837
             <template slot-scope="scope">

+ 9 - 2
src/xt_pages/dialysis/details/dialysisComputer.vue Целия файл

@@ -12,7 +12,10 @@
12 12
           <span class="content">{{ device_number }}</span>
13 13
         </li>
14 14
         <li v-if="isShow('上机护士')">
15
-          <label>上机护士 : </label>
15
+          <label>
16
+           <span v-if="org_id == 10721"></span> 治疗护士 :
17
+           <span v-if="org_id != 10721"></span> 上机护士 :
18
+           </label>
16 19
           <span class="content">{{ nurse }}</span>
17 20
         </li>
18 21
       </ul>
@@ -122,7 +125,8 @@
122 125
     name: 'DialysisComputer',
123 126
     data() {
124 127
       return {
125
-        title: '透析上机 '
128
+        title: '透析上机 ',
129
+        org_id:0,
126 130
       }
127 131
     },
128 132
     props: {
@@ -280,6 +284,9 @@
280 284
         }
281 285
        },
282 286
 
287
+    },
288
+    created(){
289
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
283 290
     }
284 291
   }
285 292
 </script>

+ 6 - 6
src/xt_pages/dialysis/details/index.vue Целия файл

@@ -549,7 +549,7 @@
549 549
                   <span style="display: block;width: 45%;">处方脱水量:{{main_collection.prescription.prescription_water}}
550 550
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
551 551
                      <span v-else>L</span>
552
-                  </span> 
552
+                  </span>
553 553
                   <span style="display: block;width: 50%;">
554 554
                     血流量:{{ main_collection.prescription.blood_flow_volume }} ml/min
555 555
                   </span>
@@ -572,7 +572,7 @@
572 572
                   <div style="">透析器:
573 573
                    <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
574 574
                   </div>
575
-                 
575
+
576 576
                 </div>
577 577
               </div>
578 578
             </div>
@@ -2577,7 +2577,7 @@ export default {
2577 2577
           newArr.sort(this.compare('created_time'))
2578 2578
         }
2579 2579
 
2580
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702){
2580
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721){
2581 2581
           if(newArr!=null && newArr.length>0){
2582 2582
             for(let i=0;i<newArr.length;i++){
2583 2583
               newArr[i].sort =0
@@ -2756,7 +2756,7 @@ export default {
2756 2756
           newArr.sort(this.compare('created_time'))
2757 2757
         }
2758 2758
 
2759
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702){
2759
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721){
2760 2760
           if(newArr!=null && newArr.length>0){
2761 2761
             for(let i=0;i<newArr.length;i++){
2762 2762
               newArr[i].sort =0
@@ -3290,7 +3290,7 @@ export default {
3290 3290
         }else{
3291 3291
           this.time_value
3292 3292
         }
3293
-        
3293
+
3294 3294
       }
3295 3295
     },
3296 3296
     timestamp(start_time) {
@@ -3299,7 +3299,7 @@ export default {
3299 3299
     }
3300 3300
 
3301 3301
   },
3302
- 
3302
+
3303 3303
   watch:{
3304 3304
     time_value:{
3305 3305
       handler(newValue,oldValue){

+ 7 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue Целия файл

@@ -538,13 +538,14 @@
538 538
                     <div class="inline_block" style="flex: 1">
539 539
                       处方脱水量:
540 540
                       <div class="under_line" style="width: 50px; text-align: center">
541
-                        {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
541
+                        {{ prescription.prescription_water ? prescription.prescription_water : "/" }}
542 542
                       </div>ml
543 543
                     </div>
544 544
                      <div class="inline_block" style="flex: 1">
545 545
                       超滤总量:
546 546
                       <div class="under_line" style="width: 50px; text-align: center">
547
-                        {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
547
+                        {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
548
+                        <!-- {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }} -->
548 549
                       </div>ml
549 550
                     </div>
550 551
                     <div class="inline_block" style="flex: 1">
@@ -2642,14 +2643,14 @@ export default {
2642 2643
           if (Object.keys(monitor).length > 0 && index > 1) {
2643 2644
             if (
2644 2645
               (this.dialysisOrder &&
2645
-              monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)
2646
+              monitor.operate_time == this.dialysisOrder.end_time)
2646 2647
             ) {
2647 2648
               this.monitors[index].end = "【结束透析】"+"回血"+this.dialysisOrder.blood_drawing +"ml/min";
2648 2649
               tempmonitorflag = false;
2649 2650
             }
2650
-            if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2651
-              this.monitors[index].end = "【结束透析】"+"回血"+this.dialysisOrder.blood_drawing +"ml/min";
2652
-            }
2651
+            //if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2652
+            //   this.monitors[index].end = "【结束透析】"+"回血"+this.dialysisOrder.blood_drawing +"ml/min";
2653
+            // }
2653 2654
           }
2654 2655
         }
2655 2656
 

+ 4 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Целия файл

@@ -1008,10 +1008,11 @@
1008 1008
                       class="inline_block"
1009 1009
                       style="margin-left: 10px; flex: 1"
1010 1010
                     >
1011
-                      置换量:
1011
+                      <span v-if="org_id!=9538">置换量:</span>
1012
+                      <span v-if="org_id==9538">预计置换液量:</span>
1012 1013
                       <div
1013 1014
                         class="under_line"
1014
-                        style="width: 70px; text-align: center"
1015
+                        style="width: 50px; text-align: center"
1015 1016
                       >
1016 1017
                       <span v-if="org_id ==10206 || org_id == 10624 || org_id == 0"> {{
1017 1018
                           prescription.replacement_total
@@ -3926,7 +3927,7 @@
3926 3927
                             "
3927 3928
                             >({{ advice.remark }})
3928 3929
 
3929
-                            
3930
+
3930 3931
                           </span>
3931 3932
                         </td>
3932 3933
 

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue Целия файл

@@ -2527,7 +2527,7 @@
2527 2527
                         />
2528 2528
                       </div>
2529 2529
                       <div
2530
-                        v-if="org_id!=10191"
2530
+                        v-if="org_id!=10191 && org_id!=10677"
2531 2531
                         class="under_line"
2532 2532
                         style="width: 80px; text-align: center"
2533 2533
                       >

+ 85 - 3
src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue Целия файл

@@ -35,7 +35,8 @@
35 35
           <div class="inline_block" style="flex: 1;">
36 36
             年龄:
37 37
             <div class="under_line" style="width: 30px; text-align: center">
38
-              {{ getAge(patientInfo) }}
38
+              <!-- {{ getAge(patientInfo) }} -->
39
+              {{ calculateAge(patientInfo.id_card_no,schedule_date) }}
39 40
             </div>
40 41
41 42
           </div>
@@ -1365,7 +1366,8 @@
1365 1366
         <div class="inline_block" style="margin-left: 10px;">
1366 1367
           年龄:
1367 1368
           <div class="under_line" style="width: 30px;text-align: left">
1368
-            {{ getAge(patientInfo) }}
1369
+            <!-- {{ getAge(patientInfo) }} -->
1370
+            {{ calculateAge(patientInfo.id_card_no,schedule_date) }}
1369 1371
           </div>
1370 1372
1371 1373
         </div>
@@ -2264,6 +2266,7 @@ export default {
2264 2266
       schedule_date_one:"",
2265 2267
       new_doctor_advice_list:[],
2266 2268
       number_list:[],
2269
+      schedule_date:""
2267 2270
     };
2268 2271
   },
2269 2272
   methods: {
@@ -2769,6 +2772,8 @@ export default {
2769 2772
         this.adminUser = response.data.data.users;
2770 2773
         console.log('3333333wwwwww12121',response.data.data);
2771 2774
        var schedule_date  =  response.data.data.schedule.schedule_date
2775
+
2776
+       this.schedule_date = schedule_date
2772 2777
        this.schedule_date_one =  uParseTime(
2773 2778
           schedule_date,
2774 2779
           "{y}-{m}-{d}"
@@ -3432,7 +3437,84 @@ export default {
3432 3437
       }else{
3433 3438
         this.$message.success('核对完成')
3434 3439
       }
3435
-    }
3440
+    },
3441
+    calculateAge(idNumber,created_time) {
3442
+    var year = this.getTimeOne(created_time)
3443
+
3444
+    var month = this.getTimeTwo(created_time)
3445
+
3446
+    var day = this.getTimeThree(created_time)
3447
+    console.log("start_time=====",year)
3448
+    // 假设身份证号码是18位,且生日在第7位到第14位
3449
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
3450
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
3451
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
3452
+ 
3453
+    const today = new Date();
3454
+    // console.log("today============",today)
3455
+    var ageYear = year - birthYear;
3456
+    let ageMonth = month - birthMonth; // 月份是从0开始的
3457
+    let ageDay = day - birthDay;
3458
+ 
3459
+    // 调整月份和日期,以便于正确计算
3460
+      if (ageDay < 0) {
3461
+          ageMonth -= 1;
3462
+          // 获取上个月的天数
3463
+          const pastMonthDay = new Date(year,month, 0).getDate();
3464
+          ageDay += pastMonthDay;
3465
+      }
3466
+      if (ageMonth < 0) {
3467
+          ageYear -= 1;
3468
+          ageMonth += 12;
3469
+      }
3470
+   
3471
+     return ageYear 
3472
+    },
3473
+    // getTime(val) {
3474
+    //   return uParseTime(val, "{y}年{m}月{d}日");
3475
+    // },
3476
+  
3477
+    getTimeOne(val) {
3478
+      return uParseTime(val, "{y}");
3479
+    },
3480
+    getTimeTwo(val) {
3481
+      return uParseTime(val, "{m}");
3482
+    },
3483
+    getTimeThree(val) {
3484
+      return uParseTime(val, "{h}");
3485
+    },
3486
+    calculateAge(idNumber,created_time) {
3487
+    var year = this.getTimeOne(created_time)
3488
+
3489
+    var month = this.getTimeTwo(created_time)
3490
+
3491
+    var day = this.getTimeThree(created_time)
3492
+    console.log("start_time=====",year)
3493
+    // 假设身份证号码是18位,且生日在第7位到第14位
3494
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
3495
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
3496
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
3497
+ 
3498
+    const today = new Date();
3499
+    // console.log("today============",today)
3500
+    var ageYear = year - birthYear;
3501
+    let ageMonth = month - birthMonth; // 月份是从0开始的
3502
+    let ageDay = day - birthDay;
3503
+ 
3504
+    // 调整月份和日期,以便于正确计算
3505
+      if (ageDay < 0) {
3506
+          ageMonth -= 1;
3507
+          // 获取上个月的天数
3508
+          const pastMonthDay = new Date(year,month, 0).getDate();
3509
+          ageDay += pastMonthDay;
3510
+      }
3511
+      if (ageMonth < 0) {
3512
+          ageYear -= 1;
3513
+          ageMonth += 12;
3514
+      }
3515
+   
3516
+     return ageYear 
3517
+    },
3436 3518
 
3437 3519
   },
3438 3520
   watch: {

+ 93 - 28
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Целия файл

@@ -270,10 +270,16 @@
270 270
                       <div class="under_line"
271 271
                         style="width: 70px; text-align: center"
272 272
                       >
273
-                        <span> {{
273
+                        <span> 
274
+                          <!-- {{
274 275
                           prescription.displace_liqui_value
275 276
                             ? prescription.displace_liqui_value
276 277
                             : "/"
278
+                        }} -->
279
+                        {{
280
+                          prescription.replacement_total
281
+                            ? prescription.replacement_total
282
+                            : "/"
277 283
                         }}
278 284
                         </span>
279 285
                       </div>
@@ -291,7 +297,7 @@
291 297
                       </div>
292 298
                       ml/min
293 299
                     </div>
294
-                    
300
+
295 301
                   </div>
296 302
 
297 303
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -370,11 +376,13 @@
370 376
                   </div>
371 377
 
372 378
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
373
-                    
379
+
374 380
                     <div class="inline_block" style="flex: 1">
375 381
                       上次透后体重:
376 382
                       <div class="under_line" style="width: 50px; text-align: center">
377
-                        {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
383
+                        <!-- {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}} -->
384
+                        <span v-if="lastafterdialysis.weight_after>0">{{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}</span> 
385
+                        <span v-if="lastafterdialysis.weight_after<=0">{{afterdialysis.last_after_weight?afterdialysis.last_after_weight:"未称重"}}</span> 
378 386
                       </div>
379 387
                       kg
380 388
                     </div>
@@ -397,7 +405,9 @@
397 405
                       体重增加:
398 406
                       <div class="under_line" style="width: 70px; text-align: center">
399 407
                         <span>
400
-                          {{ (predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2)}}
408
+                          <!-- {{ (predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2)}} -->
409
+                          <span v-if="lastafterdialysis.weight_after>0">{{ (predialysis.weight_before - predialysis.additional_weight - lastafterdialysis.weight_after).toFixed(2)}}</span> 
410
+                          <span v-if="lastafterdialysis.weight_after<=0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span> 
401 411
                         </span>
402 412
                       </div>
403 413
                       kg
@@ -643,11 +653,11 @@
643 653
                         <td height="40px">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
644 654
                         <td >{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
645 655
                         <td>
646
-                          <span v-if="monitor.systolic_blood_pressure>0">{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span> 
647
-                          <span v-if="monitor.systolic_blood_pressure == 0">{{monitor.replacement_rate ? monitor.replacement_rate : ''}}</span> 
656
+                          <span v-if="monitor.systolic_blood_pressure>0">{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span>
657
+                          <span v-if="monitor.systolic_blood_pressure == 0">{{monitor.replacement_rate ? monitor.replacement_rate : ''}}</span>
648 658
                         </td>
649 659
                         <td >
650
-                         <span v-if="monitor.systolic_blood_pressure>0">{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</span> 
660
+                         <span v-if="monitor.systolic_blood_pressure>0">{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</span>
651 661
                          <span v-if="monitor.systolic_blood_pressure ==0">{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '' }}</span>
652 662
                         </td>
653 663
                         <td >
@@ -1081,9 +1091,10 @@
1081 1091
                   >
1082 1092
 
1083 1093
                     <div class="inline_block" style="flex: 1">
1084
-                      穿刺护士:
1094
+                      上机护士:
1085 1095
                       <div  class="under_line"
1086 1096
                         style="width: 90px; text-align: center"
1097
+                          v-if="predialysis.internal_fistula!=''"
1087 1098
                       >
1088 1099
                         <span
1089 1100
                           style="height: 30px; display: inline-block"
@@ -1117,6 +1128,43 @@
1117 1128
                           v-else
1118 1129
                         />
1119 1130
                       </div>
1131
+
1132
+                      <div  class="under_line"
1133
+                        style="width: 90px; text-align: center"
1134
+                        v-if="predialysis.catheter!=''"
1135
+                      >
1136
+                        <span
1137
+                          style="height: 30px; display: inline-block"
1138
+                          v-if="
1139
+                            setAdminUserES(
1140
+                              dialysisOrder == null
1141
+                                ? 0
1142
+                                : dialysisOrder.change_nurse
1143
+                            ) == ''
1144
+                          "
1145
+                        >
1146
+                          {{
1147
+                            getAdminUser(
1148
+                              dialysisOrder == null
1149
+                                ? 0
1150
+                                : dialysisOrder.change_nurse
1151
+                            )
1152
+                          }}</span
1153
+                        >
1154
+                        <img
1155
+                          style="height: 30px"
1156
+                          :src="
1157
+                            setAdminUserES(
1158
+                              dialysisOrder == null
1159
+                                ? 0
1160
+                                : dialysisOrder.change_nurse
1161
+                            )
1162
+                          "
1163
+                          alt=""
1164
+                          srcset=""
1165
+                          v-else
1166
+                        />
1167
+                      </div>
1120 1168
                     </div>
1121 1169
 
1122 1170
                     <div class="inline_block" style="flex: 1">
@@ -1845,7 +1893,7 @@ export default {
1845 1893
             }
1846 1894
           }
1847 1895
         })
1848
-      } 
1896
+      }
1849 1897
       if(this.monitors.length >0){
1850 1898
         for(let i in this.monitors){
1851 1899
           if(this.monitors[i].blood_flow_volume ==0){
@@ -1893,7 +1941,7 @@ export default {
1893 1941
 
1894 1942
         }
1895 1943
       }
1896
-      
1944
+
1897 1945
 
1898 1946
       if(monearr.length>0){
1899 1947
        checkDate =checkDate.concat(monearr)
@@ -2222,23 +2270,23 @@ export default {
2222 2270
           this.monitors[index].end = "";
2223 2271
           if (Object.keys(monitor).length > 0 && index > 1) {
2224 2272
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
2273
+              console.log('1111122222',monitor.operate_time==this.dialysisOrder.end_time);
2225 2274
               if(this.org_id!=10683){
2226 2275
                 this.monitors[index].end = "【结束透析】回血100ml/min";
2227 2276
               }
2228
-
2229 2277
               tempmonitorflag = false;
2230 2278
             }
2231
-            if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2232
-              if(this.org_id!=10683){
2233
-                this.monitors[index].end = "【结束透析】回血100ml/min";
2234
-              }
2235
-            }
2279
+            // if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2280
+            //   if(this.org_id!=10683){
2281
+            //     this.monitors[index].end = "【结束透析】回血100ml/min";
2282
+            //   }
2283
+            // }
2236 2284
           }
2237 2285
         }
2238 2286
 
2239
-        this.jilurow = this.monitors.length + 1;
2287
+        // this.jilurow = this.monitors.length + 1;
2240 2288
 
2241
-        this.advice_jilurow = this.advices.length + 1;
2289
+        // this.advice_jilurow = this.advices.length + 1;
2242 2290
 
2243 2291
         var childMap = {};
2244 2292
         for (const index in this.advices) {
@@ -2490,14 +2538,14 @@ export default {
2490 2538
         //过滤口服药
2491 2539
         if(this.org_id ==10721 ||this.org_id ==0){
2492 2540
           console.log('df11111111',this.doctor_advices);
2493
-          
2541
+
2494 2542
           var docArr = []
2495 2543
           if(this.doctor_advices!=null && this.doctor_advices.length>0){
2496 2544
             for(let i=0;i<this.doctor_advices.length;i++){
2497 2545
               if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
2498 2546
                 if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
2499 2547
                   docArr.push(this.doctor_advices[i])
2500
-                 }  
2548
+                 }
2501 2549
               }
2502 2550
             }
2503 2551
           }
@@ -2708,15 +2756,32 @@ export default {
2708 2756
     },
2709 2757
     getcheckData(val){
2710 2758
       if(val.length >0){
2711
-        let message = `记录单未填数据:<br/><br/>&nbsp;&nbsp;${val.join("<br/><br/>&nbsp;&nbsp;")}`;
2712
-        this.$message({
2759
+        let message = `记录单未填数据:<br/>&nbsp;&nbsp;${val.join("<br/>&nbsp;&nbsp;")}`;
2760
+        this.$confirm(message, '提示', {
2761
+          confirmButtonText: '确定',
2762
+          cancelButtonText: '取消',
2763
+          type: 'warning',
2713 2764
           dangerouslyUseHTMLString: true,
2714
-          message:message,
2715
-          duration:0,
2716
-          showClose:true,
2717
-          type:'error'
2718 2765
         })
2719
-        return message
2766
+        // .then(() => {
2767
+        //   this.$message({
2768
+        //     type: 'success',
2769
+        //     message: '删除成功!'
2770
+        //   });
2771
+        // }).catch(() => {
2772
+        //   this.$message({
2773
+        //     type: 'info',
2774
+        //     message: '已取消删除'
2775
+        //   });
2776
+        // });
2777
+        // this.$message({
2778
+        //   dangerouslyUseHTMLString: true,
2779
+        //   message:message,
2780
+        //   duration:0,
2781
+        //   showClose:true,
2782
+        //   type:'error'
2783
+        // })
2784
+        // return message
2720 2785
       }else{
2721 2786
         this.$message.success('核对完成')
2722 2787
       }

+ 4 - 4
src/xt_pages/outpatientCharges/components/prescriptionTable.vue Целия файл

@@ -74,13 +74,13 @@
74 74
         </template>
75 75
       </el-table-column>
76 76
 
77
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0">
77
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0 && $store.getters.xt_user.template_info.org_id!=10721">
78 78
         <template slot-scope="scope">
79 79
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
80 80
         </template>
81 81
       </el-table-column>
82 82
 
83
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0">
83
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0 && $store.getters.xt_user.template_info.org_id!=10721">
84 84
         <template slot-scope="scope">
85 85
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
86 86
         </template>
@@ -249,13 +249,13 @@
249 249
         <template slot-scope="scope">{{ scope.row.price }}元</template>
250 250
       </el-table-column>
251 251
 
252
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0">
252
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0 && $store.getters.xt_user.template_info.org_id!=10721">
253 253
         <template slot-scope="scope">
254 254
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
255 255
         </template>
256 256
       </el-table-column>
257 257
 
258
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0">
258
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0  && $store.getters.xt_user.template_info.org_id!=10721">
259 259
         <template slot-scope="scope">
260 260
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
261 261
         </template>

+ 12 - 6
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Целия файл

@@ -541,10 +541,10 @@
541 541
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
542 542
               console.log('123',scope.row.drug.dose,scope.row.execution_frequency,scope.row.drug.min_unit)
543 543
               // 单次用量single_dose,用量单位single_dose_unit,用法delivery_way,频率execution_frequency 总量prescribing_number,规格drug.dose
544
-              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.drug.dose)) ) //  / scope.row.drug.dose
544
+              scope.row.prescribing_number = Math.ceil((parseInt(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.drug.dose)) ) //  / scope.row.drug.dose
545 545
             } else {
546
-              console.log(1234)
547
-              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.drug.dose)) / scope.row.drug.min_number)//
546
+              console.log(1234,scope.row.drug.dose)
547
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / (scope.row.drug.dose*1) / (scope.row.drug.min_number*1))//
548 548
             }
549 549
           }
550 550
           if (scope.row.prescribing_number == 0) {
@@ -772,9 +772,15 @@
772 772
       },
773 773
       getdrugdose(val){
774 774
         if(val !=''){
775
-          const arr = val.split(':')[1]
776
-          console.log('yyyytrrrreee',arr);
777
-          return arr
775
+          if(val.indexOf(':') !=-1){
776
+            const arr = val.split(':')[1]
777
+            console.log('yyyytrrrreee',arr);
778
+            return arr
779
+          }else{
780
+            return val
781
+          }
782
+        }else{
783
+          return ''
778 784
         }
779 785
       }
780 786
 

+ 46 - 10
src/xt_pages/user/components/PatientDetail.vue Целия файл

@@ -1033,12 +1033,12 @@
1033 1033
     </el-form>
1034 1034
     <!-- 打印预览 style="display: none"-->
1035 1035
     <div style="display: none">
1036
-      <div id="print-info-box" v-if="org_id !=10206&&org_id !=0">
1036
+      <div id="print-info-box" v-if="org_id !=10206">
1037 1037
         <div class="print_main_content" style="margin-top: 70px;">
1038 1038
           <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
1039 1039
           <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
1040 1040
           <div >
1041
-            <table >
1041
+            <table style="border-collapse: collapse;">
1042 1042
               <!-- 用 thead 规定好宽度 -->
1043 1043
               <!-- <thead>
1044 1044
                 <tr v-show="false">
@@ -1252,9 +1252,6 @@
1252 1252
                     >  {{ patientPrint.remark }}</div>
1253 1253
                   </td>
1254 1254
                 </tr>
1255
-
1256
-
1257
-
1258 1255
                 <tr>
1259 1256
                   <td>
1260 1257
                     <div class="td_proj_title">诊<br />断</div>
@@ -1286,10 +1283,6 @@
1286 1283
               <div class="proj">
1287 1284
                 <span class="proj_title">日期:</span>
1288 1285
 
1289
-                <!-- <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394 || org_id ==10612 || org_id == 0 || org_id ==10617">
1290
-                {{getTime(patientPrint.created_time)}}</span>
1291
-                <span v-else>{{ printDate }}</span> -->
1292
-
1293 1286
                 <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
1294 1287
                 <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
1295 1288
 
@@ -1332,7 +1325,9 @@
1332 1325
                     年龄
1333 1326
                   </td>
1334 1327
                   <td style="padding: 5px 0px;font-size: 22px;width:10%;">
1335
-                    {{ patientPrint.age }}岁
1328
+                    <!-- {{ patientPrint.age }} -->
1329
+                     {{ calculateAge(patientPrint.id_card_no,patientPrint.created_time) }}
1330
+                    岁
1336 1331
                   </td>
1337 1332
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:12%;">
1338 1333
                     医保类型
@@ -1835,9 +1830,50 @@ export default {
1835 1830
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
1836 1831
   },
1837 1832
   methods: {
1833
+   calculateAge(idNumber,created_time) {
1834
+    var year = this.getTimeOne(created_time)
1835
+
1836
+    var month = this.getTimeTwo(created_time)
1837
+
1838
+    var day = this.getTimeThree(created_time)
1839
+    console.log("start_time=====",year)
1840
+    // 假设身份证号码是18位,且生日在第7位到第14位
1841
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
1842
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
1843
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
1844
+ 
1845
+    const today = new Date();
1846
+    // console.log("today============",today)
1847
+    var ageYear = year - birthYear;
1848
+    let ageMonth = month - birthMonth; // 月份是从0开始的
1849
+    let ageDay = day - birthDay;
1850
+ 
1851
+    // 调整月份和日期,以便于正确计算
1852
+      if (ageDay < 0) {
1853
+          ageMonth -= 1;
1854
+          // 获取上个月的天数
1855
+          const pastMonthDay = new Date(year,month, 0).getDate();
1856
+          ageDay += pastMonthDay;
1857
+      }
1858
+      if (ageMonth < 0) {
1859
+          ageYear -= 1;
1860
+          ageMonth += 12;
1861
+      }
1862
+   
1863
+     return ageYear 
1864
+    },
1838 1865
     getTime(val) {
1839 1866
       return uParseTime(val, "{y}年{m}月{d}日");
1840 1867
     },
1868
+    getTimeOne(val) {
1869
+      return uParseTime(val, "{y}");
1870
+    },
1871
+    getTimeTwo(val) {
1872
+      return uParseTime(val, "{m}");
1873
+    },
1874
+    getTimeThree(val) {
1875
+      return uParseTime(val, "{h}");
1876
+    },
1841 1877
     printThisInfo() {
1842 1878
       var ptime = Math.round(new Date().getTime() / 1000);
1843 1879
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");

+ 13 - 7
src/xt_pages/user/inspection.vue Целия файл

@@ -1343,24 +1343,29 @@ export default {
1343 1343
               var item = {}
1344 1344
               for (var key in items[index]) {
1345 1345
                 //  console.log("key",key,items[index][key])
1346
-                //  console.log("item[key]",item[key])
1346
+                // console.log("item[key]",items[index])
1347 1347
                 item[key] = items[index][key]
1348 1348
               }
1349 1349
 
1350 1350
               console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
1351 1351
               if (item.item_id > 0) {
1352
-                console.log('执行0',inspectionsMap);
1352
+                console.log('执行0',inspectionsMap[items[index].id]);
1353 1353
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1354 1354
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278 ){
1355 1355
                     item.value = inspectionsMap[items[index].id].inspect_value
1356 1356
                     item.item_name = inspectionsMap[items[index].id].item_name
1357 1357
                   }else{
1358
-                    item.value = ""
1359
-                    item.item_name = ""
1358
+                    console.log('执行3',inspectionsMap,item);
1359
+                    if(item.project_name == '血常规'){
1360
+                      item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
1361
+                      item.item_name = inspectionsMap[items[index].id].item_name
1362
+                    }else{
1363
+                      item.value = ''
1364
+                      item.item_name = ''
1365
+                    }
1360 1366
                   }
1361 1367
                 } else {
1362 1368
                   console.log('执行1',inspectionsMap);
1363
-                  
1364 1369
                   item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
1365 1370
                   item.item_name = inspectionsMap[items[index].item_id].item_name
1366 1371
                 }
@@ -1395,9 +1400,9 @@ export default {
1395 1400
               }
1396 1401
               console.log("items23233232",item)
1397 1402
               if(this.org_id!=10503){
1398
-                if(item.project_name!=""){
1403
+                if(item.project_name!="" && item.item_name !=''){
1399 1404
                  this.items.push(item)
1400
-               }
1405
+                }
1401 1406
               }else{
1402 1407
                 this.items.push(item)
1403 1408
               }
@@ -1411,6 +1416,7 @@ export default {
1411 1416
                 this.isPic = false
1412 1417
               }
1413 1418
 
1419
+
1414 1420
               console.log("woowwoow",this.isPic)
1415 1421
               console.log("isPicwowowow",this.items)
1416 1422
             }

Файловите разлики са ограничени, защото са твърде много
+ 1735 - 1807
src/xt_pages/workforce/scheduleTablePrintTwo.vue