From be6d5c1cccf88c8b33fd77910864ef573ec43e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E9=94=A6=E6=B6=9B?= <26050301730@qq.com> Date: Thu, 23 Oct 2025 10:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BD=8D=E5=B2=81?= =?UTF-8?q?=20=20=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IChargeBillServiceImpl.java | 1 + .../components/diagnosisTreatmentDialog.vue | 8 +++++++- .../components/patientAddDialog.vue | 4 +++- .../components/patientInfoDialog.vue | 7 +++++-- .../components/patientList.vue | 6 +++++- .../charge/outpatientregistration/index.vue | 6 +++++- .../components/hospitalizationDialog.vue | 15 ++++++++++++++- .../register/components/accomplishList.vue | 6 +++++- .../charge/register/components/awaitList.vue | 6 +++++- .../register/components/patientInfoForm.vue | 18 +++++++++++------- .../patientmanagement/index.vue | 4 +++- 11 files changed, 64 insertions(+), 17 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java index 062d9524..4dc66cc6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java @@ -296,6 +296,7 @@ public class IChargeBillServiceImpl implements IChargeBillService { ChargeItemDefinition chargeItemDefinition = iChargeItemDefinitionService.getById(definitionId); + YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType())); diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue index ac21ba49..f4b344e9 100644 --- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue @@ -48,6 +48,11 @@ /> + + + + + @@ -356,7 +361,7 @@ const diagnosisTreatmentList = ref([]); const data = reactive({ form: {}, rules: { - // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }], + busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }], name: [{ required: true, message: '名称不能为空', trigger: 'blur' }], // statusEnum: [{ required: true, message: "状态不能为空", trigger: "blur" }], categoryCode: [{ required: true, message: '诊疗目录不能为空', trigger: 'blur' }], @@ -450,6 +455,7 @@ function setValue(row) { form.value = { name: formatValue(row.medicalServiceName), //医疗服务项目名称 ybNo: formatValue(row.medicalCatalogCode), // 医保编码 + busNo: formatValue(row.medicalCatalogCode), // 项目编码使用医保编码 categoryCode: props.currentCategoryEnum, // chrgitmLv: formatValue( // row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3' diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue index 0bc83397..9145e0af 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue @@ -124,7 +124,9 @@ :disabled="isViewMode" @input="handleAgeInput" placeholder="请输入年龄" - /> + > + + diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue index 923833dc..9ca91302 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue @@ -49,9 +49,12 @@ label="年龄" align="center" key="age" - prop="age" :show-overflow-tooltip="true" - /> + > + + - + + + diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue index 6a56b26d..15c9632d 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue @@ -439,7 +439,11 @@ prop="patientName" width="120" /> - + + + ({}), + }, + encounterId: { + type: String, + default: '', }, }); const emit = defineEmits(['close']); @@ -284,14 +289,22 @@ function submit() { ...submitForm, diagnosisYbNo: diagnosisYbNo, diagnosisDefinitionId: diagnosisDefinitionId, - ambEncounterId: props.patientInfo.encounterId, + // 优先使用props.encounterId，确保就诊ID正确传递 + ambEncounterId: props.encounterId || props.patientInfo.encounterId, patientId: props.patientInfo.patientId, }; + console.log('提交住院数据:', saveData); handleHospitalization(saveData).then((res) => { if (res.code == 200) { proxy.$modal.msgSuccess('办理成功'); close(); + } else { + console.error('办理失败:', res.msg); + proxy.$modal.msgError(res.msg || '办理失败，请检查数据后重试'); } + }).catch(error => { + console.error('提交出错:', error); + proxy.$modal.msgError('提交请求失败'); }); } }); diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue index 7df18833..441d2396 100644 --- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue +++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue @@ -27,7 +27,11 @@ - + + +