Procházet zdrojové kódy

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

yq1 před 1 rokem
rodič
revize
2c4e5cea2a

+ 5 - 5
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Zobrazit soubor

@@ -1022,7 +1022,7 @@ import RegisterDialog9504 from './components/registerDialog9504'
1022 1022
 import cryptoJs from 'crypto-js'
1023 1023
 import NewStatementPrintThree from './newStatementPrintThree.vue'
1024 1024
 import CallUnAssociationPrescription from './components/callUnAssociationPrescription.vue'
1025
-// import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
1025
+import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
1026 1026
 
1027 1027
 const moment = require('moment')
1028 1028
 export default {
@@ -2760,14 +2760,14 @@ export default {
2760 2760
         let arr = []
2761 2761
         for (let i = 0; i < all_patient.length; i++) {
2762 2762
           if(all_patient[i].first_letter != 'undefined'){
2763
-            if (all_patient[i].name.indexOf(this.search_input) != -1 || 
2763
+            if (all_patient[i].name.indexOf(this.search_input) != -1 ||
2764 2764
               all_patient[i].number.indexOf(this.search_input) != -1 ||
2765 2765
               all_patient[i].first_letter.indexOf(this.search_input) != -1) {
2766 2766
               arr = arr.concat(all_patient[i])
2767 2767
             }
2768 2768
           }else{
2769
-            if (all_patient[i].name.indexOf(this.search_input) != -1 || 
2770
-              all_patient[i].number.indexOf(this.search_input) != -1 
2769
+            if (all_patient[i].name.indexOf(this.search_input) != -1 ||
2770
+              all_patient[i].number.indexOf(this.search_input) != -1
2771 2771
               ) {
2772 2772
               arr = arr.concat(all_patient[i])
2773 2773
             }
@@ -4916,7 +4916,7 @@ export default {
4916 4916
         num = num.substring(0)
4917 4917
       }
4918 4918
       return parseFloat(num).toFixed(decimal)
4919
-    }, 
4919
+    },
4920 4920
     getMonthChargePatientList() {
4921 4921
       let params = {
4922 4922
         'record_date': this.record_date,