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 @@
               />
             </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'
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="请输入年龄"
-            />
+            >
+              <template #suffix>岁</template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
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"
-        />
+        >
+          <template #default="scope">
+            {{ scope.row.age ? `${scope.row.age}岁` : '-' }}
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="total > 0"
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue
index 9d48aaee..abcfa86b 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue
@@ -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>
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"
             />
-            <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"
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
index 16e3220e..ea2acce4 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue
@@ -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('提交请求失败');
       });
     }
   });
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 @@
         <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 || '-' }}
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
index 2078561e..6d8d001e 100644
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/awaitList.vue
@@ -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="入院病区" />
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
index 9730e335..ad1e4768 100644
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfoForm.vue
@@ -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>
diff --git a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
index aaee50fd..9194a55d 100644
--- a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -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">