Selaa lähdekoodia

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

XMLWAN 4 vuotta sitten
vanhempi
commit
a1ae3570af

+ 19 - 19
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue Näytä tiedosto

@@ -13,15 +13,15 @@
13 13
           <div class="row">
14 14
             <div class="inline_block">
15 15
               科室:
16
-              <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
16
+              <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
17 17
               &nbsp;
18
-              <check-box text="住院" :checked="record.patient.source == 2"></check-box>
18
+              <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
19 19
               <!-- TODO -->
20 20
             </div>
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23
-              <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
24
-                {{record.patient.admission_number}}
23
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24
+                {{record.receive_assessment.admission_number}}
25 25
               </div>
26 26
               <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
@@ -375,15 +375,15 @@
375 375
             <div class="row">
376 376
               <div class="inline_block">
377 377
                 科室:
378
-                <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
378
+                <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
379 379
                 &nbsp;
380
-                <check-box text="住院" :checked="record.patient.source == 2"></check-box>
380
+                <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
381 381
                 <!-- TODO -->
382 382
               </div>
383 383
               <div class="inline_block" style="margin-left: 5px;">
384 384
                 住院号:
385
-                <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
386
-                  {{record.patient.admission_number}}
385
+                <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
386
+                  {{record.receive_assessment.admission_number}}
387 387
                 </div>
388 388
                 <div class="under_line" style="width: 70px;" v-else>
389 389
                   {{'/'}}
@@ -583,15 +583,15 @@
583 583
                       &emsp;核对人:
584 584
                       <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order  == null">
585 585
                       </div>
586
-                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == record.check.creater">
586
+                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == (record.check?record.check.creater:0)">
587 587
                         <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')}}</span>
588 588
                         <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" v-else>
589 589
                       </div>
590
-                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == record.check.modifier">
590
+                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == (record.check?record.check.modifier:0)">
591 591
                         <span v-if="setAdminUserES(record.check, 'creater') == ''">{{getAdminUser(record.check, 'creater')}}</span>
592 592
                         <img class="es-img" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else>
593 593
                       </div>
594
-                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse != record.check.modifier&&record.dialysis_order.start_nurse != record.check.creater">
594
+                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse != (record.check?record.check.modifier:0)&&record.dialysis_order.start_nurse != (record.check?record.check.creater:0)">
595 595
                         <span v-if="setAdminUserES(record.check, 'creater') == ''">{{getAdminUser(record.check, 'creater')}}</span>
596 596
                         <img class="es-img" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else>
597 597
                       </div>
@@ -686,15 +686,15 @@
686 686
           <div class="row">
687 687
             <div class="inline_block">
688 688
               科室:
689
-              <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
689
+              <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
690 690
               &nbsp;
691
-              <check-box text="住院" :checked="record.patient.source == 2"></check-box>
691
+              <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
692 692
               <!-- TODO -->
693 693
             </div>
694 694
             <div class="inline_block" style="margin-left: 5px;">
695 695
               住院号:
696
-              <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
697
-                {{record.patient.admission_number}}
696
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
697
+                {{record.receive_assessment.admission_number}}
698 698
               </div>
699 699
               <div class="under_line" style="width: 70px;" v-else>
700 700
                 {{'/'}}
@@ -1034,15 +1034,15 @@
1034 1034
               <div class="row">
1035 1035
                 <div class="inline_block">
1036 1036
                   科室:
1037
-                  <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
1037
+                  <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
1038 1038
                   &nbsp;
1039
-                  <check-box text="住院" :checked="record.patient.source == 2"></check-box>
1039
+                  <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
1040 1040
                   <!-- TODO -->
1041 1041
                 </div>
1042 1042
                 <div class="inline_block" style="margin-left: 5px;">
1043 1043
                   住院号:
1044
-                  <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
1045
-                    {{record.patient.admission_number}}
1044
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
1045
+                    {{record.receive_assessment.admission_number}}
1046 1046
                   </div>
1047 1047
                   <div class="under_line" style="width: 70px;" v-else>
1048 1048
                     {{'/'}}

+ 11 - 11
src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue Näytä tiedosto

@@ -13,15 +13,15 @@
13 13
           <div class="row">
14 14
             <div class="inline_block">
15 15
               科室:
16
-              <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
16
+              <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
17 17
               &nbsp;
18
-              <check-box text="住院" :checked="record.patient.source == 2"></check-box>
18
+              <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
19 19
               <!-- TODO -->
20 20
             </div>
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23
-              <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
24
-                {{record.patient.admission_number}}
23
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24
+                {{record.receive_assessment.admission_number}}
25 25
               </div>
26 26
               <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
@@ -371,15 +371,15 @@
371 371
             <div class="row">
372 372
               <div class="inline_block">
373 373
                 科室:
