yq1 před 1 rokem
rodič
revize
b22c628994

+ 2 - 2
src/xt_pages/dialysis/details/index.vue Zobrazit soubor

@@ -459,10 +459,10 @@
459 459
             <div style="border: 1px solid black;width: 82%;"  >
460 460
               <div style="margin: 5px 0;">
461 461
                 <span style="font-weight: bolder;">{{main_collection.patient.name}} </span>&nbsp;&nbsp;
462
+                 
463
+                <span>
462 464
                   <span v-if="main_collection.patient.gender==1">男</span>
463 465
                   <span v-if="main_collection.patient.gender==2">女</span>
464
-                <span>
465
-
466 466
                 </span>&nbsp;&nbsp;
467 467
                 <span>{{getNewAge(main_collection.patient.id_card_no)  }}岁</span>&nbsp;&nbsp;<span>{{getTimes(main_collection.schedule_date)}}</span>&nbsp;&nbsp;
468 468
                 <span></span>

+ 4 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue Zobrazit soubor

@@ -1567,7 +1567,7 @@ export default {
1567 1567
 
1568 1568
     }, searchProjectAction() {
1569 1569
       console.log('~~~~',this.search_project_keyword)
1570
-
1570
+      console.log('1111',this.allProject)
1571 1571
       if (this.search_project_keyword.length == 0) {
1572 1572
         this.tabProject = this.allProject
1573 1573
 
@@ -1582,6 +1582,7 @@ export default {
1582 1582
           }
1583 1583
         }
1584 1584
         this.tabProject = arr
1585
+        console.log('rrrr',this.tabProject)
1585 1586
       }
1586 1587
 
1587 1588
     }, searchProjectTeamAction() {
@@ -3461,13 +3462,12 @@ export default {
3461 3462
               total: good_info[i].total,
3462 3463
               is_special_diseases: good_info[i].is_special_diseases,
3463 3464
               good_info: good_info[i],
3464
-              stock_count: good_info[i].stock_count
3465
+              stock_count: good_info[i].stock_count,
3466
+              first_letter:good_info[i].first_letter
3465 3467
             }
3466 3468
             this.tabProject.push(obj)
3467 3469
           }
3468
-
3469 3470
           this.allProject = this.tabProject
3470
-
3471 3471
         }
3472 3472
       })
3473 3473
 

+ 21 - 12
src/xt_pages/hospitalStation/doctorDesk.vue Zobrazit soubor

@@ -558,11 +558,14 @@ export default {
558 558
             let arr4 = []
559 559
             // console.log('3333',this.all_data);
560 560
             for (let i = 0; i < this.all_data.length; i++) {
561
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
562
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
563
-              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
564
-                arr4 = arr4.concat(this.all_data[i])
561
+              if(this.all_data[i].first_letter !=undefined){
562
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
563
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
564
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
565
+                    arr4 = arr4.concat(this.all_data[i])
566
+                }
565 567
               }
568
+              
566 569
             }
567 570
             this.patientTableData = arr4
568 571
             break
@@ -570,11 +573,14 @@ export default {
570 573
             let arr2 = []
571 574
             // console.log('4444',this.all_data);
572 575
             for (let i = 0; i < this.all_data.length; i++) {
573
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
574
-                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
575
-                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
576
-                arr2 = arr2.concat(this.all_data[i])
576
+              if(this.all_data[i].first_letter !=undefined){
577
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
578
+                    this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
579
+                    this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
580
+                  arr2 = arr2.concat(this.all_data[i])
581
+                }
577 582
               }
583
+             
578 584
             }
579 585
             this.patientTableData = arr2
580 586
 
@@ -583,11 +589,14 @@ export default {
583 589
             let arr3 = []
584 590
             // console.log('5555',this.all_data);
585 591
             for (let i = 0; i < this.all_data.length; i++) {
586
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
587
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
588
-              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
589
-                arr3 = arr3.concat(this.all_data[i])
592
+              if(this.all_data[i].first_letter !=undefined){
593
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
594
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
595
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
596
+                  arr3 = arr3.concat(this.all_data[i])
597
+                }
590 598
               }
599
+              
591 600
             }
592 601
             this.patientTableData = arr3
593 602
             break

+ 1 - 0
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Zobrazit soubor

@@ -3571,6 +3571,7 @@ export default {
3571 3571
               is_special_diseases: good_info[i].is_special_diseases,
3572 3572
               good_info: good_info[i],
3573 3573
               stock_count:good_info[i].stock_count,
3574
+              first_letter:good_info[i].first_letter
3574 3575
             }
3575 3576
             this.tabProject.push(obj)
3576 3577
           }

+ 18 - 12
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Zobrazit soubor

@@ -849,12 +849,15 @@ export default {
849 849
           case 0:
850 850
             let arr = []
851 851
             for (let i = 0; i < this.all_data.length; i++) {
852
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
853
-               this.all_data[i].number.indexOf(this.search_input) != -1 ||
854
-               this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
855
-                arr = arr.concat(this.all_data[i])
856
-                console.log(arr)
852
+              if( this.all_data[i].first_letter !=undefined){
853
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
854
+                this.all_data[i].number.indexOf(this.search_input) != -1 ||
855
+                this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
856
+                  arr = arr.concat(this.all_data[i])
857
+                  console.log(arr)
858
+                }
857 859
               }
860
+              
858 861
             }
859 862
             this.all_data = arr
860 863
 
@@ -863,12 +866,15 @@ export default {
863 866
             let arr2 = []
864 867
            
865 868
             for (let i = 0; i < this.cure_data.length; i++) {
866
-              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
867
-              this.cure_data[i].number.indexOf(this.search_input) != -1 ||
868
-              this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
869
-                console.log('2222',this.cure_data);
870
-                arr2 = arr2.concat(this.cure_data[i])
869
+              if(this.cure_data[i].first_letter != undefined){
870
+                if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
871
+                  this.cure_data[i].number.indexOf(this.search_input) != -1 ||
872
+                  this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
873
+                    console.log('2222',this.cure_data);
874
+                    arr2 = arr2.concat(this.cure_data[i])
875
+                }
871 876
               }
877
+             
872 878
             }
873 879
             this.cure_data = arr2
874 880
 
@@ -1524,7 +1530,7 @@ export default {
1524 1530
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
1525 1531
                 first_letter:response.data.data.list_two[i].first_letter
1526 1532
               }
1527
-              console.log('6666',obj);
1533
+              // console.log('6666',obj);
1528 1534
               this.un_cure_data.push(obj)
1529 1535
             }
1530 1536
 
@@ -1553,7 +1559,7 @@ export default {
1553 1559
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
1554 1560
                   first_letter:response.data.data.list[i].first_letter
1555 1561
                 }
1556
-                console.log('8888',obj);
1562
+                // console.log('8888',obj);
1557 1563
                 this.un_cure_data.push(obj)
1558 1564
               }
1559 1565
               //已就诊

+ 1 - 1
src/xt_pages/outpatientDoctorStation/print.vue Zobrazit soubor

@@ -159,7 +159,7 @@ export default {
159 159
       }
160 160
        else {
161 161
         const style =
162
-          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:300px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
162
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:100px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
163 163
         printJS({
164 164
           printable: "prescriptionPrint",
165 165
           type: "html",

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printOne.vue Zobrazit soubor

@@ -56,7 +56,7 @@
56 56
             </div>
57 57
           </div>
58 58
         </div>
59
-        <div class="prescriptionBox" >
59
+        <div class="prescriptionBox" style="min-height: 350px;">
60 60
           <div class="Rp">Rp:</div>
61 61
           <div
62 62
             class="drugsBox"