新分支

src/router/modules/patient.js

@@ -325,8 +325,8 @@ export default {
       noCache: true
     }
   },
-
-  // {//评估工具/跌倒评估
+  //评估工具/跌倒评估
+  // {
   //   path: '/patients/patient/:id/Fallassessment',
   //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
   //   hidden: true,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -425,7 +425,7 @@
                    </span>
                   </span>
 
-                   <span style="display: block;width: 50%;" v-if="org_d ==10598">
+                   <span style="display: block;width: 50%;" v-if="org_id==10598">
                     首剂： <span
                     v-if="main_collection.prescription.anticoagulant == 1">{{ main_collection.prescription.anticoagulant_shouji }} mg</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">

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

@@ -438,7 +438,7 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210 || this.org_id==0){
+              if(this.org_id ==10210 || this.org_id==0 || this.org_id ==10402){
                  list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               }else{
                 list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -463,7 +463,7 @@ export default {
               list[i].drugOutSalePrice = "/"
 
          
-            if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==0){
+            if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402){
               list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
             }else{
               list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)

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

@@ -347,7 +347,7 @@ export default {
                 list[i].drugAddOne= 0
                 list[i].drugOutOne =0
                
-                if(this.org_id ==10210){
+                if(this.org_id ==10210 || this.org_id ==10402){
                    list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                 }else{
                   list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -371,7 +371,7 @@ export default {
                 list[i].drugOutSalePrice = "/"
 
                
-                if(this.org_id ==10265 || this.org_id ==10210){
+                if(this.org_id ==10265 || this.org_id ==10210 || this.org_id ==10402){
                   list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }else{
                   list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)