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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1116
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
View File

File diff suppressed because it is too large Load Diff

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

@@ -357,7 +357,11 @@ async function print() {
...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
nickName: userStore.nickName,
orgName: userStore.orgName,
<<<<<<< HEAD
fixmedinsName: '长春大学医院',
=======
fixmedinsName: '长春市朝阳区中医院医院',
>>>>>>> v1.3
queryTime: queryTime.value[0] + '~' + queryTime.value[1],
zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
@@ -433,4 +437,4 @@ getPharmacyCabinetLists();
.el-col {
margin-right: 50px;
}
</style>
</style>

67
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
View File

@@ -218,13 +218,13 @@
<el-col :span="5">
<span class="label">省医保人次：</span>
<span class="value">
{{ reportValue['229900reg'] ? reportValue['229900reg'] + ' 人' : '0 人' }}
{{ reportValue['229900reg'] ? reportValue['229900reg'] + '人' : '0 人' }}
</span>
</el-col>
<el-col :span="5">
<span class="label">市医保人次：</span>
<span class="value">
{{ reportValue['220100reg'] ? reportValue['220100reg'] + ' 人' : '0 人' }}
{{ (reportValue['220100reg'] || 0) + (reportValue['220199reg'] || 0) + ' 人' }}
</span>
</el-col>
<!-- <el-col :span="5">
@@ -273,19 +273,27 @@
>
<el-col :span="5">
<span class="label">市医保现金：</span>
<span class="value">{{ formatValue(reportValue['220100cash']) }}</span>
<span class="value">{{
formatValue((reportValue['220100cash'] || 0) + (reportValue['220199cash'] || 0))
}}</span>
</el-col>
<el-col :span="5">
<span class="label">市医保统筹：</span>
<span class="value">{{ formatValue(reportValue['220100tcSum']) }}</span>
<span class="value">{{
formatValue((reportValue['220100tcSum'] || 0) + (reportValue['220199tcSum'] || 0))
}}</span>
</el-col>
<el-col :span="5">
<span class="label">市医保账户：</span>
<span class="value">{{ formatValue(reportValue['220100zhSum']) }}</span>
<span class="value">{{
formatValue((reportValue['220100zhSum'] || 0) + (reportValue['220199zhSum'] || 0))
}}</span>
</el-col>
<el-col :span="5">
<span class="label">市医保基金：</span>
<span class="value">{{ formatValue(reportValue['220100fundSum']) }}</span>
<span class="value">{{
formatValue((reportValue['220100fundSum'] || 0) + (reportValue['220199fundSum'] || 0))
}}</span>
</el-col>
</el-row>
<el-row
@@ -329,6 +337,7 @@
{{
formatValue(
(reportValue['220100cash'] || 0) +
(reportValue['220199cash'] || 0) +
(reportValue['229900cash'] || 0) +
(reportValue['0000cash'] || 0)
)
@@ -443,16 +452,37 @@ function processObjectWithFinType(obj) {
async function print() {
// const selectedRows = proxy.$refs['tableRef'].getSelectionRows();
console.log(reportValue.value, '==reportValue.value==');
// 计算市医保相关字段
const municipalYbReg =
(reportValue.value['220100reg'] || 0) + (reportValue.value['220199reg'] || 0);
const municipalYbCash =
(reportValue.value['220100cash'] || 0) + (reportValue.value['220199cash'] || 0);
const municipalYbTcSum =
(reportValue.value['220100tcSum'] || 0) + (reportValue.value['220199tcSum'] || 0);
const municipalYbZhSum =
(reportValue.value['220100zhSum'] || 0) + (reportValue.value['220199zhSum'] || 0);
const municipalYbFundSum =
(reportValue.value['220100fundSum'] || 0) + (reportValue.value['220199fundSum'] || 0);
const municipalYbTotal = municipalYbZhSum + municipalYbFundSum;
const totalCash =
municipalYbCash + (reportValue.value['229900cash'] || 0) + (reportValue.value['0000cash'] || 0);
const result = {
data: [
{
...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
nickName: userStore.nickName,
orgName: userStore.orgName,
<<<<<<< HEAD
fixmedinsName: userStore.hospitalName,
=======
fixmedinsName: userStore.hospitalName,
>>>>>>> v1.3
createTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'),
scheduler: userStore.nickName,
timeRange: queryTime.value[0] + '~' + queryTime.value[1],
// 计算字段
zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
.add(reportValue.value.CHECK_FEE || 0)
@@ -465,14 +495,23 @@ async function print() {
.add(reportValue.value.REGISTRATION_FEE || 0)
.add(reportValue.value.OTHER_FEE || 0)
.add(reportValue.value.SANITARY_MATERIALS_FEE || 0),
// 省医保相关
provinceYbTotal:
(reportValue.value['229900zhSum'] || 0) + (reportValue.value['229900fundSum'] || 0),
municipalYbTotal:
(reportValue.value['220100zhSum'] || 0) + (reportValue.value['220100fundSum'] || 0),
totalCash:
(reportValue.value['220100cash'] || 0) +
(reportValue.value['229900cash'] || 0) +
(reportValue.value['0000cash'] || 0),
(reportValue.value['229900fundSum'] || 0) + (reportValue.value['229900zhSum'] || 0),
// 市医保相关（220100和220199）
municipalYbReg,
municipalYbCash,
municipalYbTcSum,
municipalYbZhSum,
municipalYbFundSum,
municipalYbTotal,
// 现金收入总额
totalCash,
// 体检人次
physicalExaminationCount: getPhysicalExaminationCount(),
},
],
@@ -546,4 +585,4 @@ function formatValue(value) {
background-color: #000;
margin: 20px 0;
}
</style>
</style>