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

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

             this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
             this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
             
-            if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10480){
-              console.log("尽量",last_predialysis_evaluation)
-              console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
-              if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
-
-                // var blood_id = 0
-                // console.log("SHJU232323",this.blood_access_part_opera)
-                // for(let i= 0;i<this.blood_access_part_opera.length;i++){
-                //     if(last_predialysis_evaluation.blood_access_part_opera_id == this.blood_access_part_opera[i].id){
-                //       blood_id = this.blood_access_part_opera[i].name
-                //     }
-                // }
-                // console.log("blood_id-----",blood_id)
-                if(last_predialysis_evaluation.blood_access_part_opera_id >0){
-                  this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
-                }
-              
-                this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
+          
+            console.log("尽量",last_predialysis_evaluation)
+            console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
+            if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
+
+              // var blood_id = 0
+              // console.log("SHJU232323",this.blood_access_part_opera)
+              // for(let i= 0;i<this.blood_access_part_opera.length;i++){
+              //     if(last_predialysis_evaluation.blood_access_part_opera_id == this.blood_access_part_opera[i].id){
+              //       blood_id = this.blood_access_part_opera[i].name
+              //     }
+              // }
+              // console.log("blood_id-----",blood_id)
+              if(last_predialysis_evaluation.blood_access_part_opera_id >0){
+                this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
               }
-             
+            
+              this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
             }
+             
+            
 
           } else {
             if (this.lastPredialysisEvaluation != null) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         <td></td>
                         <td></td>
                         <td></td>
-                        <td></td>
-                        <td></td>
+                        <td v-if="org_id!=10644"></td>
+                        <td v-if="org_id!=10644"></td>
                         <td v-if="org_id == 10375 || org_id == 0"><br /></td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
 
 
 
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
+        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id ==10478){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644 || this.org_id ==0 || this.org_id ==10478){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
 
 
 
-        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206){
+        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478){
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){

src/xt_pages/stock/drugs/drugStockOutOrder.vue

             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=10088 && org_id!=10510 && org_id!=10402">
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=10088 && org_id!=10510">
                     <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}} </span>
                     <span v-if="is_sys == 0">
                       <!-- <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
                     </span>
                     </span>
 
-                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id ==10088 || org_id ==10510 || org_id ==10402">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id ==10088 || org_id ==10510">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0">
           min_str = (total % min_number)
         }
       }
-      return max_str + min_str;
+      return max_str * min_number + min_str;
     },
     getOutCountSix(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
       var arr = []
            arr.push(this.tabList[j])
         }
       }
-       total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
+      total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
     
       console.log("taolaa------",total,drug_id)
       if(arr.length > 0){