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

src/store/modules/globalConfig.js

@@ -187,7 +187,8 @@ const global_config = {
       {
         id: 12,
         name: '退休人员'
-      }
+      },
+    
     ],
     induction_options: [ // 诱导期
       {

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

@@ -1159,8 +1159,7 @@
         }
 
         this.assessmentBeforeDislysis.pathway_formation_time = moment(new Date()).format('YYYY-MM-DD')
-        console.log(" this.assessmentBeforeDislysis.pathway_formation_time", moment(new Date()).format('YYYY-MM-DD'))
-        console.log("hhahhahahah",assessment)
+        
         if(assessment!=null){
           if(assessment.pathway_formation_time >0){
             this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
@@ -1175,7 +1174,7 @@
             this.assessmentBeforeDislysis.lien_necessary = assessment.lien_necessary.toString()
           }
         }
-
+       
 
 
 
@@ -1256,6 +1255,13 @@
             }
           }
 
+        console.log("hhahhahahah",lastAssessment)
+        if (lastAssessment !=null) {
+          this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
+          this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
+           
+        }
+
         } else {
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)
           this.assessmentBeforeDislysis.period = this.assessmentBeforeDislysis.period.toString()

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

@@ -138,7 +138,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量')">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -147,6 +147,16 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8"
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597">
+                        <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
+                            <el-input
+                                    type="number"
+                                    v-model="dialysisPrescription.prescription_water"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8"
                             v-if="isShows('加糖')">
                         <el-form-item label="加糖：" prop="prescription_water" :rules="isCheckmust('加糖')">

src/xt_pages/user/components/PatientDetail.vue

@@ -1499,6 +1499,10 @@ export default {
     this.rhOptions = this.$store.getters.rh;
     this.educationOptions = getDataConfig("patient", "education_types");
     this.professionOptions = getDataConfig("patient", "profession_options");
+    var obj ={id:11,name:"退休"}
+    var objOne = {id:12,name:"灵活就业人员"}
+    this.professionOptions.push(obj)
+    this.professionOptions.push(objOne)
     this.inductionOptions = this.$store.getters.induction_options;
     this.contagionList = this.$store.getters.contagions;
     this.checkDisease = this.$store.getters.disease;

src/xt_pages/user/components/PatientForm.vue

@@ -1541,7 +1541,12 @@ export default {
     // this.typeOptions = this.$store.getters.blood_types;
     // this.rhOptions = this.$store.getters.rh;
     this.educationOptions = getDataConfig("patient", "education_types");
+
     this.professionOptions = getDataConfig("patient", "profession_options");
+    var obj ={id:11,name:"退休"}
+    var objOne = {id:12,name:"灵活就业人员"}
+    this.professionOptions.push(obj)
+    this.professionOptions.push(objOne)
 
   
     // this.inductionOptions = this.$store.getters.induction_options;