提交代码

src/api/his/his.js

@@ -818,6 +818,17 @@ export function getPrintLable(params){
 }
 
 
+export function getMonthHisPatient(params){
+  return request({
+    url:"/api/monthhispatient",
+    method:"get",
+    params:params
+  })
+}
+
+
+
+
 
 
 

src/xt_pages/Dialysisanalysis/calcium/calciumall.vue

@@ -361,7 +361,7 @@ export default {
         start_date: this.start_time,
         end_date: this.end_time,
         project_id: 4,
-        item_id: 289
+        item_id: 54
       }
       this.pieData = []
       this.tableData = []

src/xt_pages/Dialysisanalysis/calcium/calciumalone.vue

@@ -611,7 +611,7 @@ export default {
     this.query.end_time = year + '-' + month + '-' + day
     this.query.start_time = year + '-' + last_month + '-' + day
     this.query.project_id = 4
-    this.query.item_id = 289
+    this.query.item_id = 54
     this.getCurrentOrgPatients()
 
     // this.GetPersonQCStatistisData()

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -992,7 +992,8 @@ import {
   Refund,
   refundNumber,
   register,
-  upload
+  upload,
+  getMonthHisPatient,
 } from '@/api/his/his'
 import RegisterDialog from './components/registerDialog'
 import treatPrint from './treatPrint'
@@ -2185,8 +2186,10 @@ export default {
           this.cal_two = two_count
           this.cal_three = one_count + two_count
           this.current_index = 0
-          this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+          if(this.patientTableData.length > 0) {
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          }
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
         }
       })
 
@@ -2404,8 +2407,10 @@ export default {
           this.cal_two = two_count
           this.cal_three = one_count + two_count
           this.current_index = 0
-          this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+          if(this.patientTableData.length > 0){
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          }
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
         }
       })
 
