Browse Source

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

yq1 1 day ago
parent
commit
be58712f2c

+ 8 - 5
src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue View File

60
             <div class="inline_block" style="margin-right:30px;">
60
             <div class="inline_block" style="margin-right:30px;">
61
               血液净化器类型
61
               血液净化器类型
62
               <div class="inline_block under_line" style="width:150px;text-align: center;">
62
               <div class="inline_block under_line" style="width:150px;text-align: center;">
63
-                <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
63
+                <!-- <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
64
                   {{
64
                   {{
65
                     prescription.dialyzer_perfusion_apparatus
65
                     prescription.dialyzer_perfusion_apparatus
66
                       ? prescription.dialyzer_perfusion_apparatus
66
                       ? prescription.dialyzer_perfusion_apparatus
67
                       : ""
67
                       : ""
68
                   }}
68
                   }}
69
-                </span>
69
+                </span> -->
70
+
71
+                
72
+              
70
                 <span v-if="prescription.dialysis_dialyszers !=''">
73
                 <span v-if="prescription.dialysis_dialyszers !=''">
71
                   {{
74
                   {{
72
                     prescription.dialysis_dialyszers
75
                     prescription.dialysis_dialyszers
74
                       : "/"
77
                       : "/"
75
                   }}
78
                   }}
76
                 </span>
79
                 </span>
77
-                <span v-if="prescription.dialysis_strainer !=''">
80
+                <span v-if="prescription.dialysis_irrigation !=''">
78
                   {{
81
                   {{
79
-                    prescription.dialysis_strainer?
80
-                    prescription.dialysis_strainer:""
82
+                    prescription.dialysis_irrigation?
83
+                    prescription.dialysis_irrigation:""
81
                   }}
84
                   }}
82
                 </span>
85
                 </span>
83
               </div>
86
               </div>

+ 2 - 2
src/xt_pages/user/components/PatientSidebar.vue View File

433
       fetchAllList().then(response => {
433
       fetchAllList().then(response => {
434
         if (response.data.state == 1) {
434
         if (response.data.state == 1) {
435
           if(this.org_id ==10191){
435
           if(this.org_id ==10191){
436
-             var patients = response.data.data.patients
436
+             var patients = response.data.data.patientsOne
437
             //  console.log("patients",patients)
437
             //  console.log("patients",patients)
438
              for(let i=0;i<patients.length;i++){
438
              for(let i=0;i<patients.length;i++){
439
                if(patients[i].lapseto ==1){
439
                if(patients[i].lapseto ==1){
442
 
442
 
443
              }
443
              }
444
           }else{
444
           }else{
445
-            this.patientsList = response.data.data.patients
445
+            this.patientsList = response.data.data.patientsOne
446
             console.log("哈哈哈哈哈哈",this.patientsList)
446
             console.log("哈哈哈哈哈哈",this.patientsList)
447
           }
447
           }
448
 
448
 

+ 1 - 1
src/xt_pages/user/components/PatientSidebar_ord.vue View File

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