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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3215,8 +3215,8 @@ export default {
                 var err_msg = ""
                 for(let i =0; i < this.prescriptions.length; i++){
                   for(let b= 0; b < this.prescriptions[i].advices.length;b++){
-                    console.log(this.prescriptions[i].advices[b])
-                    if(this.prescriptions[i].advices[b].prescribing_number_unit !=this.prescriptions[i].advices[b].drug.min_unit){
+
+                    if(this.prescriptions[i].advices[b].prescribing_number_unit !=this.prescriptions[i].advices[b].drug.min_unit && this.prescriptions[i].advices[b].delivery_way.indexOf("口服") != -1 ){
                       isLoading = false
                       if(err_msg.length == 0){
 

src/xt_pages/user/patientInfo.vue

@@ -1,9 +1,11 @@
 
 <template>
   <div class="patient-container">
-  <patient-sidebar :id="patientID"></patient-sidebar>
+  <patient-sidebar :id="patientID" v-if="org_id!=0&&org_id!=10702"></patient-sidebar>
+  <PatientSidebar_ord :id="patientID" v-if="org_id==0 || org_id==10702"></PatientSidebar_ord>
    <!-- <PatientSidebar_new :id="patientID"></PatientSidebar_new> -->
   <patient-detail :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-detail>
+
   </div>
 </template>