@@ -2415,6 +2420,8 @@ export default {
       if (this.activeName == 'first') {
         this.getPatientList()
       } else if (this.activeName == 'second') {
+        this.getMonthHISPatientList()
+
         const params = {
           'record_date': this.record_date,
           'patient_id': this.patientInfo.id,
@@ -4024,228 +4031,235 @@ export default {
       })
     },
     changeRadio(id) {
-      let temp_id = id
-      this.radio = id
-      let params = {
-        'record_date': this.record_date
-      }
-      getChargeHisPatientList(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.patientTableData = []
-          this.all_table_data = []
-          this.hisPatientDatas = []
-
-          let one_count = 0
-          let two_count = 0
-          let three_count = 0
-          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) {
-                let obj = {
-                  id: response.data.data.list[i].id,
-                  name: response.data.data.list[i].name,
-                  number: '',
-                  order_status: 0,
-                  order_number: '',
-                  his_patient_id: 0,
-                  prescription: response.data.data.list[i].prescription
-                }
-
-                this.all_table_data.push(obj)
-              }
-
-            } else { //挂号
-              if (response.data.data.list[i].his_patient.length == 1) {
-                if (response.data.data.list[i].his_patient[0].orders.length > 0) {
-                  for (let b = 0; b < response.data.data.list[i].his_patient[0].orders.length; b++) {
-                    let obj = {
-                      id: response.data.data.list[i].id,
-                      name: response.data.data.list[i].name,
-                      number: response.data.data.list[i].his_patient[0].number,
-                      order_status: response.data.data.list[i].his_patient[0].orders[b].order_status,
-                      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
-
-                    }
-                    this.all_table_data.push(obj)
-
-                  }
-                } else {
+      if(this.activeName == 'first') {
+        let temp_id = id
+        this.radio = id
+        let params = {
+          'record_date': this.record_date
+        }
+        getChargeHisPatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = []
+            this.all_table_data = []
+            this.hisPatientDatas = []
+
+            let one_count = 0
+            let two_count = 0
+            let three_count = 0
+            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) {
                   let obj = {
                     id: response.data.data.list[i].id,
                     name: response.data.data.list[i].name,
-                    number: response.data.data.list[i].his_patient[0].number,
+                    number: '',
                     order_status: 0,
-                    his_patient_id: response.data.data.list[i].his_patient[0].id,
                     order_number: '',
-                    order_id: 0,
+                    his_patient_id: 0,
                     prescription: response.data.data.list[i].prescription
-
                   }
-                  this.all_table_data.push(obj)
 
+                  this.all_table_data.push(obj)
                 }
-              }
 
-              if (response.data.data.list[i].his_patient.length > 1) {
-                for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                  if (response.data.data.list[i].his_patient[b].orders.length == 0) {
+              } else { //挂号
+                if (response.data.data.list[i].his_patient.length == 1) {
+                  if (response.data.data.list[i].his_patient[0].orders.length > 0) {
+                    for (let b = 0; b < response.data.data.list[i].his_patient[0].orders.length; b++) {
+                      let obj = {
+                        id: response.data.data.list[i].id,
+                        name: response.data.data.list[i].name,
+                        number: response.data.data.list[i].his_patient[0].number,
+                        order_status: response.data.data.list[i].his_patient[0].orders[b].order_status,
+                        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
+
+                      }
+                      this.all_table_data.push(obj)
+
+                    }
+                  } else {
                     let obj = {
                       id: response.data.data.list[i].id,
                       name: response.data.data.list[i].name,
-                      number: response.data.data.list[i].his_patient[b].number,
+                      number: response.data.data.list[i].his_patient[0].number,
                       order_status: 0,
-                      his_patient_id: response.data.data.list[i].his_patient[b].id,
+                      his_patient_id: response.data.data.list[i].his_patient[0].id,
                       order_number: '',
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription
+
                     }
                     this.all_table_data.push(obj)
-                  } else {
 
-                    for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
+                  }
+                }
+
+                if (response.data.data.list[i].his_patient.length > 1) {
+                  for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
-                        order_status: response.data.data.list[i].his_patient[b].orders[c].order_status,
+                        order_status: 0,
                         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,
+                        order_number: '',
+                        order_id: 0,
                         prescription: response.data.data.list[i].prescription
-
                       }
                       this.all_table_data.push(obj)
+                    } else {
+
+                      for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
+                        let obj = {
+                          id: response.data.data.list[i].id,
+                          name: response.data.data.list[i].name,
+                          number: response.data.data.list[i].his_patient[b].number,
+                          order_status: response.data.data.list[i].his_patient[b].orders[c].order_status,
+                          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
+
+                        }
+                        this.all_table_data.push(obj)
+                      }
+
                     }
 
                   }
-
                 }
               }
             }
-          }
-          for (let i = 0; i < this.all_table_data.length; i++) {
-            if (this.all_table_data[i].his_patient_id > 0) {
-              this.hisPatientDatas.push(this.all_table_data[i])
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].his_patient_id > 0) {
+                this.hisPatientDatas.push(this.all_table_data[i])
+              }
             }
-          }
 
-          let unChargePatient = []
-          for (let i = 0; i < this.all_table_data.length; i++) {
-            let isHasUnCharge = false
-            for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-              if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-                isHasUnCharge = true
-              } else {
-                if (this.all_table_data[i].his_patient_id > 0) {
-                  if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
-                    isHasUnCharge = true
+            let unChargePatient = []
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              let isHasUnCharge = false
+              for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
+                if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                  isHasUnCharge = true
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
+                      isHasUnCharge = true
+                    }
                   }
+
                 }
+              }
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                isHasUnCharge = true
 
               }
-            }
-            if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-              isHasUnCharge = true
 
-            }
+              if (isHasUnCharge) {
+                unChargePatient.push(this.all_table_data[i])
+              }
 
-            if (isHasUnCharge) {
-              unChargePatient.push(this.all_table_data[i])
             }
 
-          }
+            unChargePatient = this.unique_four(unChargePatient)
 
-          unChargePatient = this.unique_four(unChargePatient)
+            one_count = one_count + unChargePatient.length
 
-          one_count = one_count + unChargePatient.length
+            let ChargePatient = []
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].order_status == 2) {
+                ChargePatient.push(this.all_table_data[i])
+              }
 
