Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -1176,7 +1176,7 @@
                     <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: 80px; text-align: center" v-if="record.assessment_before_dislysis.internal_fistula!=''">
+                        <div class="under_line" style="width: 80px; text-align: center" v-if="record.dialysis_order.puncture_nurse>0">
                           <span style="display: inline-block" v-if="setAdminUserES(
                             record.dialysis_order, 'puncture_nurse'
                           ) == ''
@@ -1190,7 +1190,7 @@
                           )
                             " alt="" srcset="" v-else />
                         </div>
-                        <div class="under_line" style="width: 80px; text-align: center" v-if="record.assessment_before_dislysis.catheter!=''">
+                        <div class="under_line" style="width: 80px; text-align: center" v-if="record.dialysis_order.change_nurse>0">
                           <span style="display: inline-block" v-if="setAdminUserES(
                             record.dialysis_order, 'change_nurse'
                           ) == ''
@@ -1206,7 +1206,34 @@
                         </div>
                       </div>
 
-
+                      <!-- <div class="inline_block" style="flex: 1" v-if="record.assessment_before_dislysis.catheter>0">
+                        上机护士：
+                        <div class="under_line"
+                          style="width: 80px; text-align: center"
+                        >
+                          <span style="display: inline-block"
+                            v-if=" setAdminUserES(
+                                record.dialysis_order,'change_nurse'
+                              ) == ''
+                            "
+                          >
+                            {{ getAdminUser(record.dialysis_order, "change_nurse")
+                              ? getAdminUser(record.dialysis_order,"change_nurse"): "/"
+                              }}
+                          </span>
+                          <img
+                            style="height: 40px"
+                            :src="
+                              setAdminUserES(
+                                record.dialysis_order,'change_nurse'
+                                )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </div>
+                      </div> -->
                       <div class="inline_block" style="flex: 1">
                         治疗护士：
                         <div class="under_line" style="width: 80px; text-align: center">

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1628,7 +1628,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id != 10402 && org_id != 10206 && org_id != 10206">
+                <tr v-if="org_id != 10402 && org_id != 10206 && org_id != 0&& org_id != 10644">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1894,7 +1894,7 @@
                   </td>
                 </tr>
 
-                <tr v-if="org_id == 10206">
+                <tr v-if="org_id == 10206 || org_id == 0">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -2322,7 +2322,8 @@
                       <div class="inline_block" style="flex: 1">
                         体重减少：
                         <div class="under_line" style="width: 70px; text-align: center">
-                          <span v-if="org_id != 10551">{{
+                          <span v-if="org_id != 10551">
+                            {{
                             record.assessment_after_dislysis &&
                               record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss
@@ -2359,10 +2360,14 @@
                         v-if="org_id != 10223 && org_id != 10375 && org_id != 10598">
 
                         <span v-if="org_id != 10460">
-                          透析中入量(L)：
+                          透析中入量
+                          <span v-if="org_id!=10644">(L)</span> 
+                          ：
                         </span>
                         <span v-if="org_id == 10460">
-                          透析中入量(ml)：
+                          透析中入量
+                          <span v-if="org_id!=10644">(ml)</span>
+                          ：
                         </span>
                         <div class="under_line" style="width: 60px; text-align: center">
                           {{
@@ -3149,15 +3154,30 @@ export default {
 
 
 
-            if (this.org_id == 10206) {
+            if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10644) {
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
               var delghThree = 0
               let his_project = []
               this.records[recordIndex].his_project.map(item => {
+                if(this.org_id == 0 || this.org_id == 10644){
+                  console.log("item====================",item)
+                  if(item.type == 2){
+                    if(item.project.is_show ==1){
+                      his_project.push(item)
+                    }
+                  }
+                  if(item.type == 3){
+                    if(item.good_info.is_show == 1){
+                      his_project.push(item)
+                    }
+                  }
+                }else{
+                  his_project.push(item)
+                }
                 // if(item.type == 2){
                 //   his_project.push(item)
                 // }
-                his_project.push(item)
+                
 
               })
               this.records[recordIndex].his_project = his_project

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2243,7 +2243,8 @@
                           </span> -->
                           <span
                             v-if="predialysis && predialysis.weight_before > 0 && afterdialysis && afterdialysis.weight_after > 0">
-                            {{ (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}
+                             <span v-if="(predialysis.weight_before - afterdialysis.weight_after)>0"> {{ (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}</span>
+                             <span v-if="(predialysis.weight_before - afterdialysis.weight_after)<=0">/</span>
                           </span>
 
                         </div>
@@ -2252,10 +2253,14 @@
 
                       <div class="inline_block" style="flex: 1" v-if="org_id != 10223 && org_id != 10375 && org_id != 10598">
                         <span v-if="org_id != 10460">
-                          透析中入量(L)：
+                          透析中入量
+                          <span v-if="org_id!=10644">(L)</span>
+                          ：
                         </span>
                         <span v-if="org_id == 10460">
-                          透析中入量(ml)：
+                          透析中入量
+                          <span v-if="org_id!=10644">(ml)</span> 
+                          ：
                         </span>
                         <div class="under_line" style="width: 70px; text-align: center">
                           {{

src/xt_pages/user/components/PatientDetail.vue

@@ -1049,7 +1049,7 @@
     </el-form>
     <!-- 打印预览 style="display: none"-->
     <div style="display: none">
-      <div id="print-info-box" v-if="org_id !=10206">
+      <div id="print-info-box" v-if="org_id !=10206 && org_id!=0">
         <div class="print_main_content" style="">
           <!-- <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
           <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div> -->
@@ -1344,13 +1344,14 @@
                   <td style="padding: 5px 0px;font-size: 22px;width:5%;">
                     {{ patientPrint.gender }}
                   </td>
-                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:8%;">
-                    年龄
+                  <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:6%;">
+                    出生日期
                   </td>
-                  <td style="padding: 5px 0px;font-size: 22px;width:10%;">
+                  <td style="padding: 5px 0px;font-size: 22px;width:12%;">
                     <!-- {{ patientPrint.age }} -->
-                     {{ calculateAge(patientPrint.id_card_no,patientPrint.created_time) }}
-                    岁
+                     <!-- {{ calculateAge(patientPrint.id_card_no,patientPrint.created_time) }}
+                    岁 -->
+                    {{ patientPrint.id_card_no.slice(6, 10) }}年{{ patientPrint.id_card_no.slice(10, 12)}}月{{ patientPrint.id_card_no.slice(12, 14) }}日
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:12%;">
                     医保类型