Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -1162,7 +1162,7 @@
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span v-if="predialysis.weight_before !=0 && afterdialysis.weight_after !=0">
+                          <span v-if="record.assessment_before_dislysis.weight_before !=0 && record.assessment_after_dislysis.weight_after !=0">
                            {{ record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss

src/xt_pages/user/templateSummaryPrint.vue

@@ -8,7 +8,7 @@
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}血液透析患者诊疗阶段小结</div>
       
-      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;" v-if="org_id !=10013 &&org_id !=10014">
+      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
          <span>姓名:{{patientList.patient.name}}</span>  
          <span style="margin-left:20px;">年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
          <span style="margin-left:20px;">性别:
@@ -17,7 +17,7 @@
          </span> 
          <span style="margin-left:20px;">诊断:{{patientList.patient.diagnose}}</span> 
       </div>
-      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;" v-if="org_id !=10013 &&org_id !=10014">
+      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
       </div>
        <!-- <div style="padding:20px 0;border-bottom:1px solid #000;">
@@ -46,7 +46,7 @@
           </div>
         </div>
       </div> -->
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;" v-if="org_id !=10013 &&org_id !=10014">
+      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结总结:</span>
           <!-- {{patientList.template_summary_content}} -->
           <div style="line-height:24px; word-break: break-all;word-wrap: break-word"