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

src/xt_pages/Pharmacy/PatientDispensing.vue

         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           drugwithdrawal(params).then((res) => {
             if (res.data.state == 1) {
               this.$message.success("操作成功");

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624 || org_i==10624)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-            <!-- <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
-            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span> -->
-            {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
+            <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            <!-- {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}} -->
           </template>
 
         </el-table-column>

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
-                  {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
-                  <!-- <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
-                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span> -->
+                  <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
+                  <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
                 </td>
                </tr>
               </tbody>

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

               this.dialysisPrescription.dialysate_temperature = 36.5
               this.dialysisPrescription.prescribing_number = 1
             }
-            if(this.$store.getters.xt_user.org.id == 10447 || this.$store.getters.xt_user.org.id == 10600){
+            if(this.$store.getters.xt_user.org.id == 10447 || this.$store.getters.xt_user.org.id == 10600 ){
               this.dialysisPrescription.dialysate_flow = 500
             }
 
+            if(this.$store.getters.xt_user.org.id == 10375){
+              this.dialysisPrescription.dialysate_flow = 500
+              this.dialysisPrescription.bicarbonate = 32
+            }
+
             if(this.$store.getters.xt_user.org.id == 10598 || this.$store.getters.xt_user.org.id == 10612){
                if(this.dialysisPrescription.dialysis_duration_minute == ""){
                  this.dialysisPrescription.dialysis_duration_minute =0

src/xt_pages/dialysis/newDoctorAdvice.vue

 
        
       </div>
-      <div class="filter-container" v-if="org_id == 0 || org_id ==10101">
+      <div class="filter-container">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
         return name
     },
     getAdviceContent(row, isChild) {
+         console.log("rwoo22222222222222333",row)
         let tempSingleDoseDesc = ''
         let tempDrugSpecDesc = ''
         let tempPrescribingNumberDesc = ''
 
         if (row.prescribing_number) {
-          tempPrescribingNumberDesc =
-            row.prescribing_number + '' + row.prescribing_number_unit
+          tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
+         
         }
 
         if (row.single_dose) {
           if (this.template_id != 6) {
-            tempSingleDoseDesc =
-              ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+            tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+           
           } else {
-            tempSingleDoseDesc = row.single_dose ? row.single_dose : '' + '' + row.single_dose_unit ? row.single_dose_unit : ''
+            tempSingleDoseDesc = row.single_dose  + row.single_dose_unit
             
           }
         }
 
         if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' 
+           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' 
+         
+          
         }
 
         if (isChild == 1) {
           // console.log(11,row.delivery_way)
           // console.log(22,row.execution_frequency)
 
-          return (
-            row.advice_name +
-            tempDrugSpecDesc +
-            ' ' +
-            tempPrescribingNumberDesc +
-            tempSingleDoseDesc +
-            ' ' +
-            row.delivery_way +
-            ' ' +
-            row.execution_frequency
-          )
+          return (row.advice_name + tempDrugSpecDesc + ' ' + tempPrescribingNumberDesc + tempSingleDoseDesc +' ' + row.delivery_way +' ' +row.execution_frequency)
         } else {
           // 是子药
-          return (
-            row.advice_name +
-            tempDrugSpecDesc +
-            ' ' +
-            tempPrescribingNumberDesc +
-            tempSingleDoseDesc
-          )
+          return (row.advice_name +tempDrugSpecDesc +' ' + tempPrescribingNumberDesc + tempSingleDoseDesc)
+         
         }
     },
     handleSelectionChange(val){
-      console.log("val88888888",val)
+     
       this.selecting_schs = val;
       this.is_status = 1
     },

src/xt_pages/dialysis/signPrint.vue

                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598 || org_id ==10624">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10598">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10598&&org_id!=10624">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"