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

src/api/his/his.js

@@ -365,6 +365,16 @@ export function getRecordList (params) {
 
 
 
+export function getCheckAccountFormData (params) {
+  return request({
+    url: '/api/comparedata/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
 
 
 

src/xt_pages/dialysis/components/consumables.vue

@@ -160,7 +160,9 @@
       this.query.page = 1
       this.GetDialysisgoods()
     },
-    methods: { handleSizeChange(val) {
+    methods: {
+
+      handleSizeChange(val) {
         this.query.limit = val;
         this.GetDialysisgoods();
       },
@@ -180,7 +182,7 @@
 
       },
       getGoodUserInfo(good_type_id,good_user,last_good_user) {
-        var arrlist =[] 
+        var arrlist =[]
         if (good_user != null && good_user.length > 0) {
           let desc = ""
           for (let b = 0; b < good_user.length; b++){
@@ -191,7 +193,7 @@
           return desc
         }
         return ""
-       
+
         // else if (good_user != null && good_user.length <= 0) {
         //   if (last_good_user != null && last_good_user.length > 0) {
         //     let desc = ""
@@ -213,7 +215,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-           
+
             this.list = []
             this.good_types = []
             this.allGoodInfo = []
@@ -233,9 +235,9 @@
             }
 
             this.arrKey.push(...arr)
-          
+
             this.allGoodInfo = res.data.dialysis_goods
-           
+
             for(let i = 0; i < res.data.dialysis_goods.length; i++){
               let arr =[]
               let obj = {
@@ -276,15 +278,15 @@
 
               }
             }
-           
+
           //  console.log("99999999",this.list)
-           let a = [] 
+           let a = []
           this.list.map(item => {
             a.push(item.good_type)
           })
           // console.log('aaaaaaaaa',a)
           let b = []
-       
+
           a.map(item => {
             let obj = []
             item.map((it,index) => {
@@ -293,9 +295,9 @@
               let str = 'name' + index
               c[str] = it.name
               obj.push(c)
-              
+
             })
-            
+
             b.push(obj)
           })
           var temp = []
@@ -304,7 +306,7 @@
             var objC = {...b[i]}
             temp.push(objC)
           }
-       
+
           // console.log("temp--------",temp)
           var tempTwo = []
           temp.map(item => {
@@ -314,18 +316,18 @@
             })
             let obj2 = {}
             obj.map((i,ind) => {
-            
+
               let str = 'name' + ind
               obj2[str] = i[str]
             })
             tempTwo.push(obj2)
             console.log(325556574342354234234,tempTwo)
           })
-          
+
           this.arrList.push(...tempTwo)
           console.log("cccccccc",this.arrList)
           }
-        })  
+        })
       },
       selectSchedulType(scheduleType) {
         this.schedulType = scheduleType
@@ -368,9 +370,9 @@
 
        exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         
-        
-       
+
+
+
          var arrTwo = []
          for(let i=0;i<this.arrKey.length;i++){
             arrTwo.push('name'+i)
@@ -385,7 +387,7 @@
          console.log("33333",this.arrList)
          const data = this.formatJson(filterVal,this.arrList)
          console.log("data",data)
-      
+
          excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -495,7 +495,7 @@ export default {
             console.log("列表数据",schedules)
             var config = resp.data.config
             console.log("config222222",config.is_open)
-           if(config.is_open == 0){
+           if(config.is_open == 0 || config.is_open == 2){
             this.show = true
             this.showOne = false
             let arr = []
@@ -539,6 +539,7 @@ export default {
                 })
                 this.scheduleMap = a
             }
+            console.log("列表22222",this.scheduleMap)
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
@@ -554,7 +555,7 @@ export default {
             })
             this.indexInfoList = newArr
            }
-           if(config.is_open == 1 || config.is_open == 2){
+           if(config.is_open == 1){
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
@@ -599,6 +600,7 @@ export default {
                 })
                 this.scheduleMap = a
             }
+            console.log('333333344444',this.scheduleMap)
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
@@ -615,7 +617,7 @@ export default {
             this.indexInfoList = newArr
            }
          }
