wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Bug #568: 根因+修复方案摘要

Browse Source
This commit is contained in:
赵云
2026-05-22 11:07:33 +08:00
parent 03e47be0d8
commit 2eba125351
1 changed files with 162 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

314
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
View File

@@ -38,64 +38,140 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div v-loading="loading" class="report-container"> <div v-loading="loading" style="width: 1200px">
<div class="report-title">门诊收费日结单</div> <div style="text-align: center">
<div class="report-section"> <h2>门诊收费日结单</h2>
<div class="report-row cols-4">
<div class="report-item"><span class="label">经办人姓名：</span><span class="value">{{ userStore.nickName }}</span></div>
<div class="report-item"><span class="label">科室：</span><span class="value">{{ userStore.orgName }}</span></div>
<div class="report-item span-2"><span class="label">时间：</span><span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span></div>
</div>
</div> </div>
<div class="section-title">基本信息</div>
<el-row
:gutter="10"
style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
>
<el-col :span="4">
<span class="label">经办人姓名：</span>
<span class="value">{{ userStore.nickName }}</span>
</el-col>
<el-col :span="4">
<span class="label">科室：</span>
<span class="value">{{ userStore.orgName }}</span>
</el-col>
<el-col :span="5">
<span class="label">时间：</span>
<span class="value">{{ queryTime[0] + "~" + queryTime[1] }}</span>
</el-col>
</el-row>
<div class="divider"></div> <div class="divider"></div>
<div class="report-section"> <div class="section-title">收费汇总</div>
<div class="section-title">收费汇总</div> <el-row
<div class="report-row cols-4"> :gutter="10"
<div class="report-item"><span class="label">实际现金收入：</span><span class="value">{{ formatValue(reportValue.cashSum) }}</span></div> style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
<div class="report-item"><span class="label">现金：</span><span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span></div> >
<div class="report-item"><span class="label">微信：</span><span class="value">{{ formatValue(reportValue.vxCashSum) }}</span></div> <el-col :span="5">
<div class="report-item"><span class="label">支付宝：</span><span class="value">{{ formatValue(reportValue.aliCashSum) }}</span></div> <span class="label">实际现金收入：</span>
</div> <span class="value">{{ formatValue(reportValue.cashSum) }}</span>
</div> </el-col>
<el-col :span="5">
<span class="label">现金：</span>
<span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span>
</el-col>
<el-col :span="5">
<span class="label">微信：</span>
<span class="value">{{ formatValue(reportValue.vxCashSum) }}</span>
</el-col>
<el-col :span="5">
<span class="label">支付宝：</span>
<span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
</el-col>
</el-row>
<div class="divider"></div> <div class="divider"></div>
<div class="report-section"> <div class="section-title">医保支付</div>
<div class="section-title">医保支付</div> <el-row
<div class="report-row cols-4"> :gutter="10"
<div class="report-item"><span class="label">统筹支付：</span><span class="value">{{ formatValue(reportValue.tcSum) }}</span></div> style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
<div class="report-item"><span class="label">账户支付：</span><span class="value">{{ formatValue(reportValue.zhSum) }}</span></div> >
<div class="report-item span-2"><span class="label">基金支付总额：</span><span class="value">{{ formatValue(reportValue.fundSum) }}</span></div> <el-col :span="5">
</div> <span class="label">统筹支付：</span>
</div> <span class="value">{{ formatValue(reportValue.tcSum) }}</span>
</el-col>
<el-col :span="5">
<span class="label">账户支付：</span>
<span class="value">{{ formatValue(reportValue.zhSum) }}</span>
</el-col>
<el-col :span="5">
<span class="label">基金支付总额：</span>
<span class="value">{{ formatValue(reportValue.fundSum) }}</span>
</el-col>
</el-row>
<div class="divider"></div> <div class="divider"></div>
<div class="report-section"> <div class="section-title">费用明细</div>
<div class="section-title">费用明细</div> <el-row
<div class="report-row cols-4"> :gutter="10"
<div class="report-item"><span class="label">诊查费：</span><span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span></div> style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
<div class="report-item"><span class="label">检查费：</span><span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span></div> >
<div class="report-item"><span class="label">化验费：</span><span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span></div> <el-col :span="5">
<div class="report-item"><span class="label">治疗费：</span><span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span></div> <span class="label">诊查费：</span>
</div> <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
<div class="report-row cols-4"> </el-col>
<div class="report-item"><span class="label">西药费：</span><span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span></div> <el-col :span="5">
<div class="report-item"><span class="label">中药饮片费：</span><span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span></div> <span class="label">检查费：</span>
<div class="report-item"><span class="label">中成药费：</span><span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span></div> <span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span>
<div class="report-item"><span class="label">卫生材料费：</span><span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span></div> </el-col>
</div> <el-col :span="5">
<div class="report-row cols-4"> <span class="label">化验费：</span>
<div class="report-item"><span class="label">诊疗费：</span><span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span></div> <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span>
<div class="report-item"><span class="label">挂号费：</span><span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span></div> </el-col>
<div class="report-item span-2"><span class="label">其他费用：</span><span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span></div> <el-col :span="5">
</div> <span class="label">治疗费：</span>
</div> <span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
</el-col>
</el-row>
<el-row
:gutter="10"
style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
>
<el-col :span="5">
<span class="label">西药费：</span>
<span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
</el-col>
<el-col :span="5">
<span class="label">中药饮片费：</span>
<span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span>
</el-col>
<el-col :span="5">
<span class="label">中成药费：</span>
<span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span>
</el-col>
<el-col :span="5">
<span class="label">卫生材料费：</span>
<span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span>
</el-col>
</el-row>
<el-row
:gutter="10"
style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
>
<el-col :span="5">
<span class="label">诊疗费：</span>
<span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
</el-col>
<el-col :span="5">
<span class="label">挂号费：</span>
<span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span>
</el-col>
<el-col :span="5">
<span class="label">其他费用：</span>
<span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span>
</el-col>
</el-row>
</div> </div>
</div> </div>
</template> </template>
<script setup name="dayEnd"> <script setup name="dayEnd">
import {getContractList, getRreportReturnIssue, getTotal} from './component/api'; import {getContractList, getRreportReturnIssue, getTotal} from "./component/api";
import useUserStore from '@/store/modules/user'; import useUserStore from "@/store/modules/user";
import {formatDateStr} from '@/utils/index'; import {formatDateStr} from "@/utils/index";
import Decimal from 'decimal.js'; import Decimal from "decimal.js";
const userStore = useUserStore(); const userStore = useUserStore();
@@ -111,14 +187,14 @@ const ids = ref([]);
const single = ref(true); const single = ref(true);
const multiple = ref(true); const multiple = ref(true);
const total = ref(0); const total = ref(0);
const title = ref(''); const title = ref("");
const contractList = ref(undefined); const contractList = ref(undefined);
const reportValue = ref({}); const reportValue = ref({});
const queryTime = ref([ const queryTime = ref([
formatDateStr(new Date(), 'YYYY-MM-DD'), formatDateStr(new Date(), "YYYY-MM-DD"),
formatDateStr(new Date(), 'YYYY-MM-DD'), formatDateStr(new Date(), "YYYY-MM-DD"),
]); ]);
const contractNo = ref('0000'); const contractNo = ref("0000");
const data = reactive({ const data = reactive({
queryParams: { queryParams: {
@@ -142,8 +218,8 @@ function getValue() {
loading.value = true; loading.value = true;
getTotal({ getTotal({
contractNo: contractNo.value, contractNo: contractNo.value,
startTime: queryTime.value[0] + ' 00:00:00', startTime: queryTime.value[0] + " 00:00:00",
endTime: queryTime.value[1] + ' 23:59:59', endTime: queryTime.value[1] + " 23:59:59",
entererId: userStore.practitionerId, entererId: userStore.practitionerId,
}).then((res) => { }).then((res) => {
loading.value = false; loading.value = false;
@@ -174,22 +250,22 @@ function getList() {
function handleQuery() { function handleQuery() {
queryParams.value.approvalTimeSTime = queryParams.value.approvalTimeSTime =
occurrenceTime.value && occurrenceTime.value.length == 2 occurrenceTime.value && occurrenceTime.value.length == 2
? occurrenceTime.value[0] + ' 00:00:00' ? occurrenceTime.value[0] + " 00:00:00"
: ''; : "";
queryParams.value.approvalTimeETime = queryParams.value.approvalTimeETime =
occurrenceTime.value && occurrenceTime.value.length == 2 occurrenceTime.value && occurrenceTime.value.length == 2
? occurrenceTime.value[1] + ' 23:59:59' ? occurrenceTime.value[1] + " 23:59:59"
: ''; : "";
queryParams.value.pageNo = 1; queryParams.value.pageNo = 1;
getList(); getList();
} }
/** 清空条件按钮操作 */ /** 清空条件按钮操作 */
function handleClear() { function handleClear() {
queryParams.value.approvalTimeSTime = ''; queryParams.value.approvalTimeSTime = "";
queryParams.value.approvalTimeETime = ''; queryParams.value.approvalTimeETime = "";
occurrenceTime.value = ''; occurrenceTime.value = "";
proxy.resetForm('queryRef'); proxy.resetForm("queryRef");
getList(); getList();
} }
@@ -202,7 +278,7 @@ function handleSelectionChange(selection) {
/** 打印门诊日结 */ /** 打印门诊日结 */
async function print() { async function print() {
console.log(reportValue.value, '==reportValue.value=='); console.log(reportValue.value, "==reportValue.value==");
const result = { const result = {
data: [ data: [
{ {
@@ -210,7 +286,7 @@ async function print() {
nickName: userStore.nickName, nickName: userStore.nickName,
orgName: userStore.orgName, orgName: userStore.orgName,
fixmedinsName: userStore.hospitalName, fixmedinsName: userStore.hospitalName,
queryTime: queryTime.value[0] + '~' + queryTime.value[1], queryTime: queryTime.value[0] + "~" + queryTime.value[1],
zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0), zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0) feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
.add(reportValue.value.CHECK_FEE || 0) .add(reportValue.value.CHECK_FEE || 0)
@@ -226,69 +302,43 @@ async function print() {
}, },
], ],
}; };
console.log(result, '==result.data=='); console.log(result, "==result.data==");
let jsonString = JSON.stringify(result, null, 2); let jsonString = JSON.stringify(result, null, 2);
console.log(jsonString, 'jsonstring'); console.log(jsonString, "jsonstring");
await CefSharp.BindObjectAsync('boundAsync'); await CefSharp.BindObjectAsync("boundAsync");
await boundAsync await boundAsync
.printReport(getPrintFileName(contractNo.value), jsonString) .printReport(getPrintFileName(contractNo.value), jsonString)
.then((response) => { .then((response) => {
console.log(response, 'response'); console.log(response, "response");
var res = JSON.parse(response); var res = JSON.parse(response);
if (!res.IsSuccess) { if (!res.IsSuccess) {
proxy.$modal.msgError('调用打印插件失败:' + res.ErrorMessage); proxy.$modal.msgError("调用打印插件失败:" + res.ErrorMessage);
} }
}) })
.catch((error) => { .catch((error) => {
proxy.$modal.msgError('调用打印插件失败:' + error); proxy.$modal.msgError("调用打印插件失败:" + error);
}); });
} }
function getPrintFileName(value) { function getPrintFileName(value) {
switch (value) { switch (value) {
case '0000': case "0000":
return '门诊日结单(按登录角色查询)自费.grf'; return "门诊日结单(按登录角色查询)自费.grf";
case '229900': case "229900":
return '门诊日结单(按登录角色查询)省医保.grf'; return "门诊日结单(按登录角色查询)省医保.grf";
case '220100': case "220100":
return '门诊日结单(按登录角色查询)市医保.grf'; return "门诊日结单(按登录角色查询)市医保.grf";
} }
} }
function formatValue(value) { function formatValue(value) {
return value == null || value == undefined ? '0.00 元' : value.toFixed(2) + ' 元'; return value == null || value == undefined ? "0.00 元" : value.toFixed(2) + " 元";
} }
getList(); getList();
getPharmacyCabinetLists(); getPharmacyCabinetLists();
</script> </script>
<style scoped> <style scoped>
.custom-tree-node {
display: flex;
align-items: center;
}
.title {
font-weight: bold;
font-size: large;
margin-bottom: 10px;
}
.report-container {
max-width: 1200px;
padding: 24px 32px;
background: #fff;
border-radius: 4px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
}
.report-title {
text-align: center;
font-size: 18px;
font-weight: bold;
margin: 16px 0;
}
.report-section {
margin: 8px 0;
}
.section-title { .section-title {
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
@@ -297,59 +347,19 @@ getPharmacyCabinetLists();
padding-left: 8px; padding-left: 8px;
border-left: 3px solid #409eff; border-left: 3px solid #409eff;
} }
.report-row {
display: grid;
margin: 12px 0;
gap: 8px 16px;
}
.cols-4 {
grid-template-columns: repeat(4, 1fr);
}
.span-2 {
grid-column: span 2;
}
.report-item {
display: flex;
align-items: center;
box-sizing: border-box;
min-width: 0;
overflow: hidden;
}
.label { .label {
display: inline-block; display: inline-block;
width: 120px; width: 120px !important;
flex-shrink: 0;
color: #606266;
white-space: nowrap;
text-align: right;
} }
.value { .value {
color: #303133; float: right;
font-weight: 500; }
white-space: nowrap; .el-col {
overflow: hidden; margin-right: 50px;
text-overflow: ellipsis;
} }
.divider { .divider {
height: 1px; height: 3px;
background-color: #dcdfe6; background-color: #000;
margin: 12px 0; margin: 20px 0;
}
@media screen and (max-width: 1200px) {
.cols-4 {
grid-template-columns: repeat(2, 1fr);
}
.cols-3 {
grid-template-columns: repeat(2, 1fr);
}
}
@media screen and (max-width: 768px) {
.cols-4,
.cols-3 {
grid-template-columns: 1fr;
}
.label {
width: 100px;
}
} }
</style> </style>