-          let ChargePatient = []
-          for (let i = 0; i < this.all_table_data.length; i++) {
-            if (this.all_table_data[i].order_status == 2) {
-              ChargePatient.push(this.all_table_data[i])
             }
 
-          }
+            two_count = two_count + ChargePatient.length
 
-          two_count = two_count + ChargePatient.length
-
-          if (this.radio == 1) {
-            this.all_table_data = this.unique_four(this.all_table_data)
-          }
+            if (this.radio == 1) {
+              this.all_table_data = this.unique_four(this.all_table_data)
+            }
 
-          console.log(this.all_table_data)
+            console.log(this.all_table_data)
 
-          switch (this.radio) {
-            case 1:
-              this.patientTableData = []
-              for (let i = 0; i < this.all_table_data.length; i++) {
-                let isHasUnCharge = false
-                for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                  console.log('!111111111')
-                  console.log(this.all_table_data[i].order_status)
-                  if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-                    console.log('!22222222222')
+            switch (this.radio) {
+              case 1:
+                this.patientTableData = []
+                for (let i = 0; i < this.all_table_data.length; i++) {
+                  let isHasUnCharge = false
+                  for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
+                    console.log('!111111111')
+                    console.log(this.all_table_data[i].order_status)
+                    if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                      console.log('!22222222222')
 
-                    isHasUnCharge = true
-                  } else {
-                    if (this.all_table_data[i].his_patient_id > 0) {
-                      console.log('!4444444444444')
+                      isHasUnCharge = true
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        console.log('!4444444444444')
 
-                      if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
-                        isHasUnCharge = true
-                        console.log('!33333333333')
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
+                          isHasUnCharge = true
+                          console.log('!33333333333')
 
+                        }
                       }
+
                     }
 
                   }
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                    console.log('11111111')
 
+                    isHasUnCharge = true
+                  }
+                  if (isHasUnCharge) {
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
                 }
-                if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-                  console.log('11111111')
-
-                  isHasUnCharge = true
-                }
-                if (isHasUnCharge) {
-                  this.patientTableData.push(this.all_table_data[i])
-                }
-              }
-              this.all_patient = this.patientTableData
-              break
-            case 2:
-              this.patientTableData = []
-              for (let i = 0; i < this.all_table_data.length; i++) {
-                if (this.all_table_data[i].order_status == 2) {
-                  this.patientTableData.push(this.all_table_data[i])
+                this.all_patient = this.patientTableData
+                break
+              case 2:
+                this.patientTableData = []
+                for (let i = 0; i < this.all_table_data.length; i++) {
+                  if (this.all_table_data[i].order_status == 2) {
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
                 }
-              }
-              this.all_patient = this.patientTableData
-              break
-            case 4:
-              this.patientTableData = []
-              this.patientTableData = this.all_table_data
-              this.all_patient = this.patientTableData
-              break
-          }
+                this.all_patient = this.patientTableData
+                break
+              case 4:
+                this.patientTableData = []
+                this.patientTableData = this.all_table_data
+                this.all_patient = this.patientTableData
+                break
+            }
 
-          this.cal_one = one_count
-          this.cal_two = two_count
-          this.cal_three = one_count + two_count
-          this.current_index = 0
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = one_count + two_count
+            this.current_index = 0
 
-          this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+            if(this.patientTableData.length > 0) {
+              this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            }
+            // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
 
-        }
+          }
 
