3月21

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -518,8 +518,9 @@ export default {
       }
 
     },
+    // 患者姓名搜索
     searchAction() {
-
+      const all_table_data = this.all_table_data
       if (this.search_input.length == 0) {
         switch (this.radio) {
           case 1:
@@ -536,18 +537,22 @@ export default {
       } else {
         switch (this.radio) {
           case 1:
+            console.log('11111',all_table_data);
             let arr3 = []
-            for (let i = 0; i < this.all_table_data.length; i++) {
-              if (this.all_table_data[i].name.indexOf(this.search_input) != -1) {
-                arr3 = arr3.concat(this.all_table_data[i])
+            for (let i = 0; i < all_table_data.length; i++) {
+              if (all_table_data[i].name.indexOf(this.search_input) != -1 ||
+                  all_table_data[i].first_letter.indexOf(this.search_input) != -1) {
+                arr3 = arr3.concat(all_table_data[i])
               }
             }
             this.patientTableData = arr3
             break
           case 2:
+          console.log('22222');
             let arr2 = []
-            for (let i = 0; i < this.all_table_data.length; i++) {
-              if (this.all_table_data[i].name.indexOf(this.search_input) != -1) {
+            for (let i = 0; i < all_table_data.length; i++) {
+              if (all_table_data[i].name.indexOf(this.search_input) != -1 ||
+                all_table_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr2 = arr2.concat(this.all_table_data[i])
               }
             }
@@ -818,7 +823,9 @@ export default {
           .catch(function(error) {
           })
       }
-    }, changePatientInfo() {
+    }, 
+
+    changePatientInfo() {
       let params = {
         'record_date': this.record_date,
         'sch_type': this.schedule_type
@@ -905,6 +912,7 @@ export default {
           this.patientTableData = []
           this.upload_num = response.data.data.upload_num
           this.un_upload_num = response.data.data.un_upload_num
+          console.log('4444444411111',response.data.data)
           switch (this.radio) {
             case 1:
               this.all_table_data = response.data.data.list

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1022,7 +1022,7 @@ import RegisterDialog9504 from './components/registerDialog9504'
 import cryptoJs from 'crypto-js'
 import NewStatementPrintThree from './newStatementPrintThree.vue'
 import CallUnAssociationPrescription from './components/callUnAssociationPrescription.vue'
-import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
+// import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
 
 const moment = require('moment')
 export default {
@@ -2079,6 +2079,7 @@ export default {
       })
 
     },
+    // 1号
     getDayPatientList() {
 
       let params = {
@@ -2303,6 +2304,7 @@ export default {
       })
 
     },
+    // 2号
     getMonthPatientList() {
       let params = {
         'record_date': this.record_date,
@@ -2748,15 +2750,18 @@ export default {
       }
 
     },
+    // 搜索
     searchAction() {
+      const all_patient =this.all_patient
       if (this.search_input.length == 0) {
         this.patientTableData = this.all_patient
-
       } else {
-
+        console.log('6666666',all_patient);
         let arr = []
-        for (let i = 0; i < this.all_patient.length; i++) {
-          if (this.all_patient[i].name.indexOf(this.search_input) != -1 || this.all_patient[i].number.indexOf(this.search_input) != -1) {
+        for (let i = 0; i < all_patient.length; i++) {
+          if (all_patient[i].name.indexOf(this.search_input) != -1 || 
+            all_patient[i].number.indexOf(this.search_input) != -1 ||
+            all_patient[i].first_letter.indexOf(this.search_input) != -1) {
             arr = arr.concat(this.all_patient[i])
           }
         }
@@ -3942,6 +3947,7 @@ export default {
       this.radioStatus = id
       this.getPatientList()
     },
+    // 3号
     changeRadioAndPatient(id) {
       this.radio = id
       let params = {
@@ -3949,7 +3955,6 @@ export default {
         'sch_type':this.sch_type,
 
       }
-
       getChargeHisPatientList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
@@ -3962,6 +3967,7 @@ export default {
           let one_count = 0
           let two_count = 0
           let three_count = 0
+          console.log('111111111',response.data.data);
           for (let i = 0; i < response.data.data.list.length; i++) {
             if (response.data.data.list[i].his_patient.length == 0) { //没挂号
               if (response.data.data.list[i].prescription.length > 0) {
@@ -4196,9 +4202,12 @@ export default {
           }
         }
       })
-    },changeSchtype(){
+    },
+    changeSchtype(){
       this.getPatientList()
-    },changeScheduleType(val){
+    },
+    // 4号
+    changeScheduleType(val){
       this.sch_type  = val
       let params = {
         'record_date': this.record_date,
@@ -4426,8 +4435,6 @@ export default {
         }
       })
 
-
-
       let params2 = {
         'record_date': this.record_date,
         'type': 1,
@@ -4656,6 +4663,7 @@ export default {
 
 
     },
+    // 单击单选框患者数据源
     changeRadio(id) {
       if(this.activeName == 'first') {
         let temp_id = id
@@ -4676,6 +4684,7 @@ export default {
             let one_count = 0
             let two_count = 0
             let three_count = 0
+            console.log('11111111111111111',response.data.data);
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (response.data.data.list[i].his_patient.length == 0) { //没挂号
                 if (response.data.data.list[i].prescription.length > 0) {
@@ -4686,7 +4695,8 @@ export default {
                     order_status: 0,
                     order_number: '',
                     his_patient_id: 0,
-                    prescription: response.data.data.list[i].prescription
+                    prescription: response.data.data.list[i].prescription,
+                    first_letter:response.data.data.list[i].first_letter
                   }
 
                   this.all_table_data.push(obj)
@@ -4704,7 +4714,8 @@ export default {
                         his_patient_id: response.data.data.list[i].his_patient[0].id,
                         order_number: response.data.data.list[i].his_patient[0].orders[b].order_number,
                         order_id: response.data.data.list[i].his_patient[0].orders[b].id,
-                        prescription: response.data.data.list[i].prescription
+                        prescription: response.data.data.list[i].prescription,
+                        first_letter:response.data.data.list[i].first_letter
 
                       }
                       this.all_table_data.push(obj)
@@ -4719,8 +4730,8 @@ export default {
                       his_patient_id: response.data.data.list[i].his_patient[0].id,
                       order_number: '',
                       order_id: 0,
-                      prescription: response.data.data.list[i].prescription
-
+                      prescription: response.data.data.list[i].prescription,
+                      first_letter:response.data.data.list[i].first_letter
                     }
                     this.all_table_data.push(obj)
 
@@ -4738,7 +4749,8 @@ export default {
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
                         order_number: '',
                         order_id: 0,
-                        prescription: response.data.data.list[i].prescription
+                        prescription: response.data.data.list[i].prescription,
+                        first_letter:response.data.data.list[i].first_letter
                       }
                       this.all_table_data.push(obj)
                     } else {
@@ -4752,8 +4764,8 @@ export default {
                           his_patient_id: response.data.data.list[i].his_patient[b].id,
                           order_number: response.data.data.list[i].his_patient[b].orders[c].number,
                           order_id: response.data.data.list[i].his_patient[b].orders[c].id,
-                          prescription: response.data.data.list[i].prescription
-
+                          prescription: response.data.data.list[i].prescription,
+                          first_letter:response.data.data.list[i].first_letter
                         }
                         this.all_table_data.push(obj)
                       }
@@ -4814,7 +4826,7 @@ export default {
               this.all_table_data = this.unique_four(this.all_table_data)
             }
 
-            console.log(this.all_table_data)
+            console.log('yyyyy',this.all_table_data)
 
             switch (this.radio) {
               case 1:
@@ -4897,7 +4909,8 @@ export default {
         num = num.substring(0)
       }
       return parseFloat(num).toFixed(decimal)
-    }, getMonthChargePatientList() {
+    }, 
+    getMonthChargePatientList() {
       let params = {
         'record_date': this.record_date,
         'start_time': this.other_start_time,
@@ -4914,7 +4927,7 @@ export default {
       })
 
     },
-    //患者列表
+    //未收费患者列表
     getPatientList() {
       let params = {
         'record_date': this.record_date,
@@ -4933,6 +4946,7 @@ export default {
           let one_count = 0
           let two_count = 0
           let three_count = 0
+          console.log('vvvvvvvvvvvvv',response.data.data);
           for (let i = 0; i < response.data.data.list.length; i++) {
             if (response.data.data.list[i].his_patient.length == 0) { //没挂号
               if (response.data.data.list[i].prescription.length > 0) {
@@ -4944,7 +4958,8 @@ export default {
                   order_number: '',
                   his_patient_id: 0,
                   prescription: response.data.data.list[i].prescription,
-                  schedle: response.data.data.list[i].schedule
+                  schedle: response.data.data.list[i].schedule,
+                  first_letter:response.data.data.list[i].first_letter
 
                 }
 
@@ -4964,8 +4979,8 @@ export default {
                       order_number: response.data.data.list[i].his_patient[0].orders[b].order_number,
                       order_id: response.data.data.list[i].his_patient[0].orders[b].id,
                       prescription: response.data.data.list[i].prescription,
-                      schedle: response.data.data.list[i].schedule
-
+                      schedle: response.data.data.list[i].schedule,
+                      first_letter:response.data.data.list[i].first_letter
 
                     }
                     this.all_table_data.push(obj)
@@ -4981,8 +4996,8 @@ export default {
                     order_number: '',
                     order_id: 0,
                     prescription: response.data.data.list[i].prescription,
-                    schedle: response.data.data.list[i].schedule
-
+                    schedle: response.data.data.list[i].schedule,
+                    first_letter:response.data.data.list[i].first_letter
 
                   }
                   this.all_table_data.push(obj)
@@ -5002,7 +5017,8 @@ export default {
                       order_number: '',
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription,
-                      schedle: response.data.data.list[i].schedule
+                      schedle: response.data.data.list[i].schedule,
+                      first_letter:response.data.data.list[i].first_letter
                     }
                     this.all_table_data.push(obj)
                   } else {
@@ -5017,8 +5033,8 @@ export default {
                         order_number: response.data.data.list[i].his_patient[b].orders[c].number,
                         order_id: response.data.data.list[i].his_patient[b].orders[c].id,
                         prescription: response.data.data.list[i].prescription,
-                        schedle: response.data.data.list[i].schedule
-
+                        schedle: response.data.data.list[i].schedule,
+                        first_letter:response.data.data.list[i].first_letter
 
                       }
                       this.all_table_data.push(obj)
@@ -5089,7 +5105,7 @@ export default {
             this.all_table_data = this.unique_four(this.all_table_data)
           }
 
-
+          console.log('zzzzzz',this.all_table_data);
           switch (this.radio) {
             case 1:
               this.patientTableData = []
@@ -5142,6 +5158,7 @@ export default {
         }
       })
     },
+    // 5号
     getMonthHISPatientList() {
       let params = {
         'record_date': this.record_date,
@@ -5712,12 +5729,6 @@ export default {
                   }
                 }
               }
-
-
-
-
-
-
               this.sick_history = this.info.sick_history
               if (this.info.register_type == 0) {
                 this.form.p_type = ''
@@ -5852,8 +5863,7 @@ export default {
                   //   tempAddition.push(obj)
                   // }
                   const index = i + 1
-                  console.log('~~~~~~~~')
-                  console.log(prescription.order)
+                  console.log('~~~~~~~~',prescription.order)
                   prescription.order.order_status = prescription.order.order_status.toString()
                   prescription.order.order_status = parseInt(prescription.order.order_status)
 

src/xt_pages/outpatientCharges/summary.vue

@@ -3861,8 +3861,24 @@ export default {
       })
     },
     searchAction() {
+      console.log('22222',this.keywords);
       this.page = 1
-      this.getHisOrderList()
+      const tableData = this.tableData
+      if (this.keywords.length == 0) {
+        this.getHisOrderList()
+      } else {
+        console.log('6666666',tableData);
+        let arr = []
+        for (let i = 0; i < tableData.length; i++) {
+          
+          if (tableData[i].patient.name.indexOf(this.keywords) != -1 || 
+            tableData[i].patient.first_letter.indexOf(this.keywords) != -1) {
+            arr = arr.concat(tableData[i])
+          }
+        }
+        this.tableData = arr
+      }
+      // this.getHisOrderList()
     },
     getTimes(time) {
       return uParseTime(time, '{y}-{m}-{d}')
@@ -3902,6 +3918,7 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
+          console.log('8888888',response.data.data);
           this.tableData = response.data.data.order
           this.tableData2 =  response.data.data.order2
           this.total = response.data.data.total

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -449,7 +449,7 @@
                               <el-input style="width:50%;" @input="searchProjectTeamAction"
                                         @keyup.enter.native='searchProjectTeamAction'
                                         v-model.trim="search_project_team_keyword"
-                                        placeholder="请输入项目组套名称"></el-input>
+                                        placeholder="请输入项目组套名称" :clearable="true"></el-input>
                               <div style="width: 100%;flex:1;overflow-y: auto;">
                                   <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
                                             :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
@@ -1784,15 +1784,19 @@ export default {
         console.log('kkkk',this.tabProject);
       }
 
-    }, searchProjectTeamAction() {
+    }, 
+    // 项目组套搜索
+    searchProjectTeamAction() {
+      const allTabPrjectTeam = this.allTabPrjectTeam
       if (this.search_project_team_keyword.length == 0) {
         this.tabPrjectTeam = this.allTabPrjectTeam
-
       } else {
+        // console.log('555555',allTabPrjectTeam,this.search_project_team_keyword);
         let arr = []
-        for (let i = 0; i < this.allTabPrjectTeam.length; i++) {
-          if (this.allTabPrjectTeam[i].project_team.indexOf(this.search_project_team_keyword) != -1) {
-            arr = arr.concat(this.allTabPrjectTeam[i])
+        for (let i = 0; i < allTabPrjectTeam.length; i++) {
+          if (allTabPrjectTeam[i].project_team.indexOf(this.search_project_team_keyword) != -1 ||
+              allTabPrjectTeam[i].pinyin.indexOf(this.search_project_team_keyword) != -1) {
+            arr = arr.concat(allTabPrjectTeam[i])
           }
         }
         this.tabPrjectTeam = arr
@@ -4240,11 +4244,12 @@ export default {
         }
       }
     },
+    // 项目组套数据源
     getAllProjectTeam() {
       getAllProjectTeam().then(response => {
         if (response.data.state == 1) {
           var team = response.data.data.team
-
+          // console.log('44444444422222',response.data.data);
           this.tabPrjectTeam = team.sort(this.compare("sort"))
           this.allTabPrjectTeam = team
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -148,6 +148,7 @@ export default {
     };
   },
   methods: {
+    // 搜索
     searchAction() {
       this.data = [];
       if (this.search_input.length == 0) {
@@ -259,6 +260,7 @@ export default {
     getList(id) {
       getPatientListTwenty().then((response) => {
         if (response.data.state == 1) {
+          console.log('uuuuuuu',response.data.data);
           this.data = response.data.data.list;
           this.all_data = response.data.data.list;
           let index = null;

src/xt_pages/user/patients.vue

@@ -1439,7 +1439,7 @@
         this.LapsetoDialogVisible = true
       },
       LapsetoInfo(row) {
-        console.log("row",row)
+        // console.log("row",row)
         if (row.lapseto === 1) {
           return '留治'
         } else if(row.lapseto === 2) {
@@ -1589,7 +1589,7 @@
         this.getList()
       },
       getList() {
-         console.log("query23323223wo",this.listQuery)
+        //  console.log("query23323223wo",this.listQuery)
         fetchList(this.listQuery).then(response => {
           if (response.data.state === 0) {
             this.$message.error(response.data.msg)
@@ -1597,6 +1597,7 @@
           } else {
             this.tableData = response.data.data.patients
             console.log("wowowowo",this.tableData)
+            console.log('2222222',response.data.data)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           
@@ -1614,7 +1615,7 @@
             return false
           } else {
             var patient = response.data.data.patient
-            console.log('二维码病人信息', patient)
+            // console.log('二维码病人信息', patient)
             this.id = patient.id
             this.name = patient.name
             this.gender = patient.gender
@@ -1877,7 +1878,12 @@
           }
        }
        return work_unit
+    },
+
+    beforeUpload(){
+
     }
+
     }
   }
   Vue.prototype.$QRCode = function() {