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

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

@@ -1657,6 +1657,7 @@
 
          if(ParamsQuery.additional_weight >=30){
              this.$message.error("衣物重异常,请重新填写!")
+             return
          }
 
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2345,7 +2345,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -4718,7 +4718,7 @@ export default {
 
         
 
-        if(this.org_id== 0 || this.org_id ==10206){
+        if(this.org_id== 0 || this.org_id ==10206 || this.org_id ==10489){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);

src/xt_pages/outpatientCharges/components/callUnAssociationPrescription.vue

@@ -319,7 +319,7 @@
               tempProject.push(obj)
             }
             let obj = {
-              id: 0,
+              id: prescription.id,
               advices: tempAdvice,
               project: tempProject,
               addition:tempAddition,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1284,8 +1284,8 @@ export default {
       this.association_prescriptions = []
       this.association_prescriptions = val
       var ids  = []
-      for (let i = 0; i < this.prescriptions.length; i++) {
-        ids.push(this.prescriptions[i].id)
+      for (let i = 0; i < this.association_prescriptions.length; i++) {
+        ids.push(this.association_prescriptions[i].id)
       }
       //上传关联数据
       let params = {
@@ -1784,7 +1784,15 @@ export default {
           return false
         } else {
           if(response.data.data.status == 1){
-            this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
+            var name = ""
+            for(let i = 0; i < this.patientTableData.length;i++){
+              if(this.patientTableData[i].id == id){
+                name = this.patientTableData[i].name
+              }
+            }
+            this.$refs.call_prescription.show(name, id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
+
+            // this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
           }
         }
       })
@@ -1811,7 +1819,7 @@ export default {
             this.$refs.register9504.hide()
             this.loadingone = false
 
-            this.CheckHISPatient(that.record_date,forms.id)
+            this.CheckHISPatient(this.record_date,forms.id)
 
           }
         })

src/xt_pages/user/patients.vue

@@ -101,7 +101,7 @@
         <el-badge :value=value class="item">
           <el-button size="small" type="primary" @click="toRemind">传染病检查提醒</el-button>
         </el-badge>
-        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload" v-if="isShow"></upload-excel>
+        <upload-excel :on-success='handleSuccess'  v-if="isShow"></upload-excel>
 
         <el-link target="_blank" href="https://kuyi.shengws.com/patient_template.xlsx" :underline="false"
                  style="margin-left:15px">
@@ -1031,7 +1031,7 @@
 
       },
       handleSuccess({ results, header }) {
-
+        console.log("header5444444444444444",header)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
@@ -1880,9 +1880,7 @@
        return work_unit
     },
 
-    beforeUpload(){
-
-    }
+   
 
     }
   }