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_hospital.js

@@ -0,0 +1,12 @@
+import request from "@/utils/request";
+
+
+
+export function upLoadChargeInfo(params) {
+  return request({
+    url: "/api/hospital/upload",
+    method: "get",
+    params:params
+  });
+}
+

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -6,19 +6,19 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
 
-                <el-date-picker
-                    v-model="record_date"
-                    prefix-icon="el-icon-date"
-                    @change="changeTimeTwo"
-                    :editable="false"
-                    style="width: 100%;"
-                    type="date"
-                    :picker-options="pickerOptions"
-                    placeholder="选择开始时间"
-                    align="right"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd">
-                </el-date-picker>
+        <el-date-picker
+            v-model="record_date"
+            prefix-icon="el-icon-date"
+            @change="changeTimeTwo"
+            :editable="false"
+            style="width: 100%;"
+            type="date"
+            :picker-options="pickerOptions"
+            placeholder="选择开始时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd">
+        </el-date-picker>
 
         <div class="mainCell">
           <el-radio-group v-model="schedule_type" @change="changeScheduleType">
@@ -158,12 +158,17 @@
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
-                    <span v-if="this.radio == 2">处方总价：<span style="color:red;">{{all_total+'元' + ' = 全自费总金额:'+fulamt_ownpay_amt + '元+'  + '超限价总金额:' + overlmt_amt  + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' +  inscp_scp_amt + '元'   }}</span></span>
-                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{all_total }}元</span></span>
+                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type != 2">处方总价：<span style="color:red;">{{
+                        all_total + '元' + ' = 全自费总金额:' + fulamt_ownpay_amt + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'
+                      }}</span></span>
+                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type == 2">处方总价：<span style="color:red;">{{
+                        all_total + '元' + ' = 全自费总金额:' + all_total + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'
+                      }}</span></span>
+                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{ all_total }}元</span></span>
 
                     <!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
+                    <!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
+                    <!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
                   </div>
                 </div>
                 <!--                <div class="centerRight">-->
@@ -326,6 +331,8 @@ import charged from './components/charged'
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
 import additionalCharges from './components/additionalCharges'
 import { getHisHospitalDetailInfo, getHisHospitalDetailList, getMonthHisHospitalDetailInfo } from '@/api/his/his'
+import { upLoadChargeInfo } from '@/api/his/his_hospital'
+
 import { uParseTime } from '@/utils/tools'
 
 import RegisterDialog from './components/registerDialog'
@@ -416,8 +423,8 @@ export default {
       settle_prescriptions: [],
 
       settle_total: 0,
-      all_total:0,
-      all_month_total:0,
+      all_total: 0,
+      all_month_total: 0,
       record_date: '',
       tableData: [],
       editableTabsValue: '处方1',
@@ -464,10 +471,10 @@ export default {
       department: [],
       invoiceVisible: false,
       invoiceParams: {},
-      fulamt_ownpay_amt:'',
-      overlmt_amt:'',
-      preselfpay_amt:'',
-      inscp_scp_amt:'',
+      fulamt_ownpay_amt: '',
+      overlmt_amt: '',
+      preselfpay_amt: '',
+      inscp_scp_amt: ''
     }
   },
   created() {
@@ -589,7 +596,7 @@ export default {
           case 2:
             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 ){
+              if (this.all_table_data[i].name.indexOf(this.search_input) != -1) {
                 arr2 = arr2.concat(this.all_table_data[i])
               }
             }
@@ -863,7 +870,7 @@ export default {
           params['settle_accounts_type'] = 2
 
         }
-        if (this.hisPatientInfo.balance_accounts_type != 2){
+        if (this.hisPatientInfo.balance_accounts_type != 2) {
           axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
             params: params
           })
@@ -891,12 +898,40 @@ export default {
               })
               .catch(function(error) {
               })
