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_eighty.vue

@@ -40,11 +40,11 @@
               </div>
             </div>
             <div class="inline_block" style="flex: 1;">
-              年龄1:
+              年龄:
               <div class="under_line" style="width: 30px; text-align: center">
                 <!-- {{ record.patient.age }} -->
                 <!-- {{ getAge(record.patient) }} -->
-                {{ calculateAge(record.patient.id_card_no,record.prescription.record_date) }}
+                {{ calculateAge(record.patient.id_card_no,record.schedule_date) }}
               </div>
               岁
             </div>

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -1235,7 +1235,7 @@
                     <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     > 
-                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.puncture_nurse>0">
+                      <div class="inline_block" style="flex: 1" v-if="record.assessment_before_dislysis.internal_fistula>0">
                         上机护士：
                         <div class="under_line"
                           style="width: 80px; text-align: center"
@@ -1264,7 +1264,7 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.change_nurse>0">
+                      <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"

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==10206 || this.org_id == 0){
+          if(this.org_id ==10206){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -910,7 +910,6 @@
 
                     <el-col :span="8">
                         <el-form-item
-                                label="置换方式："
                                 v-if="isShows('置换液')&&this.$store.getters.xt_user.org.id != 10206"
                                 v-show="huShow"
                                 prop="displace_liqui_part"
@@ -952,18 +951,20 @@
 
                     </el-col>
 
-                    <el-col :span="8"
-                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10721)"
-                            v-show="totalShow">
-                        <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
+                    <el-col :span="8">
+                       
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id ==26">
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id ==26">
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8"
+                    <!-- <el-col :span="8"
                             v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53 && this.$store.getters.xt_user.template_info.org_id != 10206) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10721"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26"
@@ -972,7 +973,7 @@
                         <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
 
                     <el-col :span="8" v-if="isShows('目标KT/V')">
                         <el-form-item label="目标KT/V" prop="target_ktv" :rules="isCheckmust('目标KT/V')">

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -12,7 +12,10 @@
           <span class="content">{{ device_number }}</span>
         </li>
         <li v-if="isShow('上机护士')">
-          <label>上机护士 : </label>
+          <label>
+           <span v-if="org_id == 10721"></span> 治疗护士 :
+           <span v-if="org_id != 10721"></span> 上机护士 :
+           </label>
           <span class="content">{{ nurse }}</span>
         </li>
       </ul>
@@ -122,7 +125,8 @@
     name: 'DialysisComputer',
     data() {
       return {
-        title: '透析上机 '
+        title: '透析上机 ',
+        org_id:0,
       }
     },
     props: {
@@ -280,6 +284,9 @@
         }
        },
 
+    },
+    created(){
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
     }
   }
 </script>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2686,7 +2686,7 @@ export default {
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          if(this.org_id !=10206 && this.org_id !=0){
+          if(this.org_id !=10206){
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
           }else{

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -36,7 +36,7 @@
             年龄:
             <div class="under_line" style="width: 30px; text-align: center">
               <!-- {{ getAge(patientInfo) }} -->
-              {{ calculateAge(patientInfo.id_card_no,prescription.record_date) }}
+              {{ calculateAge(patientInfo.id_card_no,schedule_date) }}
             </div>
             岁
           </div>
@@ -1367,7 +1367,7 @@
           年龄：
           <div class="under_line" style="width: 30px;text-align: left">
             <!-- {{ getAge(patientInfo) }} -->
-            {{ calculateAge(patientInfo.id_card_no,prescription.record_date) }}
+            {{ calculateAge(patientInfo.id_card_no,schedule_date) }}
           </div>
           岁
         </div>
@@ -2266,6 +2266,7 @@ export default {
       schedule_date_one:"",
       new_doctor_advice_list:[],
       number_list:[],
+      schedule_date:""
     };
   },
   methods: {
@@ -2771,6 +2772,8 @@ export default {
         this.adminUser = response.data.data.users;
         console.log('3333333wwwwww12121',response.data.data);
        var schedule_date  =  response.data.data.schedule.schedule_date
+
+       this.schedule_date = schedule_date
        this.schedule_date_one =  uParseTime(
           schedule_date,
           "{y}-{m}-{d}"
@@ -3467,9 +3470,10 @@ export default {
    
      return ageYear 
     },
-    getTime(val) {
-      return uParseTime(val, "{y}年{m}月{d}日");
-    },
+    // getTime(val) {
+    //   return uParseTime(val, "{y}年{m}月{d}日");
+    // },
+  
     getTimeOne(val) {
       return uParseTime(val, "{y}");
     },

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -1094,7 +1094,7 @@
                       上机护士：
                       <div  class="under_line"
                         style="width: 90px; text-align: center"
-                         v-if="dialysisOrder.puncture_nurse>0"
+                          v-if="predialysis.internal_fistula!=''"
                       >
                         <span
                           style="height: 30px; display: inline-block"
@@ -1131,7 +1131,7 @@
 
                       <div  class="under_line"
                         style="width: 90px; text-align: center"
-                        v-if="dialysisOrder.change_nurse>0"
+                        v-if="predialysis.catheter!=''"
                       >
                         <span
                           style="height: 30px; display: inline-block"