Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/his/his.js

@@ -482,3 +482,17 @@ export function preSettle(params) {
 
 
 
+export function getPrivateExpenses(params) {
+  return request({
+    url: "/api/privateexpenses/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+
+
+
+

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -3139,6 +3139,7 @@
         let paramsObj = {
           order_id: this.hisPatientInfo.id,
           patient_id: this.hisPatientInfo.patient_id,
+          record_time:this.record_date,
           name:this.hisPatientInfo.name,
           gend:this.hisPatientInfo.gend,
           setl_time:this.hisPatientInfo.out_hosptial_time

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -219,7 +219,7 @@
 
         form: {
           id: '',
-          settlement_value: '',
+          settlement_value: 1,
           medical_insurance_card: '',
           name: '',
           gender: '',
@@ -478,7 +478,7 @@
         this.visibility = true
         // this.form = Object.assign({}, this.resetForm)
         this.form.id = 0
-        this.form.settlement_value = ''
+        this.form.settlement_value = 1
         this.form.medical_insurance_card = ''
         this.form.name = ''
         this.form.gender = ''

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -173,10 +173,11 @@
 </template>
 
 <script>
-  import {uParseTime} from "@/utils/tools";
+  import {uParseTime,jsGetAge} from "@/utils/tools";
   import axios from 'axios'
   import {PostSearch} from '@/api/patient'
   import {getDictionaryDataConfig} from '@/utils/data'
+
   export default {
     name: 'registerDialog9504',
 
@@ -454,6 +455,23 @@
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
                 that.form.medical_insurance_card = response.data.data.health_card_no
+
+                var thisLen = that.form.id_card.length
+                var birth = ''
+                if (thisLen == 15) {
+                  birth = '19' + that.form.id_card.substr(6, 6)
+                } else {
+                  birth = that.form.id_card.substr(6, 8)
+                }
+                var births =
+                  birth.substr(0, 4) +
+                  '-' +
+                  birth.substr(4, 2) +
+                  '-' +
+                  birth.substr(6, 2)
+                that.form.age = jsGetAge(births, '-')
+
+
               } else if (that.form.id_card_type == 2) {
                 this.form.id = patient.id
                 that.form.name = patient.name
@@ -462,6 +480,21 @@
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
+
+                var thisLen = that.form.id_card.length
+                var birth = ''
+                if (thisLen == 15) {
+                  birth = '19' + that.form.id_card.substr(6, 6)
+                } else {
+                  birth = that.form.id_card.substr(6, 8)
+                }
+                var births =
+                  birth.substr(0, 4) +
+                  '-' +
+                  birth.substr(4, 2) +
+                  '-' +
+                  birth.substr(6, 2)
+                that.form.age = jsGetAge(births, '-')
               }
               that.$message({message: '读卡成功', type: 'success'})
 
@@ -489,6 +522,7 @@
         this.form.id_card_type = 1
         this.form.certificates = 1
         this.form.medical_care = 11
+        this.form.settlement_value = 1
 
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -28,6 +28,9 @@
   import { getDialysisRecord } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { jsGetAge, uParseTime } from '@/utils/tools'
+  import { getPrivateExpenses } from '@/api/his/his'
+
+
   import axios from 'axios'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import printOne from './newTreatTemplate/printOne'
@@ -110,113 +113,131 @@
 
       },
       getInfo(obj) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
-          var that = this;
-          axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
-            params: obj
-          })
-            .then(function (response) {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
-                return false
-              } else {
-                if (response.data.data.failed_code == -10) {
-                  // that.$message.error(response.data.data.msg)
-                  that.$confirm(response.data.data.msg, '医保错误信息', {
-                    confirmButtonText: '确 定',
-                    type: 'warning'
-                  }).then(() => {
-
-                  }).catch(() => {
-                  })
+        if (obj.balance_accounts_type == 2){
+          let params = {
+            his_patient_id: obj.his_patient_id,
+            id: obj.order_id,
 
-                } else {
-
-                  console.log("～～～～");
-                  that.info = response.data.data.result;
-                  console.log(that.info);
-
-                  that.info['patient_info']= response.data.data.patient_info
-                  that.info['dialysis_no'] = response.data.data.dialysis_no
-                  that.info['org_code'] = response.data.data.org_code;
-                  that.info['patient_name'] = response.data.data.patient_name;
-                  that.info['doctor_code'] = response.data.data.doctor_code;
-                  that.info['doctor_name'] = response.data.data.doctor_name;
-                  if(response.data.data.health_card_no_two.length == 0){
-                    that.info['health_card_no'] = response.data.data.health_card_no
-                  }else{
-                    that.info['health_card_no'] = response.data.data.health_card_no_two
-                  }
+          }
+          getPrivateExpenses(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
 
-                  that.info['order_number'] = response.data.data.order_number;
+              return false
+            } else {
+              console.log(response.data.data)
 
-                  that.info['department'] =  response.data.data.department;
-                  that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie;
+            }
+          })
 
-                  that.info['before_money'] =  response.data.data.before_money;
-                  that.info['after_money'] =   response.data.data.after_money;
 
-                  that.info['org_name'] = that.$store.getters.xt_user.org.org_name;
-                  console.log("～～～～" + that.info);
+        }else {
 
-                  var name_arr = [];
-                  var spec_arr = [];
-                  var count_arr = [];
-                  var price_arr = [];
-                  var total_arr = [];
-                  for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
-                    name_arr.push(that.info.transBody.outputlist1[i].ake006);
-                    spec_arr.push(that.info.transBody.outputlist1[i].aka074);
-                    count_arr.push(that.info.transBody.outputlist1[i].akc226);
-                    price_arr.push(that.info.transBody.outputlist1[i].akc225);
-                    total_arr.push(that.info.transBody.outputlist1[i].akc264)
-                  }
+          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+            var that = this;
+            axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
+              params: obj
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg);
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+
+                  } else {
+
+                    console.log("～～～～");
+                    that.info = response.data.data.result;
+                    console.log(that.info);
+
+                    that.info['patient_info'] = response.data.data.patient_info
+                    that.info['dialysis_no'] = response.data.data.dialysis_no
+                    that.info['org_code'] = response.data.data.org_code;
+                    that.info['patient_name'] = response.data.data.patient_name;
+                    that.info['doctor_code'] = response.data.data.doctor_code;
+                    that.info['doctor_name'] = response.data.data.doctor_name;
+                    if (response.data.data.health_card_no_two.length == 0) {
+                      that.info['health_card_no'] = response.data.data.health_card_no
+                    } else {
+                      that.info['health_card_no'] = response.data.data.health_card_no_two
+                    }
 
-                  console.log("～～～" + that.info);
+                    that.info['order_number'] = response.data.data.order_number;
 
-                  that.info['name_arr'] = name_arr;
-                  that.info['spec_arr'] = spec_arr;
-                  that.info['count_arr'] = count_arr;
-                  that.info['price_arr'] = price_arr;
-                  that.info['total_arr'] = total_arr;
-                  that.info['record_date'] = obj.record_time;
+                    that.info['department'] = response.data.data.department;
+                    that.info['yiliao_leibie'] = response.data.data.yiliao_leibie;
 
-                  console.log("～～" + that.info)
+                    that.info['before_money'] = response.data.data.before_money;
+                    that.info['after_money'] = response.data.data.after_money;
 
+                    that.info['org_name'] = that.$store.getters.xt_user.org.org_name;
+                    console.log("～～～～" + that.info);
 
-                  let type_arr = []
-                  for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
-                    type_arr.push(that.info.transBody.outputlist1[i].aka111)
-                  }
+                    var name_arr = [];
+                    var spec_arr = [];
+                    var count_arr = [];
+                    var price_arr = [];
+                    var total_arr = [];
+                    for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
+                      name_arr.push(that.info.transBody.outputlist1[i].ake006);
+                      spec_arr.push(that.info.transBody.outputlist1[i].aka074);
+                      count_arr.push(that.info.transBody.outputlist1[i].akc226);
+                      price_arr.push(that.info.transBody.outputlist1[i].akc225);
+                      total_arr.push(that.info.transBody.outputlist1[i].akc264)
+                    }
 
+                    console.log("～～～" + that.info);
 
-                  let  typeArr =  that.unique(type_arr)
+                    that.info['name_arr'] = name_arr;
+                    that.info['spec_arr'] = spec_arr;
+                    that.info['count_arr'] = count_arr;
+                    that.info['price_arr'] = price_arr;
+                    that.info['total_arr'] = total_arr;
+                    that.info['record_date'] = obj.record_time;
 
-                  that.info['new_detail_list'] = []
+                    console.log("～～" + that.info)
 
-                  for(let i = 0; i <  typeArr.length; i++){
-                    let obj = {
-                      aka111:typeArr[i],
-                      details:[],
-                      total:0
+                    let type_arr = []
+                    for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
+                      type_arr.push(that.info.transBody.outputlist1[i].aka111)
                     }
 
-                    for(let b = 0; b < that.info.transBody.outputlist1.length;b++){
-                        if(typeArr[i] == that.info.transBody.outputlist1[b].aka111){
+                    let typeArr = that.unique(type_arr)
+
+                    that.info['new_detail_list'] = []
+
+                    for (let i = 0; i < typeArr.length; i++) {
+                      let obj = {
+                        aka111: typeArr[i],
+                        details: [],
+                        total: 0
+                      }
+
+                      for (let b = 0; b < that.info.transBody.outputlist1.length; b++) {
+                        if (typeArr[i] == that.info.transBody.outputlist1[b].aka111) {
                           obj.details.push(that.info.transBody.outputlist1[b])
                           obj.total += that.info.transBody.outputlist1[b].akc264
                         }
+                      }
+                      that.info.new_detail_list.push(obj)
                     }
-                    that.info.new_detail_list.push(obj)
-                  }
-
 
+                  }
                 }
-              }
-            })
-            .catch(function (error) {
+              })
+              .catch(function(error) {
 
-            });
+              });
+          }
         }
       }, unique(array) {
 

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -19,7 +19,7 @@
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
-            <div class="min-height:300px;">
+            <div style="min-height: 300px;">
               <table border='1' style="width:100%;" cellspacing="0">
                   <tr>
                       <td width="70">类别</td>
@@ -41,7 +41,7 @@
                         <td>{{subItem.akc226}}</td>
                         <td>{{subItem.akc225}}</td>
                         <td>{{ subItem.akc264}}</td>
-                        <td :colspan="item.details.length" v-if="index == 0">{{ item.total }}</td>
+                        <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
                       </tr>
                   </div>
                   <tr>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2494,6 +2494,40 @@
 
       comfirm() {
 
+        // if(this.curStatus == 1  && this.rightTab == 2){
+        //   for(let i = 0; i < this.curDrugs.length; i++){
+        //     if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
+        //
+        //       if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
+        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+        //         return
+        //       }
+        //
+        //       if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
+        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+        //         return
+        //       }
+        //
+        //
+        //     }else{
+        //
+        //       if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
+        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+        //         return
+        //       }
+        //
+        //       if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
+        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+        //         return
+        //       }
+        //
+        //
+        //
+        //     }
+        //
+        //   }
+        // }
+
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
         //   this.teamList = []

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1216,6 +1216,39 @@
         //   this.$refs.multipleTable.clearSelection()
         //   return
         // }
+        // if(this.curStatus == 1  && this.rightTab == 2){
+        //   for(let i = 0; i < this.curDrugs.length; i++){
+        //     if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
+        //
+        //       if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
+        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+        //         return
+        //       }
+        //
+        //       if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
+        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+        //         return
+        //       }
+        //
+        //
+        //     }else{
+        //
+        //       if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
+        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+        //         return
+        //       }
+        //
+        //       if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
+        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+        //         return
+        //       }
+        //
+        //
+        //
+        //     }
+        //
+        //   }
+        // }
 
         if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')