374
-                <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
374
+                <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
375 375
                 &nbsp;
376
-                <check-box text="住院" :checked="record.patient.source == 2"></check-box>
376
+                <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
377 377
                 <!-- TODO -->
378 378
               </div>
379 379
               <div class="inline_block" style="margin-left: 5px;">
380 380
                 住院号:
381
-                <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
382
-                  {{record.patient.admission_number}}
381
+                <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
382
+                  {{record.receive_assessment.admission_number}}
383 383
                 </div>
384 384
                 <div class="under_line" style="width: 70px;" v-else>
385 385
                   {{'/'}}
@@ -576,15 +576,15 @@
576 576
                       &emsp;核对人:
577 577
                       <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order == null">
578 578
                       </div>
579
-                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == record.check.creater">
579
+                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == (record.check?record.check.creater:0)">
580 580
                         <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')}}</span>
581 581
                         <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" v-else>
582 582
                       </div>
583
-                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == record.check.modifier">
583
+                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse == (record.check?record.check.modifier:0)">
584 584
                         <span v-if="setAdminUserES(record.check, 'creater') == ''">{{getAdminUser(record.check, 'creater')}}</span>
585 585
                         <img class="es-img" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else>
586 586
                       </div>
587
-                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse != record.check.modifier&&record.dialysis_order.start_nurse != record.check.creater">
587
+                      <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order != null&&record.dialysis_order.start_nurse != (record.check?record.check.modifier:0)&&record.dialysis_order.start_nurse != (record.check?record.check.creater:0)">
588 588
                         <span v-if="setAdminUserES(record.check, 'creater') == ''">{{getAdminUser(record.check, 'creater')}}</span>
589 589
                         <img class="es-img" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else>
590 590
                       </div>

+ 9 - 9
src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue Näytä tiedosto

@@ -13,15 +13,15 @@
13 13
           <div class="row">
14 14
             <div class="inline_block">
15 15
               科室:
16
-              <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
16
+              <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
17 17
               &nbsp;
18
-              <check-box text="住院" :checked="record.patient.source == 2"></check-box>
18
+              <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
19 19
               <!-- TODO -->
20 20
             </div>
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23
-              <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
24
-                {{record.patient.admission_number}}
23
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24
+                {{record.receive_assessment.admission_number}}
25 25
               </div>
26 26
               <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
@@ -350,15 +350,15 @@
350 350
               <div class="row">
351 351
                 <div class="inline_block">
352 352
                   科室:
353
-                  <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
353
+                  <check-box text="门诊透析" :checked="record.receive_assessment.condition == 2"></check-box>
354 354
                   &nbsp;
355
-                  <check-box text="住院" :checked="record.patient.source == 2"></check-box>
355
+                  <check-box text="住院" :checked="record.receive_assessment.condition == 1"></check-box>
356 356
                   <!-- TODO -->
357 357
                 </div>
358 358
                 <div class="inline_block" style="margin-left: 5px;">
359 359
                   住院号:
360
-                  <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
361
-                    {{record.patient.admission_number}}
360
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
361
+                    {{record.receive_assessment.admission_number}}
362 362
                   </div>
363 363
                   <div class="under_line" style="width: 70px;" v-else>
364 364
                     {{'/'}}
@@ -371,7 +371,7 @@
371 371
                 <div class="inline_block" style="margin-left: 10px;">
372 372
                   性别:
373 373
                   <check-box text="男" :checked="record.patient.gender == 1"></check-box>
374
-                  &nbsp
374
+                  &nbsp;
375 375
                   <check-box text="女" :checked="record.patient.gender == 2"></check-box>
376 376
                 </div>
377 377
                 <div class="inline_block" style="margin-left: 10px;">

+ 2 - 7
src/xt_pages/dialysis/dialysisPrintOrder.vue Näytä tiedosto

@@ -12,12 +12,7 @@
12 12
           >打印</el-button
13 13
         >
14 14
       </template>
15
-      <template
16
-        v-if="
17
-          org_template_info.template_id == 2 ||
18
-            org_template_info.template_id == 0
19
-        "
20
-      >
15
+      <template v-if=" org_template_info.template_id == 2 || org_template_info.template_id == 0  " >
21 16
         <div>
22 17
           <el-button
23 18
             :loading="loading"
