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

增加单位岁 增加项目编码字段

Browse Source
This commit is contained in:
叶锦涛
2025-10-23 10:52:34 +08:00
parent 1bba9e598a
commit be6d5c1ccc
11 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
View File

@@ -296,6 +296,7 @@ public class IChargeBillServiceImpl implements IChargeBillService {
ChargeItemDefinition chargeItemDefinition = iChargeItemDefinitionService.getById(definitionId);
YbMedChrgItmType medChrgItmType =
YbMedChrgItmType.getByCode(Integer.parseInt(chargeItemDefinition.getYbType()));

8
openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
View File

@@ -48,6 +48,11 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目编码" prop="busNo">
<el-input v-model="form.busNo" placeholder="请输入项目编码" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
@@ -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'

4
openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
View File

@@ -124,7 +124,9 @@
:disabled="isViewMode"
@input="handleAgeInput"
placeholder="请输入年龄"
/>
>
<template #suffix>岁</template>
</el-input>
</el-form-item>
</el-col>
</el-row>

7
openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue
View File

@@ -49,9 +49,12 @@
label="年龄"
align="center"
key="age"
prop="age"
:show-overflow-tooltip="true"
/>
>
<template #default="scope">
{{ scope.row.age ? `${scope.row.age}岁` : '-' }}
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"

6
openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue
View File

@@ -10,7 +10,11 @@
<el-table-column label="性别" align="center" prop="genderEnum_enumText" />
<el-table-column label="证件号" align="center" prop="idCard" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="年龄" align="center" prop="age" />
<el-table-column label="年龄" align="center">
<template #default="scope">
{{ scope.row.age ? `${scope.row.age}岁` : '-' }}
</template>
</el-table-column>
</el-table>
</div>
</template>

6
openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
View File

@@ -439,7 +439,11 @@
prop="patientName"
width="120"
/>
<el-table-column label="年龄" align="center" key="age" prop="age" width="120" />
<el-table-column label="年龄" align="center" key="age" prop="age" width="120">
<template #default="scope">
{{ scope.row.age ? `${scope.row.age}岁` : '-' }}
</template>
</el-table-column>
<el-table-column
label="患者性别"
align="center"

15
openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
View File

@@ -200,6 +200,11 @@ const props = defineProps({
},
patientInfo: {
type: Object,
default: () => ({}),
},
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('提交请求失败');
});
}
});

6
openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue
View File

@@ -27,7 +27,11 @@
<el-table-column type="index" width="54" align="center" label="序号" />
<el-table-column prop="patientName" align="center" label="申请患者" />
<el-table-column prop="genderEnum_enumText" label="性别" align="center" />
<el-table-column prop="age" label="年龄" align="center" />
<el-table-column label="年龄" align="center">
<template #default="scope">
{{ scope.row.age ? `${scope.row.age}岁` : '-' }}
</template>
</el-table-column>
<el-table-column prop="sourceName" align="center" label="申请来源">
<template #default="scope">
{{ scope.row.sourceName || '-' }}

6
openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
View File

@@ -28,7 +28,11 @@
<el-table-column type="index" width="54" align="center" label="序号" />
<el-table-column prop="patientName" align="center" label="患者姓名" />
<el-table-column prop="genderEnum_enumText" label="性别" align="center" />
<el-table-column prop="age" label="年龄" align="center" />
<el-table-column label="年龄" align="center">
<template #default="scope">
{{ scope.row.age ? `${scope.row.age}岁` : '-' }}
</template>
</el-table-column>
<el-table-column prop="requestTime" align="center" label="申请时间" />
<el-table-column prop="sourceName" align="center" label="申请来源" />
<el-table-column prop="wardName" align="center" label="入院病区" />

18
openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
View File

@@ -35,12 +35,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="年龄" prop="age">
<el-input
v-model="form.age"
:disabled="isViewMode"
@input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
/>
</el-form-item>
<el-input
v-model="form.age"
:disabled="isViewMode"
@input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
>
<template #suffix>岁</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="卡类别" prop="typeCode">
@@ -79,7 +81,9 @@
</el-row>
<!-- <el-col :span="6">
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age" clearable :disabled="isViewMode"/>
<el-input v-model="form.age" clearable :disabled="isViewMode">
<template #suffix>岁</template>
</el-input>
</el-form-item>
</el-col> -->
<el-row>

4
openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
View File

@@ -183,7 +183,9 @@
v-model="form.age"
:disabled="isViewMode"
@input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
/>
>
<template #suffix>岁</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">