-         console.log("列表22222",this.scheduleMap)
+        //  console.log("列表22222",this.scheduleMap)
         })
     },
     getValue: function(val) {

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -484,6 +484,8 @@
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id
         this.form.diagnosis = this.diagnoses[0].id
+        this.form.id_card_type = 2
+        this.form.certificates = 1
 
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
@@ -493,7 +495,6 @@
         // this.form.birthday = patientInfo.birthday
         // this.form.id_card = patientInfo.id_card_no
         // this.form.social_type = patientInfo.health_care_type
-        // this.form.id_card_type = 1
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
         // }

src/xt_pages/outpatientCharges/costComparison.vue

@@ -1,140 +1,219 @@
 <template>
-  <div class="main-contain incomeStatistics">
-    <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-        <div>
-          <el-input size="small" style="width:150px;" v-model="keywords"
-                    class="filter-item"/>
-          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
-            搜索
-          </el-button>
+    <div class="main-contain incomeStatistics">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <el-button size="small" type="primary" @click="dialogFormVisible = true" >医保对账</el-button>
-      </div>
-      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-        <el-table-column
-          prop="date"
-          label="序号"
-          width="60"
-          align="center"
-          type="index"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="对账申请人">
-          <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="开始日期">
-          <template slot-scope="scope">{{getTimes(scope.row.start_time)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="结束日期">
-          <template slot-scope="scope">{{getTimes(scope.row.end_time)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="险种类型">
-          <template slot-scope="scope">
-            <div  v-if="scope.row.insutype == '310'">职工基本医疗保险</div>
-            <div  v-if="scope.row.insutype == '320'">公务员医疗补助</div>
-            <div  v-if="scope.row.insutype == '330'">大额医疗费用补助</div>
-            <div  v-if="scope.row.insutype == '340'">离休人员医疗保障</div>
-            <div  v-if="scope.row.insutype == '390'">城乡居民基本医疗保险</div>
-            <div  v-if="scope.row.insutype == '392'">城乡居民大病医疗保险</div>
-            <div  v-if="scope.row.insutype == '510'">生育保险</div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="对账类型">
-          <template slot-scope="scope">
-            <div  v-if="scope.row.check_type == 1">总账</div>
-            <div  v-if="scope.row.check_type == 2">明细</div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="结算笔数">
-          <template slot-scope="scope">{{scope.row.num}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="医疗费用总数">
-          <template slot-scope="scope">
-            {{scope.row.cost_total}}元
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" width="160" label="基本医疗基金总费用">
-          <template slot-scope="scope">
-            {{scope.row.func_total}}元
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="个人支付总费用">
-          <template slot-scope="scope">
-            {{scope.row.psn_pay}}元
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-
-      >
-      </el-pagination>
-      <el-dialog title="医保对账" :visible.sync="dialogFormVisible">
-        <el-form :model="form" label-width="100px">
-          <el-form-item label="时间" :label-width="formLabelWidth">
-            <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
-                            @change="handleStartTimeChange" :editable="false" :clearable="false"
-                            style="width: 200px;" type="date" placeholder="选择开始日期"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd"
-                            align="right"></el-date-picker>
-            -
-
-            <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
-                            @change="handleEndTimeChange" :editable="false" :clearable="false"
-                            style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd"
-                            align="right"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="险种类型" :label-width="formLabelWidth">
-            <el-select v-model=" insutype" placeholder="请选择" style="width: 200px;">
-              <el-option
-                v-for="item in insutypes"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="对账类型" :label-width="formLabelWidth">
-            <el-select v-model="check_type" placeholder="请选择" style="width: 200px;">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click="confirm">确 定</el-button>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <el-input size="small" style="width:130px;" v-model="keywords"
+                              class="filter-item"/>
+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                               @click="searchAction">
+                        搜索
+                    </el-button>
+                    <el-date-picker v-model="query_start_time" prefix-icon="el-icon-date"
+                                    @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                    style="width: 130px;" type="date" placeholder="选择开始日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+                    -
+
+                    <el-date-picker v-model="query_end_time" prefix-icon="el-icon-date"
+                                    @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                    style="width: 130px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+
+
+                    <label class="title">险种<span class="name"></span> : </label>
+                    <el-select v-model="query_insutype" style="width:140px;margin-right:10px;" placeholder="请选择"
+                               @change="changeInsutype">
+                        <el-option
+                                v-for="item in insutypes"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+
+
+                    <label class="title">清算类别<span class="name"></span> : </label>
+                    <el-select v-model="query_clr_type" style="width:100px;margin-right:10px;" placeholder="请选择"
+                               @change="changeClrType">
+                        <el-option
+                                v-for="item in clrOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+
+                </div>
+
+            </div>
+            <div style="float: right;margin-bottom: 10px">
+                <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
+                <el-button size="small" type="primary" @click="getFormData">下载对账报表</el-button>
+            </div>
+
+
+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row
+                      @select="selectCostInfo"
+                      @selection-change="changeCostInfoTableData"
+                      @select-all="changeAllCostInfoTableData"
+                      row-key="row_key"
+                      ref="multipleTable"
+            >
+                <el-table-column
+                        align="center"
+                        type="selection"
+                        width="55"
+                ></el-table-column>
+                <el-table-column
+                        prop="date"
+                        label="序号"
+                        width="60"
+                        align="center"
+                        type="index"
+                >
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="对账结果">
+                    <template slot-scope="scope">{{'平'}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="操作机构">
+                    <!--<template slot-scope="scope">{{// this.$store.getters.xt_user.org.org_name}}</template>-->
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="对账申请人">
+                    <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="开始时间">
+                    <template slot-scope="scope">{{getTimes(scope.row.start_time)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="结束时间">
+                    <template slot-scope="scope">{{getTimes(scope.row.end_time)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="险种类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.insutype == '310'">职工基本医疗保险</div>
+                        <div v-if="scope.row.insutype == '320'">公务员医疗补助</div>
+                        <div v-if="scope.row.insutype == '330'">大额医疗费用补助</div>
+                        <div v-if="scope.row.insutype == '340'">离休人员医疗保障</div>
+                        <div v-if="scope.row.insutype == '390'">城乡居民基本医疗保险</div>
+                        <div v-if="scope.row.insutype == '392'">城乡居民大病医疗保险</div>
+                        <div v-if="scope.row.insutype == '510'">生育保险</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="对账类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.check_type == 1">总账</div>
+                        <div v-if="scope.row.check_type == 2">明细</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="清算经办机构">
+                    <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构医疗费总额(元)">
+                    <template slot-scope="scope">{{scope.row.setl_optins}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心医疗费总额(元)">
+                    <template slot-scope="scope">{{scope.row.cost_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构基金总额(元)">
+                    <template slot-scope="scope">{{scope.row.cost_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心基金总额(元)">
+                    <template slot-scope="scope">{{scope.row.func_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构个人账号总额(元)">
+                    <template slot-scope="scope">{{scope.row.func_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心个人账号总额(元)">
+                    <template slot-scope="scope">{{scope.row.psn_pay}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构结算笔数">
+                    <template slot-scope="scope">{{scope.row.psn_pay}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心结算笔数">
+                    <template slot-scope="scope">{{scope.row.num}}</template>
+                </el-table-column>
+
+            </el-table>
+            <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :page-sizes="[10, 50, 100]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;float: right"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+            >
+            </el-pagination>
+            <el-dialog title="医保对账" :visible.sync="dialogFormVisible">
+                <el-form :model="form" label-width="100px">
+                    <el-form-item label="时间" label-width="100px">
+                        <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
+                                        @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                        style="width: 200px;" type="date" placeholder="选择开始日期"
+                                        format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd"
+                                        align="right"></el-date-picker>
+                        -
+
+                        <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
+                                        @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                        style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                                        format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd"
+                                        align="right"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="险种类型" :label-width="formLabelWidth">
+                        <el-select v-model="insutype" placeholder="请选择" style="width: 200px;">
+                            <el-option
+                                    v-for="item in insutypes"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="对账类型" :label-width="formLabelWidth">
+                        <el-select v-model="check_type" placeholder="请选择" style="width: 200px;">
+                            <el-option
+                                    v-for="item in options"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button @click="dialogFormVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="confirm">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
 
 
-  </div>
+    </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, getList } from '@/api/his/his'
+  import {
+    getCheckAccountFormData,
+    getDoctorList,
+    getExportConsumeDetailList,
+    getHisOrderList,
+    getList
+  } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
@@ -145,6 +224,7 @@
     },
     data() {
       return {
+        form: {},
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '医保费用对照' }
@@ -155,65 +235,207 @@
         dialogFormVisible: false,
         total: 0,
         adminUserOptions: [],
-        start_time:"",
-        end_time:"",
-        insutype:"",
-        check_type:"",
-
-        options:[
+        start_time: '',
+        end_time: '',
+        insutype: '',
+        check_type: '',
+        keywords: '',
+        query_start_time: '',
+        query_end_time: '',
+        selection:[],
+        query_insutype: '',
+        query_clr_type: '',
+        fromData: [],
+        options: [
           {
-            value:1,
-            label:"总账",
-          },  {
-            value:2,
-            label:"明细",
-          },
+            value: 1,
+            label: '总账'
+          }, {
+            value: 2,
+            label: '明细'
+          }
         ],
-
-        insutypes:[
+        clrOptions: [
           {
-            value:"310",
-            label:"职工基本医疗保险",
-          },  {
-            value:"320",
-            label:"公务员医疗补助",
-          },  {
-            value:"330",
-            label:"大额医疗费用补助",
-          },  {
-            value:"340",
-            label:"离休人员医疗保障",
+            value: '11',
+            label: '门诊'
+          }, {
+            value: '21',
+            label: '住院'
+          }, {
+            value: '41',
+            label: '药店购药'
+          }, {
+            value: '99',
+            label: '其他'
+          }
+        ],
+        insutypes: [
+          {
+            value: '310',
+            label: '职工基本医疗保险'
+          }, {
+            value: '320',
+            label: '公务员医疗补助'
+          }, {
+            value: '330',
+            label: '大额医疗费用补助'
+          }, {
+            value: '340',
+            label: '离休人员医疗保障'
           },
           {
-            value:"390",
-            label:"城乡居民基本医疗保险",
+            value: '390',
+            label: '城乡居民基本医疗保险'
           }, {
-            value:"392",
-            label:"城乡居民大病医疗保险",
+            value: '392',
+            label: '城乡居民大病医疗保险'
           }, {
-            value:"510",
-            label:"生育保险",
+            value: '510',
+            label: '生育保险'
           }
 
-
+          // 1617724800
 
         ]
 
       }
     },
     methods: {
-      confirm(){
-        if(this.check_type == 1){
+      changeInsutype() {
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': this.query_insutype,
+          'clr_type': "11",
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time,
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      }, changeClrType(val) {
+        if (val != "11"){
+          this.tableData = []
+          this.total = 0
+        }else{
+          let params = {
+            'page': 1,
+            'limit': 10,
+            'keywords': this.keywords,
+            'insutype': this.query_insutype,
+            'clr_type': "11",
+            'start_time': this.query_start_time,
+            'end_time': this.query_end_time,
+          }
+          this.tableData = []
+          getList(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.tableData = response.data.data.list
+              this.total = response.data.data.total
+            }
+          })
+        }
+      },
+      handleStartTimeChange() {
+
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': "",
+          'clr_type': "11",
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time,
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      }, handleEndTimeChange() {
+
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': "",
+          'clr_type': "11",
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time,
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      },
+
+      searchAction() {
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': "",
+          'clr_type': "11",
+          'start_time': "",
+          'end_time': "",
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      },
+      selectCostInfo(selection, row) {
+        this.selection = selection
+
+      }, changeCostInfoTableData(val) {
+        this.selection = val
+      }, changeAllCostInfoTableData(selection) {
+        this.selection = selection
+
+
+      }, confirm() {
+        if (this.check_type == 1) {
           let params = {
             start_time: this.start_time,
             end_time: this.end_time,
             insutype: this.insutype,
             clr_type: '11'
           }
-
           var that = this
-
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -222,11 +444,32 @@
                   that.$message.error(response.data.msg)
                   return false
                 } else {
-                  this.page =1
-                  this.limit = 10
-                  this.keywords = ""
-                  this.getList()
+                  var result_desc = ''
+
+                  if (response.data.data.stmt_rslt == 0) {
+                    result_desc = '对账平'
+                  } else if (response.data.data.stmt_rslt == 1) {
+                    result_desc = '中心多' + '\n' + response.data.data.stmt_rslt_dscr
+
+                  } else if (response.data.data.stmt_rslt == 2) {
+                    result_desc = '机构多' + '\n' + response.data.data.stmt_rslt_dscr
+                  }
+
+                  that.$alert(result_desc, '对账结果', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                      this.dialogFormVisible = false
+                    }
+                  })
 
+                  that.page = 1
+                  that.limit = 10
+                  that.keywords = ''
+                  that.query_start_time = ''
+                  that.query_end_time = ''
+                  that.query_insutype = ''
+                  that.query_clr_type = ''
+                  that.getList()
                 }
               })
               .catch(function(error) {
@@ -235,10 +478,10 @@
 
           }
 
-        }else {
+        } else {
           let params = {
             start_time: this.start_time,
-            end_time: this.end_time,
+            end_time: this.end_time
           }
           var that = this
           axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {
@@ -249,20 +492,16 @@
                 that.$message.error(response.data.msg)
                 return false
               } else {
-                this.page =1
+                this.page = 1
                 this.limit = 10
-                this.keywords = ""
+                this.keywords = ''
                 this.getList()
               }
             })
             .catch(function(error) {
 
             })
-
-
         }
-
-
       },
       getInsutype(type) {
 
@@ -290,8 +529,11 @@
         let params = {
           'page': this.page,
           'limit': this.limit,
-          'keywords': this.keywords
-
+          'keywords': this.keywords,
+          'insutype': this.query_insutype,
+          'clr_type': this.query_clr_type,
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time
         }
         this.tableData = []
         getList(params).then(response => {
@@ -313,6 +555,65 @@
         this.page = page
         this.getList()
 
+      }, getFormData() {
+        if (this.selection.length == 0) {
+          this.$message.error('请选择要下载的对账记录')
+          return
+        }
+
+        let params = {
+          'start_time': this.getTimes(this.selection[0].start_time),
+          'end_time': this.getTimes(this.selection[0].end_time),
+          'insutype': this.selection[0].insutype
+        }
+        getCheckAccountFormData(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.fromData = response.data.data.list
+            var list = []
+
+            for (let i = 0; i < this.fromData.length; i++) {
+              let obj = {
+                '结算金额': this.fromData[i].medfee_sumamt,
+                '姓名': this.fromData[i].psn_name,
+                '身份证': this.fromData[i].id_card_no,
+                '个人编号': this.fromData[i].psn_no,
+                '门诊流水号': this.fromData[i].mdtrt_id,
+                '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                '起付线': this.fromData[i].act_pay_dedc,
+                '统筹基金': this.fromData[i].fund_pay_sumamt,
+                '个人支付': this.fromData[i].psn_cash_pay,
+                '个账支付': this.fromData[i].acct_pay,
+                '现金支付': this.fromData[i].cash_pay,
+                '总费用': this.fromData[i].sumamt,
+                '冲销标志': '已结算'
+              }
+              list.push(obj)
+            }
+            var insutype_name = ''
+            if (this.query_insutype == '310') {
+              insutype_name = '职工基本医疗保险'
+            } else if (this.query_insutype == '390') {
+              insutype_name = '城乡居民基本医疗保险'
+            }
+
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+              const filterVal = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+              })
+            })
+          }
+        })
+
+      }, formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
       }
     },
     created() {

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -51,18 +51,27 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope">{{ scope.row.selt_time }}</template>
         </el-table-column>
+
+
         <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+          <template slot-scope="scope">{{ scope.row.psn_name }}</template>
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
           <!--<template slot-scope="scope"></template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" prop="name" label="应收金额">
+        <el-table-column align="center" prop="name" label="总金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
+
+        <el-table-column align="center" prop="name" label="总金额">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+
+
+
         <el-table-column align="center" prop="name" label="实收金额">
           <template slot-scope="scope">{{scope.row.reality_price}}</template>
         </el-table-column>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2251,10 +2251,6 @@
       comfirm() {
         console.log("222222222222",this.curPrescriptions)
 
-        if (this.dayorMonth == 'month') {
-          this.$message.error('月结状态下，无法添加药品或者项目')
-          return
-        }
 
         if (this.curPrescriptions.order_status == 2) {
           this.$message.error('该处方已经结算，无法继续添加药品或者项目')

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -982,7 +982,11 @@
                 this.doctors = response.data.data.doctors
                 this.department = response.data.data.department
 
-
+                for (let i = 0; i < this.doctors.length; i++){
+                  if(this.doctors[i].user_type == 1){
+                    this.doctors.splice(i,1)
+                  }
+                }
 
                 this.case_history = case_history
                 this.info = response.data.data.info
@@ -1154,7 +1158,11 @@
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
 
-
+              for (let i = 0; i < this.doctors.length; i++){
+                if(this.doctors[i].user_type == 1){
+                  this.doctors.splice(i,1)
+                }
+              }
               this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
               if (this.case_history.breathing <= 0) {
                 this.case_history.breathing = ""

src/xt_pages/outpatientRegistration/index.vue

@@ -178,7 +178,9 @@
                         <el-input v-model.number="total" readonly></el-input>
                     </el-form-item>
                 </el-form>
-                <el-button style="float:right" v-loading="loadingone" @click="saveHisPatient9504('form')" type="primary">挂号</el-button>
+                <el-button style="float:right" v-loading="loadingone" @click="saveHisPatient9504('form')"
+                           type="primary">挂号
+                </el-button>
             </div>
 
         </div>
@@ -408,7 +410,7 @@
                         <!-- <el-input v-model="form.name"></el-input> -->
                     </el-form-item>
                 </el-form>
-                <el-button style="float:right" @click="saveHisPatient('form')" type="primary">挂号</el-button>
+                <el-button style="float:right" @click="saveHisPatient('form')" v-loading="loadingone" type="primary">挂号</el-button>
             </div>
 
         </div>
@@ -427,7 +429,7 @@
     saveHisPatient
   } from '@/api/project/project'
   import { getDictionaryDataConfig } from '@/utils/data'
-  import { uParseTime,jsGetAge } from '@/utils/tools'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import { getInitData } from '@/api/his/his'
   import axios from 'axios'
 
@@ -438,6 +440,7 @@
     },
     data() {
       return {
+        loadingone: false,
         read_loading: false,
         registers: [
           { value: 11, label: '普通门诊' },
@@ -479,7 +482,7 @@
           total: '',
           phone: '',
           social_type: '',
-          id_card_type: 1
+          id_card_type: 2
 
         },
         medical_care: [
@@ -656,20 +659,20 @@
         this.form.phone = val.phone
         this.form.idCard = val.id_card_no
 
-        var thisLen =  this.form.idCard.length;
-        var birth = "";
+        var thisLen = this.form.idCard.length
+        var birth = ''
         if (thisLen == 15) {
-          birth = "19" + this.form.idCard.substr(6, 6);
+          birth = '19' + this.form.idCard.substr(6, 6)
         } else {
-          birth = this.form.idCard.substr(6, 8);
+          birth = this.form.idCard.substr(6, 8)
         }
         var births =
           birth.substr(0, 4) +
-          "-" +
+          '-' +
           birth.substr(4, 2) +
-          "-" +
-          birth.substr(6, 2);
-        this.form.age = jsGetAge(births, "-");
+          '-' +
+          birth.substr(6, 2)
+        this.form.age = jsGetAge(births, '-')
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -915,7 +918,6 @@
           return
         }
 
-
         this.$refs[formName].validate((valid) => {
           if (valid) {
             var params = {
@@ -966,16 +968,39 @@
                       that.$message.error(response.data.data.msg)
                     } else {
                       that.$message({ message: '挂号成功', type: 'success' })
-                      that.getPatientList()
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
                       that.loadingone = false
 
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
+
                     }
                   }
                 })
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -991,14 +1016,36 @@
                     that.$refs.register.hide()
                     return false
                   } else {
+                    that.loadingone = false
+
                     if (response.data.data.failed_code == -10) {
                       that.$message.error(response.data.data.msg)
                       return
                     } else {
-                      that.$refs.register.hide()
-                      that.getPatientList()
                       that.$message({ message: '挂号成功', type: 'success' })
-                      that.loadingone = false
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
                     }
                     // var his_info = response.data.data.his_info
                     // that.hisPatientInfo = his_info
@@ -1012,26 +1059,32 @@
                 if (response.data.state == 1) {
                   var patient = response.data.data.patient
                   this.getTodaySchedulePatient()
-                  this.$message.success('保存成功')
-                  this.form.settlementValue = '',
-                    this.form.medicalInsuranceCard = '',
-                    this.form.name = '',
-                    this.form.sex = '',
-                    this.form.certificates = '',
-                    this.form.medicalCare = '',
-                    this.form.birthday = '',
-                    this.form.age = '',
-                    this.form.idCard = '',
-                    this.form.register = '',
-                    this.form.doctor = '',
-                    this.form.department = '',
-                    this.form.costChecked = false,
-                    this.form.registrationFee = '',
-                    this.form.medicalExpenses = '',
-                    this.form.cost = '',
-                    this.form.total = '' ,
-                    this.form.phone = '',
-                    this.form.social_type = ''
+                  that.$message({ message: '挂号成功', type: 'success' })
+                  that.form.settlementValue = ''
+                  that.form.medicalInsuranceCard = ''
+                  that.form.name = ''
+                  that.form.sex = ''
+                  that.form.certificates = ''
+                  that.form.medicalCare = ''
+                  that.form.birthday = ''
+                  that.form.age = ''
+                  that.form.idCard = ''
+                  that.form.register = ''
+                  that.form.doctor = ''
+                  that.form.department = ''
+                  that.form.costChecked = false
+                  that.form.registrationFee = ''
+                  that.form.medicalExpenses = ''
+                  that.form.cost = ''
+                  that.form.total = ''
+                  that.form.phone = ''
+                  that.form.social_type = ''
+                  that.loadingone = false
+
+                  that.form.p_type = 14
+                  that.form.sick_type = that.sick[0].id
+                  that.form.diagnosis = that.diagnoses[0].id
+
                 } else {
                   this.$message.error('今日患者已挂号!')
                 }
@@ -1169,15 +1222,35 @@
                     that.$refs.register.hide()
                     return false
                   } else {
+                    that.loadingone = false
+
                     if (response.data.data.failed_code == -10) {
                       that.$message.error(response.data.data.msg)
                     } else {
-                      that.$refs.register.hide()
-                      that.getPatientList()
                       that.$message({ message: '挂号成功', type: 'success' })
-                      that.loadingone = false
-                      var his_info = response.data.data.his_info
-                      that.hisPatientInfo = his_info
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
 
                     }
 
@@ -1186,7 +1259,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1199,15 +1272,37 @@
                   if (response.data.state == 0) {
                     that.$message.error(response.data.msg)
                     that.loadingone = false
-                    that.$refs.register.hide()
                     return false
                   } else {
-                    that.$refs.register.hide()
-                    that.getPatientList()
-                    that.$message({ message: '挂号成功', type: 'success' })
                     that.loadingone = false
-                    var his_info = response.data.data.his_info
-                    that.hisPatientInfo = his_info
+                    if (response.data.data.failed_code == -10) {
+                      that.$message.error(response.data.data.msg)
+                    } else {
+                      that.$message({ message: '挂号成功', type: 'success' })
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
+                    }
                   }
                 })
                 .catch(function(error) {
@@ -1218,26 +1313,31 @@
                 if (response.data.state == 1) {
                   var patient = response.data.data.patient
                   this.getTodaySchedulePatient()
-                  this.$message.success('保存成功')
-                  this.form.settlementValue = '',
-                    this.form.medicalInsuranceCard = '',
-                    this.form.name = '',
-                    this.form.sex = '',
-                    this.form.certificates = '',
-                    this.form.medicalCare = '',
-                    this.form.birthday = '',
-                    this.form.age = '',
-                    this.form.idCard = '',
-                    this.form.register = '',
-                    this.form.doctor = '',
-                    this.form.department = '',
-                    this.form.costChecked = false,
-                    this.form.registrationFee = '',
-                    this.form.medicalExpenses = '',
-                    this.form.cost = '',
-                    this.form.total = '' ,
-                    this.form.phone = '',
-                    this.form.social_type = ''
+                  that.$message({ message: '挂号成功', type: 'success' })
+                  that.form.settlementValue = ''
+                  that.form.medicalInsuranceCard = ''
+                  that.form.name = ''
+                  that.form.sex = ''
+                  that.form.certificates = ''
+                  that.form.medicalCare = ''
+                  that.form.birthday = ''
+                  that.form.age = ''
+                  that.form.idCard = ''
+                  that.form.register = ''
+                  that.form.doctor = ''
+                  that.form.department = ''
+                  that.form.costChecked = false
+                  that.form.registrationFee = ''
+                  that.form.medicalExpenses = ''
+                  that.form.cost = ''
+                  that.form.total = ''
+                  that.form.phone = ''
+                  that.form.social_type = ''
+                  that.loadingone = false
+
+                  that.form.p_type = 14
+                  that.form.sick_type = that.sick[0].id
+                  that.form.diagnosis = that.diagnoses[0].id
                 } else {
                   this.$message.error('今日患者已挂号!')
                 }