Browse Source

中能建bug修改

张保健 5 years ago
parent
commit
095cde93ae

+ 2 - 2
src/pages/main/dialog/OrdersDialog.vue View File

@@ -78,8 +78,8 @@
78 78
                 >
79 79
                   <div class="txt">
80 80
                     <span>{{advice.advice_name }}</span>
81
-                    <span v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
82
-                    <span v-if="advice.prescribing_number && template_id != 6">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
81
+                    <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
82
+                    <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}})</span>
83 83
                     <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
84 84
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
85 85
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>

+ 7 - 3
src/pages/main/dialog/subMenu/MsgTip.vue View File

@@ -27,7 +27,7 @@
27 27
         <div class="item">
28 28
           <label class="name" for="txms">干体重(kg)</label>
29 29
           <div class="content">
30
-            <span class="text" id="txms">{{predialysis.dry_weight}}</span>
30
+            <span class="text" id="txms">{{last_predialysis.dry_weight}}</span>
31 31
             
32 32
           </div>
33 33
         </div>
@@ -41,7 +41,7 @@
41 41
         <div class="item">
42 42
           <label class="name" for="txms">体重增加(kg)</label>
43 43
           <div class="content">
44
-            <span class="text" id="txms">{{predialysis.weight_before - predialysis.weight_after_last_transparency}}</span>
44
+            <span class="text" id="txms">{{add_weight}}</span>
45 45
             
46 46
           </div>
47 47
         </div>
@@ -76,12 +76,16 @@
76 76
   export default {
77 77
     name: 'LongAdviceSubMenu',
78 78
     created () {
79
+      if (predialysis.weight_before > 0 && predialysis.weight_after_last_transparency > 0) {
80
+        add_weight = parseFloat(predialysis.weight_before - predialysis.weight_after_last_transparency).toFixed(2)
81
+      }
79 82
     },
80 83
     data () {
81 84
       return {
82 85
         result: [],
83 86
         id: 0,
84
-        selectName: ''
87
+        selectName: '',
88
+        add_weight:0
85 89
       }
86 90
     },
87 91
     props: {

+ 4 - 1
src/pages/main/template/DialysisPrintOrderSix.vue View File

@@ -322,7 +322,10 @@
322 322
                   </div>
323 323
                   <div class="inline_block" style="margin-left:20px;">
324 324
                   维持:
325
-                    <div class="under_line" style="width: 50px;text-align: center;">
325
+                    <div v-if="prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
326
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:'/'}}
327
+                    </div>
328
+                    <div v-if="prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
326 329
                       {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:0}}
327 330
                     </div>
328 331
                     lu