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

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -60,13 +60,16 @@
             <div class="inline_block" style="margin-right:30px;">
               血液净化器类型
               <div class="inline_block under_line" style="width:150px;text-align: center;">
-                <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
+                <!-- <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
                   {{
                     prescription.dialyzer_perfusion_apparatus
                       ? prescription.dialyzer_perfusion_apparatus
                       : ""
                   }}
-                </span>
+                </span> -->
+
+                
+              
                 <span v-if="prescription.dialysis_dialyszers !=''">
                   {{
                     prescription.dialysis_dialyszers
@@ -74,10 +77,10 @@
                       : "/"
                   }}
                 </span>
-                <span v-if="prescription.dialysis_strainer !=''">
+                <span v-if="prescription.dialysis_irrigation !=''">
                   {{
-                    prescription.dialysis_strainer?
-                    prescription.dialysis_strainer:""
+                    prescription.dialysis_irrigation?
+                    prescription.dialysis_irrigation:""
                   }}
                 </span>
               </div>

src/xt_pages/user/components/PatientSidebar.vue

@@ -433,7 +433,7 @@ export default {
       fetchAllList().then(response => {
         if (response.data.state == 1) {
           if(this.org_id ==10191){
-             var patients = response.data.data.patients
+             var patients = response.data.data.patientsOne
             //  console.log("patients",patients)
              for(let i=0;i<patients.length;i++){
                if(patients[i].lapseto ==1){
@@ -442,7 +442,7 @@ export default {
 
              }
           }else{
-            this.patientsList = response.data.data.patients
+            this.patientsList = response.data.data.patientsOne
             console.log("哈哈哈哈哈哈",this.patientsList)
           }
 

src/xt_pages/user/components/PatientSidebar_ord.vue

@@ -434,7 +434,7 @@
           if (response.data.state == 1) {
             if(this.org_id ==10191){
                var patients = response.data.data.patientsOne
-              //  console.log("patients",patients)
+              console.log("patients",patients)
                for(let i=0;i<patients.length;i++){
                  if(patients[i].lapseto ==1){
                   this.patientsList.push(patients[i])