-        }else  if (this.hisPatientInfo.balance_accounts_type == 2){
+        } else if (this.hisPatientInfo.balance_accounts_type == 2) {
+          var that = this
+          let params = {
+            'in_hospital_id': that.hisPatientInfo.id,
+            'id': that.hisPatientInfo.patient_id,
+            'admin_user_id': that.$store.getters.xt_user.user.id,
+            'record_time': that.record_date
+
+          }
+          if (this.activeName == 'first') {
+            params['settle_accounts_type'] = 1
+
+          } else {
+            params['start_time'] = that.other_start_time
+            params['end_time'] = that.other_end_time
+            params['settle_accounts_type'] = 2
+
+          }
+          upLoadChargeInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.loading = false
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              that.$message.success('上传明细成功')
+              that.radio = 2
+              that.changePatientInfo()
+            }
+          })
 
 
         }
       }
-    },changePatientInfo(){
+    }, changePatientInfo() {
       let params = {
         'record_date': this.record_date,
         'sch_type': this.schedule_type
@@ -925,7 +960,7 @@ export default {
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              if (this.hisPatientInfo.id > 0){
+              if (this.hisPatientInfo.id > 0) {
                 for (let i = 0; i < this.patientTableData.length; i++) {
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
                     this.current_index = i
@@ -934,7 +969,7 @@ export default {
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
@@ -943,8 +978,7 @@ export default {
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
 
-
-              if (this.hisPatientInfo.id > 0){
+              if (this.hisPatientInfo.id > 0) {
                 for (let i = 0; i < this.patientTableData.length; i++) {
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
                     this.current_index = i
@@ -953,7 +987,7 @@ export default {
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
@@ -1017,7 +1051,7 @@ export default {
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
@@ -1034,7 +1068,7 @@ export default {
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
@@ -1262,7 +1296,7 @@ export default {
                 overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
                 inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
-                execution_state: prescription.advices[b].execution_state,
+                execution_state: prescription.advices[b].execution_state
 
               }
               tempAdvice.push(obj)
@@ -1289,8 +1323,7 @@ export default {
                 overlmt_amt: prescription.project[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
                 inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
-                execution_state: prescription.project[b].execution_state,
-
+                execution_state: prescription.project[b].execution_state
 
               }
 
@@ -1353,10 +1386,9 @@ export default {
           this.preselfpay_amt = this.getPreselfpayAmtTotal()
           this.inscp_scp_amt = this.getInscpScpAmtTotal()
 
-
         }
       })
-    },getFulamtOwnpayAmtTotal(){
+    }, getFulamtOwnpayAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
@@ -1374,7 +1406,7 @@ export default {
       }
       return total.toFixed(2)
 
-    },getOverlmtAmtTotal(){
+    }, getOverlmtAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
@@ -1392,7 +1424,7 @@ export default {
       }
       return total.toFixed(2)
 
-    },getPreselfpayAmtTotal(){
+    }, getPreselfpayAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
@@ -1410,7 +1442,7 @@ export default {
       }
       return total.toFixed(2)
 
-    },getInscpScpAmtTotal(){
+    }, getInscpScpAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -732,7 +732,7 @@
         width="30%"
     >
       <span>是否修改医疗类型</span>
-      <el-select v-if="this.$store.getters.xt_user.org_id == 10188" style="width:50%;" v-model="temp_med_type"
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217" style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             v-for="(item,index) in registerThree"
@@ -742,7 +742,7 @@
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10188" style="width:50%;" v-model="temp_med_type"
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             v-for="(item,index) in register"

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,9 +1,8 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="info.fixmedins_code == 'H32092103007'">江苏省社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="info.fixmedins_code == 'H42138100547'">广水源生堂社会医疗保险医疗费用结算单</div>
-
-    <div class="statementTitle" v-else>广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -58,7 +58,7 @@
               <el-table-column align="center" prop="name" width="60" label="总价">
                 <template slot-scope="scope">
                   <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                  {{scope.row.price.toFixed(2)}}元
+                  {{(scope.row.count * scope.row.price).toFixed(2)}}元
 
                 </template>
               </el-table-column>