Commit 99294735 authored by 朱彩云's avatar 朱彩云

feat(eccs-2803): 商保增加就诊日期的展示和查询

parent 533d3695
This diff is collapsed.
This diff is collapsed.
...@@ -196,6 +196,16 @@ ...@@ -196,6 +196,16 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="就诊日期">
<a-range-picker
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
v-model="searchForm.admissionDateStart"
:placeholder="['选择开始日期', '选择结束日期']"
/>
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row :gutter="30"> <a-row :gutter="30">
<a-col :sm="24" class="none-label"> <a-col :sm="24" class="none-label">
...@@ -468,6 +478,12 @@ export default { ...@@ -468,6 +478,12 @@ export default {
fixed: 'left', fixed: 'left',
width: 120 width: 120
}, },
{
title: '就诊日期',
dataIndex: 'admissionDate',
fixed: 'left',
width: 120
},
{ {
title: '病历号', title: '病历号',
dataIndex: 'mrnNo', dataIndex: 'mrnNo',
...@@ -731,8 +747,15 @@ export default { ...@@ -731,8 +747,15 @@ export default {
handlerSearch() { handlerSearch() {
this.pagination.pageNum = 1 this.pagination.pageNum = 1
let visitTimeStart = this.searchForm.visitTimeStart || [] let visitTimeStart = this.searchForm.visitTimeStart || []
let admissionDateStart = this.searchForm.admissionDateStart || []
this.searchData = this.$lodash.cloneDeep({ this.searchData = this.$lodash.cloneDeep({
...this.searchForm, ...this.searchForm,
admissionDateStart: admissionDateStart[0]
? admissionDateStart[0] + ' 00:00:00'
: undefined,
admissionDateEnd: admissionDateStart[0]
? admissionDateStart[0] + ' 23:59:59'
: undefined,
visitTimeEnd: visitTimeStart[1] visitTimeEnd: visitTimeStart[1]
? visitTimeStart[1] + ' 23:59:59' ? visitTimeStart[1] + ' 23:59:59'
: undefined, : undefined,
......
...@@ -284,6 +284,16 @@ ...@@ -284,6 +284,16 @@
/> />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :lg="6" :sm="12" v-if="activeKey1 === '1'">
<a-form-model-item label="就诊日期">
<a-range-picker
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
v-model="searchForm.admissionDateStart"
:placeholder="['选择开始日期', '选择结束日期']"
/>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12" v-if="activeKey1 === '1'"> <a-col :lg="6" :sm="12" v-if="activeKey1 === '1'">
<a-form-model-item label="" class="mar_l40"> <a-form-model-item label="" class="mar_l40">
<a-checkbox <a-checkbox
...@@ -541,6 +551,12 @@ export default { ...@@ -541,6 +551,12 @@ export default {
width: 180, width: 180,
scopedSlots: { customRender: 'patientName' } scopedSlots: { customRender: 'patientName' }
}, },
{
title: '就诊日期',
dataIndex: 'admissionDate',
ellipsis: true,
width: 160
},
{ title: '病历号', dataIndex: 'mrnNo', ellipsis: true, width: 195 }, { title: '病历号', dataIndex: 'mrnNo', ellipsis: true, width: 195 },
{ {
title: '保险公司', title: '保险公司',
...@@ -903,6 +919,7 @@ export default { ...@@ -903,6 +919,7 @@ export default {
// 全选 // 全选
selectAllList() { selectAllList() {
let billDate = this.searchForm.billDate || [] let billDate = this.searchForm.billDate || []
let admissionDateStart = this.searchForm.admissionDateStart || []
this.$apis this.$apis
.queryReceiptInfoList({ .queryReceiptInfoList({
pageNum: 1, pageNum: 1,
...@@ -911,7 +928,13 @@ export default { ...@@ -911,7 +928,13 @@ export default {
payorCode: this.form.payorCode, payorCode: this.form.payorCode,
...this.searchForm, ...this.searchForm,
receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined, receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
admissionDateStart: admissionDateStart[0]
? admissionDateStart[0] + ' 00:00:00'
: undefined,
admissionDateEnd: admissionDateStart[1]
? admissionDateStart[1] + ' 23:59:59'
: undefined
}) })
.then((res) => { .then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == '0000') {
...@@ -1009,6 +1032,7 @@ export default { ...@@ -1009,6 +1032,7 @@ export default {
return return
} }
let billDate = this.searchForm.billDate || [] let billDate = this.searchForm.billDate || []
let admissionDateStart = this.searchForm.admissionDateStart || []
this.$apis this.$apis
.queryBackReceiptList({ .queryBackReceiptList({
pageNum: 1, pageNum: 1,
...@@ -1016,7 +1040,13 @@ export default { ...@@ -1016,7 +1040,13 @@ export default {
backMoneyNo: this.backMoneyNo, backMoneyNo: this.backMoneyNo,
...this.searchForm, ...this.searchForm,
receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined, receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
admissionDateStart: admissionDateStart[0]
? admissionDateStart[0] + ' 00:00:00'
: undefined,
admissionDateEnd: admissionDateStart[1]
? admissionDateStart[1] + ' 23:59:59'
: undefined
}) })
.then((res) => { .then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == '0000') {
...@@ -1030,6 +1060,12 @@ export default { ...@@ -1030,6 +1060,12 @@ export default {
: undefined, : undefined,
receiptStartDate: billDate[0] receiptStartDate: billDate[0]
? billDate[0] + ' 00:00:00' ? billDate[0] + ' 00:00:00'
: undefined,
admissionDateStart: admissionDateStart[0]
? admissionDateStart[0] + ' 00:00:00'
: undefined,
admissionDateEnd: admissionDateStart[1]
? admissionDateStart[1] + ' 23:59:59'
: undefined : undefined
}) })
const list = res.content.list || [] const list = res.content.list || []
...@@ -1049,6 +1085,7 @@ export default { ...@@ -1049,6 +1085,7 @@ export default {
// 获取所有账单 // 获取所有账单
_getNewEOBList() { _getNewEOBList() {
let billDate = this.searchForm.billDate || [] let billDate = this.searchForm.billDate || []
let admissionDateStart = this.searchForm.admissionDateStart || []
this.$apis this.$apis
.queryReceiptInfoList({ .queryReceiptInfoList({
pageNum: this.pagination.pageNum, pageNum: this.pagination.pageNum,
...@@ -1057,7 +1094,13 @@ export default { ...@@ -1057,7 +1094,13 @@ export default {
payorCode: this.form.payorCode, payorCode: this.form.payorCode,
...this.searchForm, ...this.searchForm,
receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined, receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
admissionDateStart: admissionDateStart[0]
? admissionDateStart[0] + ' 00:00:00'
: undefined,
admissionDateEnd: admissionDateStart[1]
? admissionDateStart[1] + ' 23:59:59'
: undefined
}) })
.then((res) => { .then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == '0000') {
...@@ -1072,6 +1115,12 @@ export default { ...@@ -1072,6 +1115,12 @@ export default {
: undefined, : undefined,
receiptStartDate: billDate[0] receiptStartDate: billDate[0]
? billDate[0] + ' 00:00:00' ? billDate[0] + ' 00:00:00'
: undefined,
admissionDateStart: admissionDateStart[0]
? admissionDateStart[0] + ' 00:00:00'
: undefined,
admissionDateEnd: admissionDateStart[1]
? admissionDateStart[1] + ' 23:59:59'
: undefined : undefined
}) })
let content = res.content || {} let content = res.content || {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment