diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
index d1cf4166..6c78d46a 100755
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -37,32 +37,26 @@
打印
-
+
-
门诊收费日结单
+ 门诊收费日结单
-
+
经办人姓名:
- {{ userStore.nickName }}
+ {{ userStore.nickName || '-' }}
科室:
- {{ userStore.orgName }}
+ {{ userStore.orgName || '-' }}
时间:
- {{ queryTime[0] + '~' + queryTime[1] }}
+ {{ queryTime && queryTime.length === 2 ? queryTime[0] + '~' + queryTime[1] : '-' }}
-
+
总收入:
{{ formatValue(reportValue.cashSum) }}
@@ -81,10 +75,7 @@
-
+
统筹支付:
{{ formatValue(reportValue.tcSum) }}
@@ -99,10 +90,7 @@
-
+
诊查费:
{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}
@@ -120,10 +108,7 @@
{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}
-
+
西药费:
{{ formatValue(reportValue.WEST_MEDICINE) }}
@@ -141,10 +126,7 @@
{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}
-
+
诊疗费:
{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}
@@ -334,19 +316,50 @@ getList();
getPharmacyCabinetLists();
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
index 5a8b0203..8a435e77 100755
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
@@ -1,5 +1,5 @@
-