-      })
+        })
+      }else{
+        this.radio = id
+        this.getMonthHISPatientList()
 
+      }
     },
     formatDecimal(num, decimal) {
       num = num.toString()
@@ -4479,10 +4493,109 @@ export default {
           this.cal_three = one_count + two_count
           this.current_index = 0
           this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+        }
+      })
+    },
+    getMonthHISPatientList() {
+      let params = {
+        'record_date': this.record_date,
+        'type': this.radio
+      }
+      getMonthHisPatient(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.patientTableData = []
+          this.all_table_data = []
+          this.hisPatientDatas = []
+
+          if (response.data.data.list == null){
+            response.data.data.list = []
+          }
+
+          if (response.data.data.chargePatients == null){
+            response.data.data.chargePatients = []
+          }
+          let one_count = 0
+          let two_count = 0
+
+          for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].his_patient.length > 0) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: response.data.data.list[i].his_patient[0].number,
+                    order_status: 0,
+                    his_patient_id: response.data.data.list[i].his_patient[0].id,
+                    order_number: '',
+                    order_id: 0,
+                    prescription: response.data.data.list[i].prescription
+                  }
+                  this.all_table_data.push(obj)
+              }
+
+          }
+
+          let unChargePatient = []
+          for (let i = 0; i < this.all_table_data.length; i++) {
+              unChargePatient.push(this.all_table_data[i])
+          }
+          unChargePatient = this.unique_four(unChargePatient)
+          one_count = one_count + unChargePatient.length
+
+          let ChargePatient = []
+          for (let i = 0; i < response.data.data.chargePatients.length; i++) {
+            let obj = {
+              id: response.data.data.chargePatients[i].patient_id,
+              name: response.data.data.chargePatients[i].patient.name,
+              number: response.data.data.chargePatients[i].mdtrt_id,
+              order_status: 2,
+              his_patient_id: 0,
+              order_number: response.data.data.chargePatients[i].number,
+              order_id: response.data.data.chargePatients[i].id,
+            }
+              ChargePatient.push(obj)
+            }
+          two_count = two_count + ChargePatient.length
+
+          if (this.radio == 1) {
+            this.all_table_data = this.unique_four(this.all_table_data)
+          }else{
+            this.all_table_data = ChargePatient
+          }
+
+
+          switch (this.radio) {
+            case 1:
+              this.patientTableData = []
+              for (let i = 0; i < this.all_table_data.length; i++) {
+                  this.patientTableData.push(this.all_table_data[i])
+              }
+              this.all_patient = this.patientTableData
+              break
+            case 2:
+              this.patientTableData = []
+              for (let i = 0; i < ChargePatient.length; i++) {
+                  this.patientTableData.push(ChargePatient[i])
+              }
+              break
+          }
+          console.log("111122222")
+          console.log(this.patientTableData)
+
+          this.cal_one = one_count
+          this.cal_two = two_count
+          this.current_index = 0
+          if(this.patientTableData.length > 0){
+           this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          }
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
         }
       })
     },
+
     setMonthPrescription(month_prescriptions) {
       let big_prescriptions = []
       for (let i = 0; i < this.unique_three(month_prescriptions).length; i++) {
@@ -4818,14 +4931,17 @@ export default {
       this.month_prescriptions = []
       this.big_prescriptions = []
       this.big_month_prescriptions = []
-
-      this.getPatientInformation(val.id, val.order_number, val.his_patient_id, val.order_id)
-      this.patient_id = val.id
-
-      for (let i = 0; i < this.patientTableData.length; i++) {
-        if (this.patientTableData[i].his_patient_id == val.his_patient_id) {
-          this.current_index = i
+      if(val != null) {
+        this.getPatientInformation(val.id, val.order_number, val.his_patient_id, val.order_id)
+        this.patient_id = val.id
+        for (let i = 0; i < this.patientTableData.length; i++) {
+          if (this.patientTableData[i].his_patient_id == val.his_patient_id) {
+            this.current_index = i
+          }
         }
+      }else{
+        this.loading = false
+
       }
     },
     // 获取患者的基本信息

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -256,20 +256,26 @@ export default{
       }
     },
     getAge(patient) {
-      var thisLen = patient.id_card_no.length;
-      var birth = "";
-      if (thisLen == 15) {
-        birth = "19" + patient.id_card_no.substr(6, 6);
-      } else {
-        birth = patient.id_card_no.substr(6, 8);
+      if(patient.id_card_no == "TWN001836483"){
+        return patient.age
+      }else{
+        var thisLen = patient.id_card_no.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + patient.id_card_no.substr(6, 6);
+        } else {
+          birth = patient.id_card_no.substr(6, 8);
+        }
+        var births =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+        return jsGetAge(births, "-");
+
       }
-      var births =
-        birth.substr(0, 4) +
-        "-" +
-        birth.substr(4, 2) +
-        "-" +
-        birth.substr(6, 2);
-      return jsGetAge(births, "-");
+
     },
 
     getAllDoctorList() {