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

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

       }
     },
     'form.weight_after': function() {
-      if (this) {
+      console.log('体重减少',  this.form.weight_after)
+      this.form.weight_loss = ((this.predialysis_evaluation.weight_before - this.predialysis_evaluation.additional_weight) - (this.form.weight_after - this.form.additional_weight)).toFixed(1)
+    
+      if (this.form.weight_loss < 0) {
+        this.form.weight_loss = ''
       }
+      if (this.form.weight_after == '') {
+        this.form.weight_loss = ''
+      }
+      
     }
   },
   methods: {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10580 || this.$store.getters.xt_user.org.id == 10585){
+      if(this.$store.getters.xt_user.org.id == 10580){
+        var date = new Date()
         var year = date.getFullYear()
           var month = date.getMonth() + 1
           var day = date.getDate()
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

          console.log("params",ParamsQuery)
          this.$refs.assessmentBeforeDislysis.validate((valid) => {
           if (valid) {
-            ParamsQuery['patient'] = this.patient.id
+           
+            // if(this.patient.id == 'NaN' || this.patient.id ==0){
+
+            //   ParamsQuery['patient'] = parseInt(this.$route.query.patient_id) 
+            // }
+            // if(this.$route.query.patient_id == 'NaN' || this.$route.query.patient_id == 0 ){
+
+            //    ParamsQuery['patient'] = this.patient.id
+            // }
+       
+        ParamsQuery['patient'] = this.patient.id
+        
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'
 

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

               obj['statistical_classification'] = ''
               obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+              obj['project'] = project_month_prescriptions.project[a].project
+
               obj['type'] = 2
 
             } else if (project_month_prescriptions.project[a].type == 3) {
               obj['statistical_classification'] = ''
               obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
               obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['good_info'] = project_month_prescriptions.project[a].good_info
+
               obj['type'] = 3
 
             }
                 obj['statistical_classification'] = prescription.project[b].team.project_team
                 obj['medical_code'] = prescription.project[b].project.medical_code
                 obj['project_name'] = prescription.project[b].project.project_name
+                obj['project'] = prescription.project[b].project
+
                 obj['spec'] = ''
                 obj['name_id'] = 0
 
                 obj['project_name'] = prescription.project[b].good_info.good_name
                 obj['spec'] = prescription.project[b].good_info.specification_name
                 obj['name_id'] = prescription.project[b].good_info.manufacturer
+                obj['good_info'] = prescription.project[b].good_info
 
               }
 

src/xt_pages/outpatientCharges/componenttwo/chargeMonthPrescriptionTable.vue

               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
-        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+<!--        <template slot-scope="scope">{{ scope.row.project_name }}</template>-->
+        <template slot-scope="scope">
+          <span :title="scope.row.project_name" v-if="org_id != 10206">{{ scope.row.project_name }}</span>
+          <span  v-if="org_id == 10206&&scope.row.type==3">{{ scope.row.project_name }}{{scope.row.good_info.specification_name}}{{scope.row.good_info.good_number}}</span>
+          <span v-if="org_id == 10206&&scope.row.type==2">{{ scope.row.project_name }}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
     },
     data() {
       return {
+        org_id:this.$store.getters.xt_user.org_id,
         drugways: [],
         efs: []
       }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" type="index" width="40" label="序号" fixed></el-table-column>
             <el-table-column align="center" prop="project_name" label="名称" fixed>
-                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+                <template slot-scope="scope">
+                  <span :title="scope.row.project_name" v-if="org_id != 10206">{{ scope.row.project_name }}</span>
+                  <span  v-if="org_id == 10206&&scope.row.type==3">{{ scope.row.project_name }}{{scope.row.good_info.specification_name}}{{scope.row.good_info.good_number}}</span>
+                  <span v-if="org_id == 10206&&scope.row.type==2">{{ scope.row.project_name }}</span>
+
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
 
     data() {
       return {
+        org_id:this.$store.getters.xt_user.org_id,
         advices: [],
         tableData: [],
         newoptions: [{

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
+            <el-button v-if="org_id == 10206" size="small" ref="button_three" @click="open_four()" type="primary">刷新库存</el-button>
             <el-button size="small" ref="button_one" @click="open(1)" type="primary"
                        v-loading="saveLoading">保存
             </el-button>
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
 
-        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>  
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>
       </div>
 
     </div>
   },
 
   methods: {
+    open_four(){
+      this.$refs.prescriptions.getZuobiaoGoodStock()
+      this.$refs.prescriptions.getZuobiaoDrugStock()
+    },
     getSunziValue(val) {
       //  this.drugs=[]
       this.getInitData()
                     }
                   } else if (this.schedule.schedule_type == 2) {
                      if(this.org_id == 10206  || this.org_id == 0 ){
-                      preTime = this.record_date + ' ' + '10:00'
+                      preTime = this.record_date + ' ' + '10:30'
                     }else{
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                    }
             }
           }
           console.log('~~~~~00000222222', this.prescriptions)
-          // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
         }
       })
 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
-                            preTime = this.record_date + ' ' + '10:00'
+                            preTime = this.record_date + ' ' + '10:30'
                           }else{
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
-                            preTime =this.record_date + ' ' + '10:00'
+                            preTime =this.record_date + ' ' + '10:30'
                           }else{
 
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                     //   }
                   }
                 }
-                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
                     // }
                   }
                 }
-                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
                   // }
                 }
               }
-              // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               this.$refs.child.watchSign = 0
             }
           })
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
-                            preTime = this.record_date + ' ' + '10:00'
+                            preTime = this.record_date + ' ' + '10:30'
 
                           }else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
-                            preTime = this.record_date + ' ' + '10:00'
+                            preTime = this.record_date + ' ' + '10:30'
                           }else{
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                           }
                     // }
                   }
                 }
-                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               }
             })
 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
-                            preTime =this.record_date + ' ' + '10:00'
+                            preTime =this.record_date + ' ' + '10:30'
                           }else{
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206 ||  this.org_id == 0){
-                            preTime = this.record_date + ' ' + '10:00'
+                            preTime = this.record_date + ' ' + '10:30'
 
                           }else{
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
 
                   }
                 }
-                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               }
             })
           } else {