浏览代码

Merge branch 'master' of http://git.shengws.com/csx/Vue_New

XMLWAN 5 年前
父节点
当前提交
31f91e7adb

+ 12 - 10
src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue 查看文件

256
                       >&nbsp; 追加:<span
256
                       >&nbsp; 追加:<span
257
                         style="width:35px;display: inline-block;"
257
                         style="width:35px;display: inline-block;"
258
                         >{{
258
                         >{{
259
-                          record.prescription.anticoagulant_weichi
259
+                          record.prescription.anticoagulant_weichi && record.prescription.anticoagulant == 2
260
                             ? record.prescription.anticoagulant_weichi
260
                             ? record.prescription.anticoagulant_weichi
261
                             : ""
261
                             : ""
262
                         }}</span
262
                         }}</span
295
                         style="width:50px;display: inline-block;"
295
                         style="width:50px;display: inline-block;"
296
                         >{{
296
                         >{{
297
                           record.prescription.anticoagulant_zongliang &&
297
                           record.prescription.anticoagulant_zongliang &&
298
-                          (record.prescription.anticoagulant !=
299
-                            6 ||
300
-                            record.prescription.anticoagulant == 7)
298
+                          record.prescription.anticoagulant == 2
301
                             ? record.prescription.anticoagulant_zongliang
299
                             ? record.prescription.anticoagulant_zongliang
302
                             : ""
300
                             : ""
303
                         }}</span
301
                         }}</span
448
                           isValueIndexOfCheck(
446
                           isValueIndexOfCheck(
449
                             record.assessment_before_dislysis,
447
                             record.assessment_before_dislysis,
450
                             'blood_access_internal_fistula',
448
                             'blood_access_internal_fistula',
451
-                            '自体内瘘'
449
+                            '内瘘'
452
                           )
450
                           )
453
                         "
451
                         "
454
                         showValue="内瘘"
452
                         showValue="内瘘"
492
                           isValueIndexOfCheck(
490
                           isValueIndexOfCheck(
493
                             record.assessment_before_dislysis,
491
                             record.assessment_before_dislysis,
494
                             'blood_access_internal_fistula',
492
                             'blood_access_internal_fistula',
495
-                            '自体内瘘'
493
+                            '人造血管'
494
+                          ) || isValueIndexOfCheck(
495
+                            record.assessment_before_dislysis,
496
+                            'blood_access_internal_fistula',
497
+                            '移植血管'
496
                           )
498
                           )
497
                         "
499
                         "
498
                         showValue="其他"
500
                         showValue="其他"
922
                   <td>
924
                   <td>
923
                     <span v-if="getTime(monitor.operate_time) != ''">
925
                     <span v-if="getTime(monitor.operate_time) != ''">
924
                       {{
926
                       {{
925
-                        monitor.arterial_pressure
926
-                          ? monitor.arterial_pressure
927
+                        monitor.venous_pressure
928
+                          ? monitor.venous_pressure
927
                           : "0"
929
                           : "0"
928
                       }}</span
930
                       }}</span
929
                     >
931
                     >
1050
                     </td>
1052
                     </td>
1051
                     <td colspan="5" style="height:30px;">
1053
                     <td colspan="5" style="height:30px;">
1052
                         <span v-for="(item,index) in advice" :key="index">
1054
                         <span v-for="(item,index) in advice" :key="index">
1053
-                            <span v-if="item.children.length > 0">
1055
+                            <!-- <span v-if="item.children.length > 0"> -->
1054
                                 <span v-if="item.parent_id > 0">---></span>
1056
                                 <span v-if="item.parent_id > 0">---></span>
1055
                                 <span>{{ item.advice_name }}</span>
1057
                                 <span>{{ item.advice_name }}</span>
1056
                                 <span v-if="item && item.advice_desc"
1058
                                 <span v-if="item && item.advice_desc"
1097
                                     >
1099
                                     >
1098
                                     </span>
1100
                                     </span>
1099
                                 </span>
1101
                                 </span>
1100
-                            </span>
1102
+                            <!-- </span> -->
1101
                             <div v-else>
1103
                             <div v-else>
1102
                                 <span v-if="item.parent_id > 0">---></span>
1104
                                 <span v-if="item.parent_id > 0">---></span>
1103
                                 <span>{{ item.advice_name }}</span>
1105
                                 <span>{{ item.advice_name }}</span>

+ 2 - 4
src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue 查看文件

207
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span
207
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span
208
               >&nbsp; 追加:<span style="width:35px;display: inline-block;">{{
208
               >&nbsp; 追加:<span style="width:35px;display: inline-block;">{{
209
                 prescription.anticoagulant_weichi &&
209
                 prescription.anticoagulant_weichi &&
210
-                (prescription.anticoagulant != "低分子肝素钙" &&
211
-                  prescription.anticoagulant != "低分子肝素钠")
210
+                prescription.anticoagulant == "普通肝素"
212
                   ? prescription.anticoagulant_weichi
211
                   ? prescription.anticoagulant_weichi
213
                   : ""
212
                   : ""
214
               }}</span
213
               }}</span
227
               >
226
               >
228
               &nbsp; 总量:<span style="width:50px;display: inline-block;">{{
227
               &nbsp; 总量:<span style="width:50px;display: inline-block;">{{
229
                 prescription.anticoagulant_zongliang &&
228
                 prescription.anticoagulant_zongliang &&
230
-                (prescription.anticoagulant != "低分子肝素钙" &&
231
-                  prescription.anticoagulant != "低分子肝素钠")
229
+                prescription.anticoagulant == "普通肝素"
232
                   ? prescription.anticoagulant_zongliang
230
                   ? prescription.anticoagulant_zongliang
233
                   : ""
231
                   : ""
234
               }}</span
232
               }}</span