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

src/store/modules/globalConfig.js

@@ -834,6 +834,36 @@ const global_config = {
         calcium: 1,
         bicarbonate: 1
       },
+      42: {
+        id: 42,
+        name: 'HD(1)',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      43: {
+        id: 43,
+        name: 'HD(2)',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
     },
     anticoagulants_confit: { // 抗凝剂
       1: {
@@ -2349,6 +2379,10 @@ const global_config = {
     {
       id: 2,
       name: '后稀释'
+    },
+    {
+      id:3,
+      name:"前+后稀释"
     }
     ],
 

src/xt_pages/dialysis/details/NavIgation.vue

@@ -126,6 +126,7 @@
        :dryWeightList="dryWeightList"
        :docList="docList"
        :first_monitor="first_monitor"
+       :last_record="last_assessment_after_dislysis"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog

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

@@ -39,6 +39,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==0">
+            <el-form-item label="上次透后体重:" :prop="isName('上次透后体重')">
+              <el-input v-model="assessmentBeforeDislysis.last_weight" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="干体重(kg)："
               :prop="isName('干体重')"
@@ -988,6 +994,7 @@
           washing_time:"",
           warsh_count:"",
           puncture_needle_direction:"",
+          last_weight:"",
         },
 
         InnerDialogProps: {
@@ -1068,6 +1075,12 @@
           return { id: 0 };
         }
       },
+      last_record: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
 
     },
     methods: {
@@ -1138,6 +1151,8 @@
 
         console.log("第一条监测数据23333333333333333",this.first_monitor)
 
+        this.assessmentBeforeDislysis.last_weight = (this.last_record.weight_after - this.last_record.additional_weight).toFixed(1)
+
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
         //     console.log("2o2o3232o23o2o3o23")

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

@@ -952,20 +952,22 @@
                     <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 != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
                             v-show="totalShow">
-                        <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')">
-                            <el-input
-                                    v-model="dialysisPrescription.displace_liqui_value"
-                            ></el-input>
+                        <el-form-item label="置换液总量(ml)" 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-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </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  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
                             v-show="totalShow">
-                            <!-- v-show="totalShow" -->
-                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')">
-                            <el-input
-                                    v-model="dialysisPrescription.displace_liqui_value"
-                            ></el-input>
+                        <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-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -3309,7 +3311,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36 && this.dialysisPrescription.mode_id!=37){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36 && this.dialysisPrescription.mode_id!=37 && this.dialysisPrescription.mode_id!=41){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -917,7 +917,7 @@
                         }}
                         </span>
 
-                        <span v-if="org_id ==10510 ">
+                        <span v-if="org_id ==10510 || org_id == 0">
                           <span v-if="prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12">{{
                             afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
@@ -926,7 +926,7 @@
                         </span>
                         <span v-else>/</span>
                         </span>
-                        <span v-if="org_id!=10206&& org_id!=10510"> {{
+                        <span v-if="org_id!=10206&& org_id!=10510 && org_id!=0"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
@@ -951,15 +951,19 @@
                             ? prescription.replacement_total
                             : "/"
                         }}
-                        </span>
+                       </span>
 
-                        <span v-if="org_id ==10510"> {{
-                          afterdialysis.displace_liqui_value
+                        <span v-if="org_id ==10510 || org_id == 0">
+                          <span v-if="prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12">{{
+                            afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
-                        }}
+                           }}
+                          </span>
+                          <span v-else>/</span>
                         </span>
 
+                       
                         <span v-if="org_id!=10206 && org_id!=10510"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
@@ -2197,7 +2201,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id== 10489"
+                      v-if="org_id == 0 || org_id ==10206"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2416,7 +2420,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489 || org_id ==10633 || org_id ==10644"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10633 || org_id ==10644"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -5639,7 +5643,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);