yq1 преди 4 часа
родител
ревизия
f323065445
променени са 2 файла, в които са добавени 36 реда и са изтрити 8 реда
  1. 18 4
      src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue
  2. 18 4
      src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

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

@@ -1036,21 +1036,35 @@
1036 1036
                         <div class="under_line"
1037 1037
                           style="width: 50px; text-align: center"
1038 1038
                         >
1039
-                          {{
1039
+                          <!-- {{
1040 1040
                             record.assessment_after_dislysis.systolic_blood_pressure
1041 1041
                               ? record.assessment_after_dislysis.systolic_blood_pressure
1042 1042
                               : "/"
1043
-                          }}
1043
+                          }} -->
1044
+                          <span v-if="record.monitor_records.length>0">
1045
+                            {{ 
1046
+                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure ?
1047
+                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure :'/'
1048
+                            }}
1049
+                          </span>
1050
+                          <span v-else>/</span>
1044 1051
                         </div>
1045 1052
                         /
1046 1053
                         <div class="under_line"
1047 1054
                           style="width: 50px; text-align: center"
1048 1055
                         >
1049
-                          {{
1056
+                          <!-- {{
1050 1057
                              record.assessment_after_dislysis.diastolic_blood_pressure
1051 1058
                               ?  record.assessment_after_dislysis.diastolic_blood_pressure
1052 1059
                               : "/"
1053
-                          }}
1060
+                          }} -->
1061
+                          <span v-if="record.monitor_records.length>0">
1062
+                            {{ 
1063
+                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure ?
1064
+                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure : '/'
1065
+                            }}
1066
+                          </span>
1067
+                          <span v-else>/</span>
1054 1068
                         </div>
1055 1069
                         mmHg
1056 1070
                       </div>

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

@@ -876,22 +876,36 @@
876 876
                       <div class="under_line"
877 877
                         style="width: 50px; text-align: center"
878 878
                       >
879
-                        {{
879
+                        <!-- {{
880 880
                           afterdialysis.systolic_blood_pressure
881 881
                             ? afterdialysis.systolic_blood_pressure
882 882
                             : "/"
883
-                        }}
883
+                        }} -->
884
+                          <span v-if="monitors.length>0">
885
+                            {{ 
886
+                              monitors[monitors.length-1].systolic_blood_pressure ?
887
+                              monitors[monitors.length-1].systolic_blood_pressure :"/"
888
+                            }}
889
+                          </span>
890
+                           <span v-else>/</span>
884 891
                       </div>
885 892
                       /
886 893
                       <div
887 894
                         class="under_line"
888 895
                         style="width: 50px; text-align: center"
889 896
                       >
890
-                        {{
897
+                        <!-- {{
891 898
                           afterdialysis.diastolic_blood_pressure
892 899
                             ? afterdialysis.diastolic_blood_pressure
893 900
                             : "/"
894
-                        }}
901
+                        }} -->
902
+                        <span v-if="monitors.length>0">
903
+                          {{ 
904
+                            monitors[monitors.length-1].diastolic_blood_pressure ?
905
+                              monitors[monitors.length-1].diastolic_blood_pressure :"/"
906
+                          }}
907
+                        </span>
908
+                        <span v-else>/</span>
895 909
                       </div>
896 910
                       mmHg
897 911
                     </div>