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

src/store/modules/globalConfig.js

@@ -697,6 +697,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      33: {
+        id: 33,
+        name: 'HFD',
+        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: { // 抗凝剂

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -74,7 +74,7 @@
                   </el-form-item>
 
 
-                  <el-form-item label="疾病诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id==3877 || org_id ==10485 || org_id == 0 ">
+                  <el-form-item label="疾病诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id ==10485">
 
                     <el-select style="width:100%;" v-model="patient_diagnose" placeholder="" multiple filterable>
                         <el-option
@@ -143,7 +143,7 @@
                               </el-date-picker>
 
 
-                              <el-select v-if="org_id != 10206 && org_id != 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                              <el-select v-if="org_id != 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                                          @change="changevalue">
                                   <el-option
                                           v-for="(item,index) in register"
@@ -153,7 +153,7 @@
                                   </el-option>
                               </el-select>
 <!--                            //针对海拉尔普爱肾病医院-->
-                            <el-select v-if="org_id == 10206 ||  org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                            <el-select v-if="org_id == 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                                        @change="changevalue">
                               <el-option
                                 v-for="(item,index) in register10206"
@@ -2084,10 +2084,14 @@ export default {
         }
       }
 
-      if(this.org_id == 0 || this.org_id == 10375){
+      if(this.org_id == 10375){
         this.state1 = 607
       }
 
+      if(this.org_id == 10537 || this.org_id == 0){
+        this.state1 = 662
+      }
+
       if (info.id > 0) {
         this.doctorValue = info.doctor_id
         this.departmentValue = info.departments
@@ -2145,6 +2149,13 @@ export default {
            this.diagnose.push(202)
         }
 
+        if(this.org_id == 10537){
+          this.diagnose = []
+          this.diagnose.push(557)
+          this.diagnose.push(612)
+          this.diagnose.push(620)
+        }
+
       } else {
         this.state2 = info.sick_history
         if (this.state2 == 0) {
@@ -2206,7 +2217,7 @@ export default {
         }
       }
 
-      if(this.org_id == 0 || this.org_id == 10375){
+      if( this.org_id == 10375){
         this.state1 = 607
       }
 
@@ -2218,6 +2229,11 @@ export default {
         }
       }
 
+      if(this.org_id == 10206 || this.org_id == 0){
+        this.departmentValue = 263
+        this.state1 = 677
+        this.diagnose.push(716)
+      }
 
     },
     setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
@@ -3233,7 +3249,7 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-    
+
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //     if (row.count <= 0) {
       //       if (selection) {
@@ -3274,14 +3290,14 @@ export default {
                 this.$refs.multipleTable.toggleRowSelection(row)
               }
             }
-            
+
           })
         } else {
           this.$refs.multipleTable.clearSelection()
         }
         if (row.is_project == 0 || row.is_project == 2){
           this.$message.error(row.drug_name + '库存不足')
-          return 
+          return
         }
        }
       }
@@ -3562,7 +3578,7 @@ export default {
       this.teamList = row
     },
     selectChange(selection, row) {
-    
+
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //    if (row.stock_count <= 0) {
       //     if (row.type == 3) {

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -508,7 +508,7 @@ export default {
              }
 
           }
-           console.log("toal_p3232332332233232",total_price)
+          
            if(this.org_id!=0&&this.org_id!=10480){
               order.push({
               warehouse_out_order_number: "合计",