@@ -343,7 +338,7 @@ export default {
343 338
       const style =
344 339
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
345 340
       const style2 =
346
-        '@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: 3px 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-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.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: 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;}';
341
+        '@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: 3px 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-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.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%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
347 342
 
348 343
       if (this.org_template_info.template_id == 1) {
349 344
         printJS({

+ 29 - 137
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Näytä tiedosto

@@ -871,134 +871,29 @@
871 871
                     </tr>
872 872
 
873 873
                     <tr v-for="(monitor, monindex) in monitors" :key="monindex">
874
-                      <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
875
-                      <td>
876
-                        {{
877
-                          monitor.systolic_blood_pressure
878
-                            ? monitor.systolic_blood_pressure + "/"
879
-                            : ""
880
-                        }}{{
881
-                          monitor.diastolic_blood_pressure
882
-                            ? monitor.diastolic_blood_pressure
883
-                            : ""
884
-                        }}
885
-                      </td>
886
-                      <td>
887
-                        {{
888
-                          monitor.pulse_frequency ? monitor.pulse_frequency : ""
889
-                        }}
890
-                      </td>
891
-                      <td>
892
-                        {{
893
-                          monitor.breathing_rate ? monitor.breathing_rate : ""
894
-                        }}
895
-                      </td>
896
-                      <td>
897
-                        {{
898
-                          monitor.blood_flow_volume
899
-                            ? monitor.blood_flow_volume
900
-                            : ""
901
-                        }}
902
-                      </td>
903
-                      <td>
904
-                        {{
905
-                          monitor.venous_pressure ? monitor.venous_pressure : ""
906
-                        }}
907
-                      </td>
908
-                      <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time)">
909
-                        {{
910
-                          monitor.transmembrane_pressure
911
-                            ? monitor.transmembrane_pressure
912
-                            : ""
913
-                        }}
914
-                      </td>
915
-                      <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time)">
916
-                        {{
917
-                          monitor.transmembrane_pressure
918
-                            ? monitor.transmembrane_pressure
919
-                            : 0
920
-                        }}
921
-                      </td>
922
-                      <td>
923
-                        {{
924
-                          monitor.dialysate_temperature
925
-                            ? monitor.dialysate_temperature
926
-                            : ""
927
-                        }}
928
-                      </td>
929
-                      <td>
930
-                        {{
931
-                          monitor.sodium_concentration
932
-                            ? monitor.sodium_concentration
933
-                            : ""
934
-                        }}
935
-                      </td>
936
-                      <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time)">
937
-                        {{
938
-                          monitor.ultrafiltration_volume
939
-                            ? monitor.ultrafiltration_volume
940
-                            : ""
941
-                        }}
942
-                      </td>
943
-                      <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time)">
944
-                        {{
945
-                          monitor.ultrafiltration_volume
946
-                            ? monitor.ultrafiltration_volume
947
-                            : 0
948
-                        }}
949
-                      </td>
950
-                      <td
951
-                        v-if="
952
-                          dialysisOrder && (prescription.mode_id == 2 ||
953
-                            prescription.mode_id == 5) &&
954
-                            monitor.operate_time > dialysisOrder.end_time
955
-                        "
956
-                        width="50"
957
-                      >
958
-                        {{
959
-                          monitor.displacement_quantity
960
-                            ? monitor.displacement_quantity
961
-                            : ""
962
-                        }}
963
-                      </td>
964
-                      <td
965
-                        v-if="
966
-                         dialysisOrder && (prescription.mode_id == 2 ||
967
-                            prescription.mode_id == 5) &&
968
-                            monitor.operate_time <= dialysisOrder.end_time
969
-                        "
970
-                        width="50"
971
-                      >
972
-                        {{
973
-                          monitor.displacement_quantity
974
-                            ? monitor.displacement_quantity
975
-                            : 0
976
-                        }}
977
-                      </td>
874
+                      <td> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
875
+                      <td> {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}{{  monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }} </td> 
876
+                      <td> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }} </td>
877
+                      <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
878
+                      <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
879
+                      <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>
880
+                      <td v-if="monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure  : "" }} </td>
881
+                      <td v-if="monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time"> {{  monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
882
+                      <td> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
883
+                      <td> {{ monitor.sodium_concentration  ? monitor.sodium_concentration : "" }}  </td>
884
+                      <td v-if="monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume  : "" }} </td>
885
+                      <td v-if="monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume  : 0 }} </td>
886
+                      <td v-if="  (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time  "  width="50" >  {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
887
+                      <td v-if=" (prescription.mode_id == 2 ||  prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time  " width="50"  > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
978 888
                       <td style="line-height:16px;padding:0px;">
979
-                        <div
980
-                          style="min-height:35px;line-height:35px; overflow:hidden;"
981
-                        >
982
-                          <span
983
-                            style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"
984
-                          >
985
-                            <template
986
-                              v-if="monitor.operate_time == dialysisOrder.start_time"
987
-                              >【开始透析】</template
988
-                            >
989
-                            {{ monitor.end }}
990
-                            {{ monitor.symptom }} &nbsp;{{
991
-                              monitor.dispose
992
-                            }}
993
-                            &nbsp;{{ monitor.result }}
889
+                        <div style="min-height:35px;line-height:35px; overflow:hidden;">
890
+                          <span  style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
891
+                            <template v-if=" monitor.operate_time == dialysisOrder.start_time " >【开始透析】</template > {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
994 892
                           </span>
995
-                        </div>
893
+                        </div> 
996 894
                       </td>
997 895
                     </tr>
998
-                    <tr
999
-                      v-for="(monitor, monindex) in monitors2"
1000
-                      :key="monindex"
1001
-                    >
896
+                    <tr v-for="(monitor, monindex) in monitors2" :key="monindex" >
1002 897
                       <td></td>
1003 898
                       <td></td>
1004 899
                       <td></td>
@@ -2161,7 +2056,7 @@ export default {
2161 2056
 
2162 2057
         this.users = response.data.data.users;
2163 2058
         this.patientInfo = response.data.data.patientInfo;
2164
-       
2059
+
2165 2060
         this.patientInfo.birth = uParseTime(
2166 2061
           this.patientInfo.birthday,
2167 2062
           "{y}-{m}-{d}"
@@ -2524,20 +2419,17 @@ export default {
2524 2419
       return "";
2525 2420
     },
2526 2421
     getAge: function(val) {
2527
-      if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
2528
-        if(val.birthday != 0){
2529
-          return jsGetAge(val.birth, '-')
2530
-        }else{
2531
-
2532
-          return ''
2533
-
2422
+      if (
2423
+        this.org_template_info.template_id == 2 ||
2424
+        this.org_template_info.template_id == 0
2425
+      ) {
2426
+        if (val.age == 0) {
2427
+          return jsGetAge(val.birth, "-");
2428
+        } else {
2429
+          return val.age;
2534 2430
         }
2535 2431
       } else {
2536
-        if(val.birthday != 0){
2537
-          return jsGetAge(val.birth, '-')
2538
-        }else{
2539
-          return ''
2540
-        }
2432
+        return jsGetAge(val.birth, "-");
2541 2433
       }
2542 2434
     },
2543 2435
     newAdviceGroupObject: function() {

+ 14 - 14
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue Näytä tiedosto

@@ -12,8 +12,8 @@
12 12
         </div>
13 13
         <div class="inline_block" style="margin-left: 5px;">
14 14
           住院号:
15
-          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
16
-            {{patientInfo.admission_number}}
15
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
16
+            {{receiverTreatmentAccess.admission_number}}
17 17
           </div>
18 18
           <div class="under_line" style="width: 70px;text-align: left" v-else>
19 19
             {{'/'}}
@@ -304,8 +304,8 @@
304 304
           </div>
305 305
           <div class="inline_block" style="margin-left: 5px;">
306 306
             住院号:
307
-            <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
308
-              {{patientInfo.admission_number}}
307
+            <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
308
+              {{receiverTreatmentAccess.admission_number}}
309 309
             </div>
310 310
             <div class="under_line" style="width: 70px;text-align: left" v-else>
311 311
               {{'/'}}
@@ -600,8 +600,8 @@
600 600
         </div>
601 601
         <div class="inline_block" style="margin-left: 5px;">
602 602
           住院号:
603
-          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
604
-            {{patientInfo.admission_number}}
603
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
604
+            {{receiverTreatmentAccess.admission_number}}
605 605
           </div>
606 606
           <div class="under_line" style="width: 70px;text-align: left" v-else>
607 607
             {{'/'}}
@@ -939,8 +939,8 @@
939 939
             </div>
940 940
             <div class="inline_block" style="margin-left: 5px;">
941 941
               住院号:
942
-              <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
943
-                {{patientInfo.admission_number}}
942
+              <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
943
+                {{receiverTreatmentAccess.admission_number}}
944 944
               </div>
945 945
               <div class="under_line" style="width: 70px;text-align: left" v-else>
946 946
                 {{'/'}}
@@ -1643,13 +1643,13 @@
1643 1643
           this.patientInfo_gender_1 = false
1644 1644
         }
1645 1645
       },
1646
-      'patientInfo.source': function() {
1647
-        if (this.patientInfo.source == 1) {
1648
-          this.patientInfo_source_1 = true
1649
-          this.patientInfo_source_2 = false
1650
-        } else if (this.patientInfo.source == 2) {
1651
-          this.patientInfo_source_2 = true
1646
+      'receiverTreatmentAccess.condition': function() {
1647
+        if (this.receiverTreatmentAccess.condition == 1) {
1652 1648
           this.patientInfo_source_1 = false
1649
+          this.patientInfo_source_2 = true
1650
+        } else if (this.receiverTreatmentAccess.source == 2) {
1651
+          this.patientInfo_source_2 = false
1652
+          this.patientInfo_source_1 = true
1653 1653
         } else {
1654 1654
           this.patientInfo_source_2 = false
1655 1655
           this.patientInfo_source_1 = false