3月16

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -230,13 +230,6 @@
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
-                      <!-- <div class="inline_block" style="flex: 1;">
-                        透析间期：
-                        <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
-                          {{ record.assessment_before_dislysis.last_post_dialysis ? 
-                          record.assessment_before_dislysis.last_post_dialysis : "/" }}
-                        </div>
-                      </div> -->
                       <div class="inline_block" style=" flex: 1">
                         透前症状：
                         <div class="under_line" style="width: 50%; text-align: left">
@@ -263,6 +256,12 @@
                           </span>
                         </div>
                       </div>
+                      <div class="inline_block" style=" flex: 1">
+                        跌倒评估：
+                        <div class="under_line" style="width: 50%; text-align: left">
+                         {{ record.receive_assessment.score ? record.receive_assessment.score : '/' }}
+                        </div>
+                      </div>
                     </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -299,9 +298,9 @@
                           {{ record.assessment_before_dislysis.complication ? record.assessment_before_dislysis.complication : "/" }}                        </div>
                       </div>
                       <div class="inline_block" style=" flex: 1">
-                        跌倒评估：
-                        <div class="under_line" style="width: 50%; text-align: left">
-                         {{ record.receive_assessment.score ? record.receive_assessment.score : '/' }}
+                        备注：
+                        <div class="under_line" style="width: 70%; text-align: left;white-space: normal;">
+                         {{ record.assessment_before_dislysis.remark ? record.assessment_before_dislysis.remark : '/' }}
                         </div>
                       </div>
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -218,12 +218,6 @@
                   <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <!-- <div class="inline_block" style="flex: 1;">
-                      透析间期：
-                      <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
-                        {{ predialysis.last_post_dialysis ? predialysis.last_post_dialysis : "/" }}
-                      </div>
-                    </div> -->
                     <div class="inline_block" style=" flex: 1">
                       透前症状：
                       <div
@@ -242,6 +236,14 @@
                         <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
                       </div>
                     </div>
+                    <div class="inline_block" style=" flex: 1">
+                      跌倒评估：
+                      <div
+                        style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                      >
+                        {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                      </div>
+                    </div>
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -279,11 +281,11 @@
                       </div>
                     </div>
                     <div class="inline_block" style=" flex: 1">
-                      跌倒评估：
+                      备注：
                       <div
-                        style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                        style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                        {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                        {{ predialysis.remark }}
                       </div>
                     </div>
                   </div>