diff --git a/src/views/Charge/Charge.vue b/src/views/Charge/Charge.vue
index 4c9bd7f..b710cac 100644
--- a/src/views/Charge/Charge.vue
+++ b/src/views/Charge/Charge.vue
@@ -445,23 +445,17 @@ const fetchPatientsByDate = async () => {
       medicalDateTime: [
         `${formatDate(startDate)} 00:00:00`,
         `${formatDate(endDate)} 23:59:59`
-      ]
+      ],
+      // 添加收费状态筛选参数
+      chargeStatus: chargeStatus.value === 'unpaid' ? '0' : '1',
+      // 添加搜索关键词
+      pname: searchQuery.value || undefined
     }
     
     const res = await PatientApi.getPatientPage(params)
-    originalPatients.value = res.list
+    patients.value = res.list
+    total.value = res.total
     
-    // 根据当前选中的收费状态过滤患者列表
-    patients.value = res.list.filter(patient => {
-      if (chargeStatus.value === 'unpaid') {
-        return !patient.chargeType
-      } else {
-        return patient.chargeType
-      }
-    })
-    
-    total.value = patients.value.length
-
     // 如果没有查询到患者，清除选中状态
     if (!patients.value.length) {
       selectedPatient.value = null
@@ -472,6 +466,12 @@ const fetchPatientsByDate = async () => {
   }
 }
 
+// 添加搜索处理方法
+const handleSearch = () => {
+  pageNo.value = 1 // 重置到第一页
+  fetchPatientsByDate()
+}
+
 // 修改收费状态切换处理方法
 const handleChargeStatusChange = (status) => {
   // 清除选中状态
@@ -479,17 +479,16 @@ const handleChargeStatusChange = (status) => {
   patientData.value = {}
   
   chargeStatus.value = status
-  // 从原始数据中筛选
-  if (originalPatients.value.length) {
-    patients.value = originalPatients.value.filter(patient => {
-      if (status === 'unpaid') {
-        return !patient.chargeType
-      } else {
-        return patient.chargeType
-      }
-    })
-    total.value = patients.value.length
-  }
+  pageNo.value = 1 // 重置到第一页
+  
+  // 重新获取数据
+  fetchPatientsByDate()
+}
+
+// 添加分页切换处理方法
+const handleCurrentChange = (page) => {
+  pageNo.value = page
+  fetchPatientsByDate()
 }
 
 // 修改时间周期切换处理方法
@@ -508,6 +507,7 @@ const handlePeriodChange = (period) => {
       endDate = new Date(today.setHours(23, 59, 59, 999))
       customDateRange.value = [startDate, endDate]
       showDatePicker.value = false
+      pageNo.value = 1 // 重置到第一页
       fetchPatientsByDate()
       break
       
@@ -518,6 +518,7 @@ const handlePeriodChange = (period) => {
       endDate.setDate(startDate.getDate() + 6)
       customDateRange.value = [startDate, endDate]
       showDatePicker.value = false
+      pageNo.value = 1 // 重置到第一页
       fetchPatientsByDate()
       break
       
@@ -526,13 +527,12 @@ const handlePeriodChange = (period) => {
       endDate = new Date(today.getFullYear(), today.getMonth() + 1, 0)
       customDateRange.value = [startDate, endDate]
       showDatePicker.value = false
+      pageNo.value = 1 // 重置到第一页
       fetchPatientsByDate()
       break
       
     case 'custom':
       showDatePicker.value = !showDatePicker.value
-      patients.value = [] // 清空患者列表
-      customDateRange.value = [] // 清空日期范围
       break
       
     case 'reset':
@@ -541,6 +541,7 @@ const handlePeriodChange = (period) => {
       const todayEnd = new Date(today.setHours(23, 59, 59, 999))
       customDateRange.value = [todayStart, todayEnd]
       showDatePicker.value = false
+      pageNo.value = 1 // 重置到第一页
       fetchPatientsByDate()
       break
   }
@@ -654,27 +655,7 @@ const handleSubmitCharge = async () => {
     ElMessage.success('收费成功')
     
     // 重新获取患者列表数据
-    const params = {
-      pageNo: pageNo.value,
-      pageSize: pageSize.value,
-      medicalDateTime: customDateRange.value ? [
-        `${formatDate(customDateRange.value[0])} 00:00:00`,
-        `${formatDate(customDateRange.value[1])} 23:59:59`
-      ] : undefined
-    }
-    
-    const listRes = await PatientApi.getPatientPage(params)
-    originalPatients.value = listRes.list
-    
-    // 根据当前收费状态过滤并更新患者列表
-    patients.value = listRes.list.filter(patient => {
-      if (chargeStatus.value === 'unpaid') {
-        return !patient.chargeType
-      } else {
-        return patient.chargeType
-      }
-    })
-    total.value = patients.value.length
+    fetchPatientsByDate()
     
     // 重新获取并更新当前选中患者的信息
     const patientRes = await PatientApi.getPatient(selectedPatient.value.id)
@@ -719,6 +700,11 @@ const formatDateTime = (datetime) => {
   return `${year}-${month}-${day} ${hour}:${minute}:${second}`
 }
 
+// 添加读取身份证方法
+const readCardId = () => {
+  ElMessage.info('身份证读取功能开发中')
+}
+
 // ... 其他方法实现
 </script>
 
diff --git a/src/views/inspect/physicalEnroll/index.vue b/src/views/inspect/physicalEnroll/index.vue
index ef03a0c..8324531 100644
--- a/src/views/inspect/physicalEnroll/index.vue
+++ b/src/views/inspect/physicalEnroll/index.vue
@@ -35,10 +35,43 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-radio-group v-model="searchForm_extra.passStatus" class="w-100%">
-                  <el-radio value="0" class="ml-2.8px !mr-19.2px">未登记</el-radio>
-                  <el-radio value="1">已登记</el-radio>
-                </el-radio-group>
+                <div style="display: flex; justify-content: space-between; align-items: center;">
+                  <el-radio-group v-model="searchForm_extra.passStatus">
+                    <el-radio value="1">已登记</el-radio>
+                  </el-radio-group>
+                  <div>
+                    <el-button
+                      @click="handlePersonInfoCustomAdd"
+                      size="default"
+                      type="text"
+                      style="
+                        margin-left: 10px;
+                        color: #67C23A;
+                        font-size: 15px;
+                      "
+                    >
+                      <Icon :size="15" class="mr-4px" />新增
+                    </el-button>
+                    <el-button
+                      @click="handlePersonInfoIDCard2nd"
+                      size="default"
+                      type="text"
+                      style="
+                        margin-left: 10px;
+                        color: #2d8cf0;
+                        font-size: 15px;
+                      "
+                      :loading="btnPersonInfoIDCard2ndLoading"
+                    >
+                      <Icon
+                        :size="15"
+                        icon="ep:card"
+                        class="mr-4px"
+                        v-show="!btnPersonInfoIDCard2ndLoading"
+                      />读取身份证
+                    </el-button>
+                  </div>
+                </div>
               </el-col>
             </el-row>
             <el-row>
@@ -51,22 +84,6 @@
                 />
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="24" class="text-right">
-                <el-button
-                  size="small"
-                  style="
-                    margin: 0;
-                    background-color: #2d8cf0;
-                    color: rgba(255, 255, 255, 1);
-                    width: 58px;
-                    font-size: 13.4px;
-                  "
-                >
-                  查询
-                </el-button>
-              </el-col>
-            </el-row>
           </el-form>
           <div class="h-[max(calc(100%-170px),60px)]">
             <el-scrollbar
@@ -75,32 +92,25 @@
               <el-empty
                 description="暂无数据"
                 image="/public/static/inspect/empty.png"
-                v-if="!personData || personData.length == 0"
+                v-if="!personData || personData.length == 1"
               />
               <el-table
+                ref="personTableRef"
                 size="default"
                 border
-                :stripe="false"
-                :show-overflow-tooltip="true"
                 :data="personData"
                 :header-cell-style="{
                   background: '#f8f8f9',
-                  height: '10px',
                   color: '#333333'
                 }"
                 :row-style="{ height: '40px' }"
-                height="max(calc(99.4% - 32px), 60px)"
-                v-if="personData && personData.length > 0"
+                height="max(50vh, 30px)"
+                @row-click="(row) => !personInfoCustomAdd && handlePatientSelect(row)"
+                :highlight-current-row="true"
+                :row-class-name="getRowClassName"
               >
-                <el-table-column label="" width="30px">
-                  <template #default="scope">
-                    <el-radio :key="scope.row.id" :label="scope.row.id" v-model="isRadioChecked">
-                      {{ '' }}
-                    </el-radio>
-                  </template>
-                </el-table-column>
-                <el-table-column label="体检编号" width="106px" prop="id" />
-                <el-table-column label="患者信息" width="250px">
+                <el-table-column label="体检编号" width="90px" prop="medicalSn" show-overflow-tooltip />
+                <el-table-column label="患者信息" min-width="200px">
                   <template #default="scope">
                     <el-row>
                       <el-col
@@ -108,6 +118,13 @@
                         style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
                       >
                         姓名：{{ scope.row.personName }}
+                        <el-icon 
+                          v-if="selectedPatient?.id === scope.row.id" 
+                          color="#67C23A" 
+                          class="ml-4px"
+                        >
+                          <Check />
+                        </el-icon>
                       </el-col>
                     </el-row>
                     <el-row>
@@ -118,7 +135,7 @@
                 </el-table-column>
               </el-table>
               <div
-                style="display: flex; justify-content: center"
+                style="display: flex; justify-content: center; position: absolute; bottom: 10px; width: 100%;"
                 v-if="personData && personData.length > 0"
               >
                 <Pagination
@@ -156,7 +173,7 @@
           <el-form
             ref="personParamRef"
             :model="personParam"
-            :rules="{}"
+            :rules="formRules"
             :inline="true"
             size="default"
             label-width="72px"
@@ -200,91 +217,86 @@
                 </div>
               </div>
               <div style="flex: 1">
-                <div style="display: flex; flex-wrap: wrap">
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    label="体检编号"
-                  >
-                    <el-input
-                      class="w-100%"
-                      v-model="personParam.testNum"
-                      placeholder="提交后系统自动生成"
-                      clearable
-                      disabled
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    label="身份证号"
-                    prop="idCard"
-                  >
-                    <el-input
-                      class="w-100%"
-                      :readonly="searchForm.isPass == 99 ? true : false"
-                      v-model="personParam.idCard"
-                      placeholder="请输入身份证号"
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    :label="setLabel('姓名')"
-                    prop="personName"
-                  >
-                    <el-input
-                      class="w-100%"
-                      :readonly="searchForm.isPass == 99 ? true : false"
-                      v-model="personParam.personName"
-                      placeholder="请输入姓名"
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    :label="setLabel('性别')"
-                    prop="sex"
-                  >
-                    <el-input
-                      class="w-100%"
-                      v-model="personParam.sex"
-                      placeholder="性别"
-                      readonly
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    :label="setLabel('年龄')"
-                    prop="age"
-                  >
-                    <el-input
-                      class="w-100%"
-                      v-model="personParam.age"
-                      placeholder="年龄"
-                      readonly
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    label="体检类型"
-                    prop="physicalType"
-                  >
-                    <el-input
-                      class="w-100%"
-                      v-model="personParam.physicalType"
-                      placeholder="体检类型"
-                      readonly
-                    />
-                  </el-form-item>
-                  <el-form-item
-                    class="w-[max(calc(25%-5px),236px)] !m-0 !mb-4px !mr-4px"
-                    label="联系电话"
-                    prop="mobile"
-                  >
-                    <el-input
-                      class="w-100%"
-                      :readonly="searchForm.isPass == 99 ? true : false"
-                      v-model="personParam.mobile"
-                      placeholder="联系电话"
-                    />
-                  </el-form-item>
+                <div style="display: flex; flex-direction: column; gap: 8px; max-width: 100%;">
+                  <!-- 第一行 -->
+                  <div style="display: flex; flex-wrap: wrap; gap: 8px;">
+                    <el-form-item
+                      class="form-item-test-num !m-0 !mb-4px"
+                      label="体检编号"
+                    >
+                      <el-input
+                        class="w-100%"
+                        v-model="personParam.testNum"
+                        placeholder="提交后系统自动生成"
+                        clearable
+                        disabled
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      class="form-item-custom !m-0 !mb-4px"
+                      :label="setLabel('姓名')"
+                      prop="personName"
+                    >
+                      <el-input
+                        class="w-100%"
+                        :readonly="!isEditing"
+                        v-model="personParam.personName"
+                        placeholder="请输入姓名"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      class="form-item-custom !m-0 !mb-4px"
+                      :label="setLabel('性别')"
+                      prop="sex"
+                    >
+                      <el-input
+                        class="w-100%"
+                        v-model="personParam.sex"
+                        placeholder="性别"
+                        readonly
+                      />
+                    </el-form-item>
+                  </div>
+                  <!-- 第二行 -->
+                  <div style="display: flex; flex-wrap: wrap; gap: 8px;">
+                    <el-form-item
+                      class="form-item-custom !m-0 !mb-4px"
+                      :label="setLabel('年龄')"
+                      prop="age"
+                    >
+                      <el-input
+                        class="w-100%"
+                        v-model="personParam.age"
+                        placeholder="年龄"
+                        readonly
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      class="form-item-id-card !m-0 !mb-4px"
+                      label="身份证号"
+                      prop="idCard"
+                    >
+                      <el-input
+                        class="w-100%"
+                        :readonly="!isEditing"
+                        v-model="personParam.idCard"
+                        placeholder="请输入身份证号"
+                        @input="handleIdCardInput"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      class="form-item-custom !m-0 !mb-4px"
+                      label="联系电话"
+                      prop="mobile"
+                    >
+                      <el-input
+                        class="w-100%"
+                        :readonly="!isEditing"
+                        v-model="personParam.mobile"
+                        placeholder="联系电话"
+                      />
+                    </el-form-item>
+                  </div>
                 </div>
               </div>
             </div>
@@ -295,62 +307,14 @@
               :style="[
                 'margin-left: 0',
                 'margin-right: 6.4px',
-                personInfoEdit ? 'background-color: #2d8cf0' : 'background-color: #c5c8cee0',
-                personInfoEdit ? 'color: rgba(255, 255, 255, 1)' : 'color: #f7f7f7',
+                'background-color: #2d8cf0',
+                'color: rgba(255, 255, 255, 1)',
                 'width: 110px'
               ]"
-              :disabled="!personInfoEdit"
-              v-show="!personInfoCustomAdd"
+              v-show="!personInfoCustomAdd && !isEditing"
             >
               <Icon :size="13.2" icon="ep:edit" class="mr-6px" />修改信息
             </el-button>
-            <el-button
-              @click="handlePersonInfoDelete"
-              :style="[
-                'margin-left: 0',
-                'margin-right: 6.4px',
-                personInfoDelete ? 'background-color: #2d8cf0' : 'background-color: #c5c8cee0',
-                personInfoDelete ? 'color: rgba(255, 255, 255, 1)' : 'color: #f7f7f7',
-                'width: 84px'
-              ]"
-              :disabled="!personInfoDelete"
-              v-show="!personInfoCustomAdd"
-            >
-              <Icon :size="13.2" icon="ep:delete" class="mr-6px" />删除
-            </el-button>
-            <el-button
-              @click="handlePersonInfoCustomAdd"
-              style="
-                margin-left: 0;
-                margin-right: 6.4px;
-                background-color: #2d8cf0;
-                color: rgba(255, 255, 255, 1);
-                width: 110px;
-              "
-              v-show="!personInfoCustomAdd"
-            >
-              <Icon :size="13.2" icon="ep:plus" class="mr-6px" />零星新增
-            </el-button>
-            <el-button
-              @click="handlePersonInfoIDCard2nd"
-              style="
-                margin-left: 0;
-                margin-right: 6.4px;
-                background-color: #2d8cf0;
-                color: rgba(255, 255, 255, 1);
-                width: 148px;
-              "
-              :loading="btnPersonInfoIDCard2ndLoading"
-              v-show="true"
-            >
-              <Icon
-                :size="13.2"
-                icon="ep:plus"
-                class="mr-6px"
-                v-show="!btnPersonInfoIDCard2ndLoading"
-              />
-              读取二代身份证
-            </el-button>
             <el-button
               @click="handlePersonInfoSave"
               style="
@@ -360,7 +324,7 @@
                 color: rgba(255, 255, 255, 1);
                 width: 110px;
               "
-              v-show="personInfoCustomAdd"
+              v-show="personInfoCustomAdd || isEditing"
             >
               <Icon :size="13.2" icon="ep:check" class="mr-6px" />保存信息
             </el-button>
@@ -373,7 +337,7 @@
                 color: rgba(255, 255, 255, 1);
                 width: 84px;
               "
-              v-show="personInfoCustomAdd"
+              v-show="personInfoCustomAdd || isEditing"
             >
               <Icon :size="13.2" icon="ep:close" class="mr-6px" />取消
             </el-button>
@@ -428,133 +392,122 @@
                       width: 88px;
                       font-size: 13.4px;
                     "
-                    v-show="personInfoCustomAdd"
+                    v-show="personInfoCustomAdd || isEditing"
                   >
                     <Icon :size="13.2" icon="ep:plus" class="mr-4px" />选择项目
                   </el-button>
+                  <el-button
+                    @click="handleDeleteSelectedItems"
+                    size="small"
+                    style="
+                      margin: 0;
+                      margin-top: -5.2px;
+                      margin-left: 9.4px;
+                      padding-top: 1.18px;
+                      padding-bottom: 0;
+                      background-color: #F56C6C;
+                      color: rgba(255, 255, 255, 1);
+                      width: 84px;
+                      font-size: 13.4px;
+                    "
+                    v-show="personInfoCustomAdd || isEditing"
+                  >
+                    <Icon :size="13.2" icon="ep:delete" class="mr-4px" />删除
+                  </el-button>
                 </template>
               </el-alert>
               <el-table
+                ref="comboInfoTableRef"
                 size="default"
                 border
-                :stripe="false"
-                :show-overflow-tooltip="true"
-                :data="projectTable"
-                v-loading="projectTableLoading"
+                :data="comboInfoTable1"
                 :header-cell-style="{
                   background: '#f8f8f9',
-                  height: '10px',
-                  color: '#333333'
+                  color: '#333333',
+                  height: '40px',
+                  fontWeight: 500
                 }"
-                :row-style="{ height: '40px' }"
-                height="max(calc(100% - 124px), 20px)"
+                :cell-style="{
+                  padding: '8px 0'
+                }"
+                height="max(50vh, 30px)"
+                @selection-change="handleComboInfoSelection"
+                style="width: 100%; table-layout: fixed;"
+                :row-class-name="getRowClassName"
               >
-                <el-table-column label="#" align="center" width="54px">
-                  <template #default="scope"> {{ scope.$index + 1 }} </template>
-                </el-table-column>
-                <el-table-column label="项目名称" min-width="200px">
+                <el-table-column 
+                  label="#" 
+                  align="center" 
+                  width="80"
+                  type="index" 
+                />
+                <el-table-column 
+                  type="selection" 
+                  align="center" 
+                  width="80"
+                />
+                <el-table-column 
+                  label="基础项目名称" 
+                  prop="name"
+                  width="180"
+                  show-overflow-tooltip
+                />
+                <el-table-column 
+                  label="科室" 
+                  prop="section"
+                  min-width="180"
+                  show-overflow-tooltip
+                />
+                <el-table-column 
+                  label="销售价（元）" 
+                  prop="price"
+                  width="140"
+                  align="right"
+                >
                   <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
+                    {{ scope.row.price?.toFixed(2) }}
                   </template>
                 </el-table-column>
-                <el-table-column label="原价" header-align="center" min-width="200px">
+                <el-table-column 
+                  label="折扣（%）" 
+                  prop="discount"
+                  width="140"
+                  align="right"
+                >
                   <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
+                    {{ scope.row.discount?.toFixed(2) }}
                   </template>
                 </el-table-column>
-                <el-table-column label="折扣" header-align="center" min-width="200px">
+                <el-table-column 
+                  label="折扣价（元）" 
+                  prop="discountPrice"
+                  width="140"
+                  align="right"
+                >
                   <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
-                <el-table-column label="折扣价" header-align="center" min-width="200px">
-                  <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
-                <el-table-column label="项目类型" header-align="center" min-width="200px">
-                  <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" header-align="center" min-width="200px">
-                  <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
+                    {{ scope.row.discountPrice?.toFixed(2) }}
                   </template>
                 </el-table-column>
+                <el-table-column 
+                  label="项目单元" 
+                  prop="moduleName"
+                  min-width="180"
+                  show-overflow-tooltip
+                />
               </el-table>
-              <div>
+              <div
+                style="display: flex; justify-content: flex-end; position: absolute; bottom: 10px; width: 100%; padding-right: 20px;"
+                v-if="comboInfoTable1 && comboInfoTable1.length > 0"
+              >
                 <Pagination
-                  :total="projectTableTotal"
-                  v-model:page="projectTable_extra.pageNumber"
-                  v-model:limit="projectTable_extra.pageSize"
-                  class="mb-0 mt-6px"
+                  size="small"
+                  layout="total,sizes, prev, pager, next"
+                  :background="false"
+                  :pager-count="4"
+                  :total="comboInfoTable1.length"
+                  v-model:page="comboInfoParam.pageNumber"
+                  v-model:limit="comboInfoParam.pageSize"
+                  class="float-none mb-2px mt-3.2px"
                 />
               </div>
             </div>
@@ -569,7 +522,7 @@
       :with-header="false"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      size="max(40.4%,694px)"
+      size="30%"
       @closed="
         () => {
           selectProjectDrawerTabName = ''
@@ -610,7 +563,7 @@
                     />
                   </el-col>
                   <el-col :span="4" class="text-right">
-                    <el-button @click="{}" type="primary" class="m-0">
+                    <el-button @click="handleComboInfoSearch" type="primary" class="m-0">
                       <Icon :size="13.2" icon="ep:search" class="mr-4px" />查询
                     </el-button>
                   </el-col>
@@ -618,64 +571,35 @@
               </el-form>
               <el-alert
                 type="info"
-                show-icon
                 :closable="false"
                 class="!w-100% !mt-10px !mb-10px !bg-[#f0faff]"
               >
                 <template #title>
                   <span style="font-size: 15.4px; font-weight: 580; color: #515a6e">
-                    已选择 {{ comboInfoSelectedData.length }} 项
+                    <!-- 移除清空按钮 -->
                   </span>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    link
-                    style="
-                      margin: 0;
-                      margin-top: -2.6px;
-                      margin-left: 3.4px;
-                      font-size: 14px;
-                      font-weight: 550;
-                    "
-                  >
-                    清空
-                  </el-button>
                 </template>
               </el-alert>
               <el-table
+                ref="comboInfoTableRef"
                 size="default"
                 border
-                :stripe="false"
-                :show-overflow-tooltip="true"
                 :data="comboInfoTable"
                 :header-cell-style="{
                   background: '#f8f8f9',
-                  height: '10px',
                   color: '#333333'
                 }"
                 :row-style="{ height: '40px' }"
                 height="max(50vh, 30px)"
+                @selection-change="handleComboInfoSelection"
               >
-                <el-table-column label="#" align="center" width="54px">
-                  <template #default="scope"> {{ scope.$index + 1 }} </template>
-                </el-table-column>
+                <el-table-column label="#" align="center" width="54px" type="index" />
                 <el-table-column type="selection" align="center" width="42px" />
-                <el-table-column label="名称" min-width="620px">
-                  <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
+                <el-table-column 
+                  label="套餐名称" 
+                  min-width="600px" 
+                  prop="examModuleName"
+                />
               </el-table>
               <div>
                 <Pagination
@@ -717,15 +641,16 @@
                         <el-option
                           v-for="(item, index) in checkInfoParam_extra.officeData"
                           :key="index"
+                          :label="item.departmentName"
                           :value="item.id"
                         >
-                          {{ item.sectionName }}
+                          {{ item.departmentName }}
                         </el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="4" class="text-right">
-                    <el-button @click="{}" type="primary" class="m-0">
+                    <el-button @click="handleCheckInfoSearch" type="primary" class="m-0">
                       <Icon :size="13.2" icon="ep:search" class="mr-4px" />查询
                     </el-button>
                   </el-col>
@@ -733,80 +658,74 @@
               </el-form>
               <el-alert
                 type="info"
-                show-icon
                 :closable="false"
                 class="!w-100% !mt-10px !mb-10px !bg-[#f0faff]"
               >
                 <template #title>
                   <span style="font-size: 15.4px; font-weight: 580; color: #515a6e">
-                    已选择 {{ checkInfoSelectedData.length }} 项
+                    <!-- 移除清空按钮 -->
                   </span>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    link
-                    style="
-                      margin: 0;
-                      margin-top: -2.6px;
-                      margin-left: 3.4px;
-                      font-size: 14px;
-                      font-weight: 550;
-                    "
-                  >
-                    清空
-                  </el-button>
                 </template>
               </el-alert>
               <el-table
                 size="default"
                 border
-                :stripe="false"
-                :show-overflow-tooltip="true"
                 :data="checkInfoTable"
                 :header-cell-style="{
                   background: '#f8f8f9',
-                  height: '10px',
                   color: '#333333'
                 }"
                 :row-style="{ height: '40px' }"
                 height="max(50vh, 30px)"
+                @selection-change="handleCheckInfoSelection"
+                style="width: 100%; table-layout: fixed;"
               >
-                <el-table-column label="#" align="center" width="54px">
-                  <template #default="scope"> {{ scope.$index + 1 }} </template>
-                </el-table-column>
-                <el-table-column type="selection" align="center" width="42px" />
-                <el-table-column label="名称" min-width="500px">
-                  <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
-                <el-table-column label="销售价（元）" header-align="center" min-width="120px">
-                  <template #default="scope">
-                    <el-row>
-                      <el-col
-                        :span="24"
-                        style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                      >
-                        姓名：{{ scope.row.personName }}
-                      </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="9">性别：{{ scope.row.sex }}</el-col>
-                      <el-col :span="9">年龄：{{ scope.row.age }}岁</el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
+                <el-table-column 
+                  label="#" 
+                  align="center" 
+                  width="50"
+                  type="index" 
+                />
+                <el-table-column 
+                  type="selection" 
+                  align="center" 
+                  width="40"
+                />
+                <el-table-column 
+                  label="名称" 
+                  prop="itemName"
+                  width="120"
+                  show-overflow-tooltip
+                />
+                <el-table-column 
+                  label="销售价（元）" 
+                  prop="price"
+                  width="100"
+                  align="right"
+                />
+                <el-table-column 
+                  label="折扣价（元）" 
+                  prop="discountedPrice"
+                  width="100"
+                  align="right"
+                />
+                <el-table-column 
+                  label="折扣百分比" 
+                  prop="discounted"
+                  width="100"
+                  align="right"
+                />
+                <el-table-column 
+                  label="单位" 
+                  prop="unit"
+                  width="80"
+                  align="center"
+                />
+                <el-table-column 
+                  label="模块单元" 
+                  prop="moduleName"
+                  min-width="120"
+                />
               </el-table>
               <div>
                 <Pagination
@@ -822,7 +741,7 @@
         </div>
         <div class="text-right">
           <el-divider class="!mt-4px !mb-11.4px" />
-          <el-button @click="{}" type="primary">确定</el-button>
+          <el-button @click="confirmSelectedProjects" type="primary">确定</el-button>
           <el-button @click="selectProjectDrawerShow = false">取消</el-button>
         </div>
       </div>
@@ -833,9 +752,14 @@
 
 <script setup lang="ts">
 import PhotographView from './PhotographView.vue'
-import { ArrowLeft, ArrowRight, Plus, Delete, ZoomIn } from '@element-plus/icons-vue'
-import { PhysicalEnrollApi } from '@/api/inspect/physicalEnroll'
+import { ArrowLeft, ArrowRight, Plus, Delete, ZoomIn, Check } from '@element-plus/icons-vue'
+import { itemsApi } from '@/api/inspect/inspectitems'
+import { PatientApi } from '@/api/inspect/inspectpatient'
+import { PatientitemsApi, PatientitemsVO } from '@/api/inspect/inspectpatientitems'
+import { ExammoduleApi } from '@/api/inspect/exammodule'
+import { DepartmentApi, DepartmentVO } from '@/api/inspect/inspectdepartment/index'
 import Viewer from 'viewerjs'
+import { debounce } from 'lodash-es'
 
 defineOptions({ name: 'PhysicalEnroll' })
 /*
@@ -847,6 +771,7 @@ defineOptions({ name: 'PhysicalEnroll' })
 /** 重要组件 **/
 const personParamRef = ref()
 const photographViewRef = ref()
+const comboInfoTableRef = ref()
 
 /** 数据结构 **/
 const message = useMessage()
@@ -855,9 +780,33 @@ const checkPersonLoading = ref(false)
 const personInfoEdit = ref(false)
 const personInfoDelete = ref(false)
 const personInfoCustomAdd = ref(false)
+const isEditing = ref(false)
 const btnPersonInfoIDCard2ndLoading = ref(false)
 const selectProjectDrawerShow = ref(false)
 const selectProjectDrawerTabName = ref('comboInfo')
+
+// 添加表单验证规则
+const formRules = {
+  personName: [
+    { required: true, message: '请输入姓名', trigger: 'blur' }
+  ],
+  idCard: [
+    { required: true, message: '请输入身份证号', trigger: 'blur' },
+    { 
+      pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, 
+      message: '请输入正确的身份证号码', 
+      trigger: 'blur' 
+    }
+  ],
+  mobile: [
+    { 
+      pattern: /^1[3-9]\d{9}$/, 
+      message: '请输入正确的手机号码', 
+      trigger: 'blur' 
+    }
+  ]
+}
+
 //表单核心
 const searchForm = ref<any>({
   pageNumber: 1,
@@ -865,12 +814,12 @@ const searchForm = ref<any>({
   personName: ''
 })
 const searchForm_extra = ref<any>({
-  passStatus: '0'
+  passStatus: '1'
 })
 const personParam = ref<any>({
   avatar: ''
 })
-const comboInfoParam = ref<any>({
+const comboInfoParam = ref({
   pageNumber: 1,
   pageSize: 10,
   query: ''
@@ -882,21 +831,11 @@ const checkInfoParam = ref<any>({
   officeId: ''
 })
 const checkInfoParam_extra = ref<any>({
-  officeData: [
-    { id: 'aa', sectionName: 'aa1' },
-    { id: 'bb', sectionName: 'aa2' },
-    { id: 'cc', sectionName: 'aa3' }
-  ]
+  officeData: [] // 初始化为空数组
 })
 //表格核心
-const personData = ref<any[]>([
-  { id: '11111111111111111', personName: '1尼格买提·热合曼adqweqfqf', sex: '男', age: '28' },
-  { id: '22222222', personName: '2尼格买提·热合曼adqweqfqf', sex: '男', age: '29' },
-  { id: '33333333', personName: '3尼格买提·热合曼adqweqfqf', sex: '男', age: '30' },
-  { id: '44444444', personName: '4尼格买提·热合曼adqweqfqf', sex: '男', age: '31' }
-])
-const isRadioChecked = ref('')
-const personTotal = ref(100)
+const personData = ref<any[]>([])
+const personTotal = ref(0)
 const projectTable = ref<any[]>([{}, {}, {}, {}])
 const projectTable_extra = ref<any>({
   pageNumber: 1,
@@ -904,10 +843,11 @@ const projectTable_extra = ref<any>({
 })
 const projectTableLoading = ref(false)
 const projectTableTotal = ref(100)
-const comboInfoTable = ref<any[]>([{}, {}, {}, {}])
-const comboInfoSelectedData = ref<any[]>([{}, {}, {}, {}])
-const comboInfoTableTotal = ref(100)
-const checkInfoTable = ref<any[]>([{}, {}, {}, {}])
+const comboInfoTable = ref([])
+const comboInfoTable1 = ref<ProjectDetail[]>([])
+const comboInfoTableTotal = ref(0)
+const comboInfoSelectedData = ref([])
+const checkInfoTable = ref<any[]>([])
 const checkInfoSelectedData = ref<any[]>([{}, {}, {}, {}])
 const checkInfoTableTotal = ref(100)
 
@@ -918,17 +858,24 @@ const expand = ref(true)
 const expandIcon = ref('ArrowLeft')
 const leftSpan = ref('width: 380px;')
 const rightSpan = ref('position: relative;width: calc(100% - 404px);')
+const rightContentVisible = ref(true)
 const changeExpand = () => {
   expand.value = !expand.value
   if (expand.value) {
     expandIcon.value = 'ArrowLeft'
     leftSpan.value = 'width: 380px;'
-    rightSpan.value = 'position: relative;width: calc(100% - 404px);'
+    rightSpan.value = 'position: relative;width: calc(100% - 404px); display: block !important;'
   } else {
     expandIcon.value = 'ArrowRight'
     leftSpan.value = 'width: 0px;'
-    rightSpan.value = 'position: relative;width: calc(100% - 24px);'
+    rightSpan.value = 'position: relative; width: calc(100% - 24px); display: block !important;'
   }
+  
+  // 强制重新渲染
+  rightContentVisible.value = false
+  nextTick(() => {
+    rightContentVisible.value = true
+  })
 }
 
 /** 组件事件 **/
@@ -961,17 +908,38 @@ const handlePhotographRemove = () => {
   personParam.value.avatar = ''
 }
 
-const handlePersonInfoEdit = () => {}
-
-const handlePersonInfoDelete = () => {}
+const handlePersonInfoEdit = () => {
+  if (!selectedPatient.value) {
+    message.warning('请先在左侧选择一名患者')
+    return
+  }
+  isEditing.value = true
+}
 
 const handlePersonInfoCustomAdd = () => {
   personInfoCustomAdd.value = true
+  isEditing.value = true
+  // 清空表单数据，准备新增
+  personParam.value = { 
+    avatar: '',
+    testNum: '',
+    personName: '',
+    sex: '',
+    age: '',
+    idCard: '',
+    mobile: ''
+  }
+  comboInfoTable1.value = []
+  // 取消当前选中的患者
+  selectedPatient.value = null
 }
 
 const handlePersonInfoIDCard2nd = () => {
   btnPersonInfoIDCard2ndLoading.value = true
-  if (!personInfoCustomAdd.value) personInfoCustomAdd.value = true
+  if (!personInfoCustomAdd.value) {
+    personInfoCustomAdd.value = true
+    isEditing.value = true
+  }
   setTimeout(() => {
     nextTick(() => {
       btnPersonInfoIDCard2ndLoading.value = false
@@ -979,10 +947,110 @@ const handlePersonInfoIDCard2nd = () => {
   }, 2600)
 }
 
-const handlePersonInfoSave = () => {}
+const handlePersonInfoSave = async () => {
+  try {
+    // 表单验证
+    await personParamRef.value.validate()
+    
+    // 准备患者数据
+    const patientData: PatientVO = {
+      id: selectedPatient.value?.id, // 如果是编辑模式，保留原ID
+      medicalSn: personParam.value.testNum,
+      pname: personParam.value.personName,
+      gender: personParam.value.sex,
+      birthday: calculateBirthdayFromIdCard(personParam.value.idCard),
+      cardType: '身份证',
+      cardId: personParam.value.idCard,
+      phoneNum: personParam.value.mobile,
+      status: 0, // 患者登记状态
+      headPicUrl: personParam.value.avatar,
+      medicalDateTime: new Date().getTime() // 修改为时间戳
+    }
+    
+    let result
+    if (selectedPatient.value?.id) {
+      // 更新现有患者
+      result = await PatientApi.updatePatient(patientData)
+    } else {
+      // 创建新患者
+      result = await PatientApi.createPatient(patientData)
+    }
+    
+    if (result) {
+      // 保存患者项目
+      if (comboInfoTable1.value.length > 0) {
+        const saveItems: PatientitemsVO[] = comboInfoTable1.value.map(item => ({
+          medicalSn: personParam.value.testNum,
+          itemName: item.name,
+          itemCode: item.itemCode,
+          price: item.price,
+          discountedPrice: item.discountPrice,
+          discounted: item.discount,
+          sectionID: item.section,
+          itemStatus: '0',
+          createTime: new Date().getTime() // 修改为时间戳
+        }))
+        
+        await PatientitemsApi.createPatientitemsBatch(saveItems)
+      }
+      
+      message.success('保存成功')
+      personInfoCustomAdd.value = false
+      isEditing.value = false
+      
+      // 刷新患者列表
+      getPatientData()
+    }
+  } catch (error) {
+    console.error('保存失败:', error)
+    if (error === 'validate') {
+      message.warning('请完善表单信息')
+    } else {
+      message.error('保存失败')
+    }
+  }
+}
+
+// 从身份证号计算出生日期
+const calculateBirthdayFromIdCard = (idCard: string): Date => {
+  if (!idCard || idCard.length < 15) return new Date()
+  
+  let birthYear, birthMonth, birthDay
+  
+  // 处理18位和15位身份证
+  if (idCard.length === 18) {
+    birthYear = idCard.substring(6, 10)
+    birthMonth = idCard.substring(10, 12)
+    birthDay = idCard.substring(12, 14)
+  } else {
+    // 15位身份证，出生年份是19XX年
+    birthYear = '19' + idCard.substring(6, 8)
+    birthMonth = idCard.substring(8, 10)
+    birthDay = idCard.substring(10, 12)
+  }
+  
+  return new Date(`${birthYear}-${birthMonth}-${birthDay}`)
+}
 
 const handlePersonInfoCancel = () => {
   personInfoCustomAdd.value = false
+  isEditing.value = false
+  // 如果有选中的患者，恢复其数据
+  if (selectedPatient.value) {
+    handlePatientSelect(selectedPatient.value)
+  } else {
+    // 否则清空表单
+    personParam.value = { 
+      avatar: '',
+      testNum: '',
+      personName: '',
+      sex: '',
+      age: '',
+      idCard: '',
+      mobile: ''
+    }
+    comboInfoTable1.value = []
+  }
 }
 
 const handlePersonInfoPrintInspection = () => {
@@ -990,10 +1058,477 @@ const handlePersonInfoPrintInspection = () => {
   personInfoEdit.value = !personInfoEdit.value
 }
 
+/** 获取患者列表数据 **/
+const getPatientData = async () => {
+  try {
+    checkPersonLoading.value = true
+    const params = {
+      pageNo: searchForm.value.pageNumber,
+      pageSize: searchForm.value.pageSize,
+      // 只有当有输入时才加入姓名查询条件
+      ...(searchForm.value.personName && { pname: searchForm.value.personName })
+    }
+    
+    const res = await PatientApi.getPatientPage(params)
+    personData.value = res.list.map(item => ({
+      id: item.id,
+      medicalSn: item.medicalSn,
+      personName: item.pname,
+      sex: item.gender,
+      age: calculateAge(item.birthday),
+      cardId: item.cardId,
+      mobile: item.phoneNum,
+      avatar: item.headPicUrl,
+      physicalType: item.chargeType,
+      status: item.status
+    }))
+    personTotal.value = res.total || 0
+  } catch (error) {
+    console.error('获取患者数据出错:', error)
+    message.error('获取患者数据出错')
+    personData.value = []
+    personTotal.value = 0
+  } finally {
+    checkPersonLoading.value = false
+  }
+}
+
+// 计算年龄的辅助函数
+const calculateAge = (birthday) => {
+  if (!birthday) return ''
+  const birthDate = new Date(birthday)
+  const today = new Date()
+  let age = today.getFullYear() - birthDate.getFullYear()
+  const monthDiff = today.getMonth() - birthDate.getMonth()
+  if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) {
+    age--
+  }
+  return age.toString()
+}
+
+// 使用防抖处理搜索
+const debouncedSearch = debounce(() => {
+  searchForm.value.pageNumber = 1
+  getPatientData()
+}, 300)
+
+// 修改监听函数，使用防抖
+watch(() => searchForm.value.personName, () => {
+  debouncedSearch()
+})
+
+// 监听分页变化
+watch(() => [searchForm.value.pageNumber, searchForm.value.pageSize], () => {
+  getPatientData()
+})
+
+// 监听查询条件变化
+watch(() => searchForm_extra.value.passStatus, () => {
+  searchForm.value.pageNumber = 1
+  getPatientData()
+})
+
+// 添加选中患者的 ref
+const selectedPatient = ref(null)
+
+// 修改加载患者项目的方法，减少不必要的API请求
+const loadPatientProjects = async (medicalSn) => {
+  if (!medicalSn) {
+    comboInfoTable1.value = []
+    return
+  }
+
+  try {
+    // 获取患者的体检项目
+    const patientItemsRes = await PatientitemsApi.getPatientitemsPage({
+      medicalSn: medicalSn,
+      pageNo: 1,
+      pageSize: 100
+    })
+
+    if (!patientItemsRes?.list?.length) {
+      comboInfoTable1.value = []
+      return
+    }
+
+    // 直接从API返回的数据构建项目列表，不再查询项目详情
+    const projectDetails: ProjectDetail[] = patientItemsRes.list.map(item => ({
+      name: item.itemName,
+      price: item.price || 0,
+      discount: item.discounted || 0,
+      discountPrice: item.discountedPrice || 0,
+      moduleName: item.moduleName || '',
+      section: item.sectionID || '',
+      itemCode: item.itemCode
+    }))
+
+    // 强制更新视图
+    comboInfoTable1.value = []
+    nextTick(() => {
+      comboInfoTable1.value = projectDetails
+    })
+  } catch (error) {
+    console.error('加载患者体检项目失败:', error)
+    ElMessage.error('加载患者体检项目失败')
+    comboInfoTable1.value = []
+  }
+}
+
+// 修改选择患者的处理方法
+const handlePatientSelect = async (row) => {
+  try {
+    console.log('选中患者:', row) // 添加调试日志
+    
+    // 如果点击的是当前选中行，则取消选中并清空右侧页面
+    if (selectedPatient.value?.id === row.id) {
+      selectedPatient.value = null
+      personParam.value = { 
+        avatar: '',
+        testNum: '',
+        personName: '',
+        sex: '',
+        age: '',
+        idCard: '',
+        mobile: ''
+      }
+      comboInfoTable1.value = []
+      return
+    }
+
+    // 设置新选中的患者
+    selectedPatient.value = row
+    
+    // 获取患者详情
+    const res = await PatientApi.getPatient(row.id)
+    console.log('获取到患者详情:', res) // 添加调试日志
+    
+    if (res) {
+      personParam.value = {
+        testNum: res.medicalSn || '',
+        idCard: res.cardId || '',
+        personName: res.pname || '',
+        sex: res.gender || '',
+        age: calculateAge(res.birthday) || '',
+        mobile: res.phoneNum || '',
+        avatar: res.headPicUrl || '',
+        physicalType: res.chargeType || ''
+      }
+      
+      personInfoEdit.value = true
+      personInfoDelete.value = true
+      isEditing.value = false
+      
+      // 如果有体检编号，加载体检项目
+      if (res.medicalSn) {
+        console.log('开始加载患者体检项目, 体检编号:', res.medicalSn) // 添加调试日志
+        await loadPatientProjects(res.medicalSn)
+      } else {
+        console.log('患者没有体检编号，不加载项目') // 添加调试日志
+        comboInfoTable1.value = []
+      }
+    }
+  } catch (error) {
+    console.error('获取患者详情失败:', error)
+    ElMessage.error('获取患者详情失败')
+    selectedPatient.value = null
+    // 确保出错时也有默认值
+    personParam.value = { 
+      avatar: '',
+      testNum: '',
+      personName: '',
+      sex: '',
+      age: '',
+      idCard: '',
+      mobile: ''
+    }
+    comboInfoTable1.value = []
+  }
+}
+
+/** 获取套餐项目数据 **/
+const getComboInfoData = async () => {
+  try {
+    const params = {
+      pageNo: comboInfoParam.value.pageNumber,
+      pageSize: comboInfoParam.value.pageSize,
+      examModuleName: comboInfoParam.value.query || undefined
+    }
+    
+    const res = await ExammoduleApi.getExammodulePage(params)
+    
+    // 对数据进行去重处理
+    const uniqueData = []
+    const seenNames = new Set()
+    
+    res.list.forEach(item => {
+      if (!seenNames.has(item.examModuleName)) {
+        seenNames.add(item.examModuleName)
+        uniqueData.push(item)
+      }
+    })
+    
+    // 使用去重后的数据
+    comboInfoTable.value = uniqueData
+    comboInfoTableTotal.value = uniqueData.length // 更新总数为去重后的数量
+  } catch (error) {
+    console.error('获取套餐数据出错:', error)
+    comboInfoTable.value = []
+    comboInfoTableTotal.value = 0
+  }
+}
+
+// 确保在组件挂载和抽屉打开时都调用
+onMounted(() => {
+  getComboInfoData()
+  
+  // 初始化右侧表单数据，确保有默认值
+  personParam.value = {
+    avatar: '',
+    testNum: '',
+    personName: '',
+    sex: '',
+    age: '',
+    idCard: '',
+    mobile: ''
+  }
+  
+  // 确保表格数据初始化
+  comboInfoTable1.value = []
+})
+
+watch(() => selectProjectDrawerShow.value, (newVal) => {
+  if (newVal) {
+    getComboInfoData()
+  }
+})
+
+// 处理套餐搜索
+const handleComboInfoSearch = () => {
+  comboInfoParam.value.pageNumber = 1
+  getComboInfoData()
+}
+
+// 选中套餐项目
+const handleComboInfoSelection = (selection) => {
+  console.log('套餐选择变化:', selection) // 添加调试日志
+  comboInfoSelectedData.value = selection
+}
+
+/** 获取检查项目数据 **/
+const getCheckInfoData = async () => {
+  try {
+    const queryParams: any = {
+      pageNum: checkInfoParam.value.pageNumber,
+      pageSize: checkInfoParam.value.pageSize
+    }
+    
+    // 添加项目名称查询条件
+    const keyword = checkInfoParam.value.query?.trim()
+    if (keyword) {
+      queryParams.itemName = keyword
+    }
+    
+    // 添加科室查询条件
+    if (checkInfoParam.value.officeId) {
+      queryParams.sectionID = checkInfoParam.value.officeId
+    }
+
+    const res = await itemsApi.getitemsPage(queryParams)
+    if (res) {
+      checkInfoTable.value = res.list || []
+      checkInfoTableTotal.value = res.total || 0
+    }
+  } catch (error) {
+    console.error('获取检查项目数据出错:', error)
+    message.error('获取检查项目数据失败')
+    checkInfoTable.value = []
+    checkInfoTableTotal.value = 0
+  }
+}
+
+// 获取科室列表
+const getDepartmentList = async () => {
+  try {
+    const data = await DepartmentApi.getListDepartment()
+    checkInfoParam_extra.value.officeData = data.map((item: DepartmentVO) => ({
+      id: item.departmentCode,
+      departmentName: item.departmentName
+    }))
+  } catch (error) {
+    console.error('获取科室列表失败:', error)
+    message.error('获取科室列表失败')
+  }
+}
+
+// 处理检查项目搜索
+const handleCheckInfoSearch = () => {
+  checkInfoParam.value.pageNumber = 1
+  getCheckInfoData()
+}
+
+// 选中检查项目
+const handleCheckInfoSelection = (selection) => {
+  console.log('检查项目选择变化:', selection) // 添加调试日志
+  checkInfoSelectedData.value = selection
+}
+
+// 修复确认选择项目的方法 - 只在UI中添加项目，不保存到数据库
+const confirmSelectedProjects = async () => {
+  try {
+    let selectedProjects: ProjectDetail[] = []
+    // 创建一个Set来跟踪已处理的itemCode
+    const processedItemCodes = new Set()
+    
+    // 先将现有项目的itemCode添加到Set中
+    comboInfoTable1.value.forEach(item => {
+      processedItemCodes.add(item.itemCode)
+    })
+    
+    console.log('现有项目的itemCode:', Array.from(processedItemCodes))
+    
+    if (selectProjectDrawerTabName.value === 'comboInfo') {
+      // 处理套餐项目
+      for (const combo of comboInfoSelectedData.value) {
+        try {
+          console.log('处理选中的套餐:', combo)
+          
+          // 获取套餐下的所有项目
+          const moduleItems = await ExammoduleApi.getListExammodule()
+          // 过滤出当前套餐的项目
+          const filteredItems = moduleItems.filter(item => 
+            item.examModuleID === combo.examModuleID
+          )
+          
+          console.log('当前套餐的项目:', filteredItems)
+          
+          // 逐个处理套餐中的项目
+          for (const moduleItem of filteredItems) {
+            // 如果已经处理过这个itemCode，跳过
+            if (processedItemCodes.has(moduleItem.itemCode)) {
+              console.log(`项目 ${moduleItem.itemCode} 已存在，跳过`)
+              continue
+            }
+            
+            try {
+              // 使用itemCode查询项目详情
+              console.log('查询项目详情，itemCode:', moduleItem.itemCode)
+              
+              // 获取项目详情 - 使用自定义方法通过itemCode查询
+              const itemDetail = await getItemDetailByCode(moduleItem.itemCode)
+              console.log('获取到项目详情:', itemDetail)
+              
+              // 添加到已处理集合
+              processedItemCodes.add(moduleItem.itemCode)
+              
+              if (itemDetail) {
+                // 使用获取到的项目详情
+                selectedProjects.push({
+                  name: itemDetail.itemName,
+                  section: itemDetail.section || '',
+                  price: itemDetail.price || 0,
+                  discount: itemDetail.discounted || 0,
+                  discountPrice: itemDetail.discountedPrice || 0,
+                  moduleName: itemDetail.moduleName || moduleItem.examModuleName,
+                  itemCode: moduleItem.itemCode
+                })
+              } else {
+                // 如果获取不到项目详情，使用套餐项目数据
+                selectedProjects.push({
+                  name: moduleItem.examModuleName,
+                  section: '',
+                  price: 0,
+                  discount: 0,
+                  discountPrice: 0,
+                  moduleName: moduleItem.examModuleName,
+                  itemCode: moduleItem.itemCode
+                })
+              }
+            } catch (itemError) {
+              console.error('处理项目失败:', itemError)
+              // 出错时也尝试添加项目，使用套餐数据
+              if (!processedItemCodes.has(moduleItem.itemCode)) {
+                processedItemCodes.add(moduleItem.itemCode)
+                selectedProjects.push({
+                  name: moduleItem.examModuleName,
+                  section: '',
+                  price: 0,
+                  discount: 0,
+                  discountPrice: 0,
+                  moduleName: moduleItem.examModuleName,
+                  itemCode: moduleItem.itemCode
+                })
+              }
+            }
+          }
+        } catch (comboError) {
+          console.error('处理套餐失败:', comboError)
+        }
+      }
+    } else if (selectProjectDrawerTabName.value === 'checkInfo') {
+      // 直接处理已选中的项目
+      for (const item of checkInfoSelectedData.value) {
+        // 如果已经处理过这个itemCode，跳过
+        if (processedItemCodes.has(item.itemCode)) {
+          console.log(`项目 ${item.itemCode} 已存在，跳过`)
+          continue
+        }
+        
+        // 添加到已处理集合
+        processedItemCodes.add(item.itemCode)
+        
+        selectedProjects.push({
+          name: item.itemName,
+          section: item.section,
+          price: item.price,
+          discount: item.discounted,
+          discountPrice: item.discountedPrice,
+          moduleName: item.moduleName,
+          itemCode: item.itemCode
+        })
+      }
+    }
+    
+    console.log('最终要添加的项目:', selectedProjects)
+    
+    if (selectedProjects.length > 0) {
+      // 只添加到前端表格，不保存到数据库
+      comboInfoTable1.value = [...comboInfoTable1.value, ...selectedProjects]
+      message.success(`成功添加${selectedProjects.length}个新项目`)
+    } else {
+      message.warning('选择的项目已存在，无需重复添加')
+    }
+    
+    selectProjectDrawerShow.value = false
+  } catch (error) {
+    console.error('添加项目失败:', error)
+    message.error('添加项目失败')
+  }
+}
+
+// 添加通过itemCode查询项目详情的方法
+const getItemDetailByCode = async (itemCode) => {
+  try {
+    // 先获取所有项目
+    const allItems = await itemsApi.getitemsPage({
+      pageNum: 1,
+      pageSize: 100
+    })
+    
+    // 查找匹配itemCode的项目
+    const item = allItems.list.find(item => item.itemCode === itemCode)
+    return item || null
+  } catch (error) {
+    console.error('通过itemCode查询项目详情失败:', error)
+    return null
+  }
+}
+
 /** 钩子方法 **/
-onMounted(async () => {
-  //personData.value = []
-  console.log(PhysicalEnrollApi)
+onMounted(() => {
+  // 获取科室列表
+  getDepartmentList()
+  // 获取患者数据
+  getPatientData()
 })
 
 /** 防空作用域 **/
@@ -1004,6 +1539,132 @@ onMounted(async () => {
  * 备注：
  *
  * **/
+
+// 计算当前页的起始序号
+const startIndex = computed(() => {
+  return (checkInfoParam.value.pageNumber - 1) * checkInfoParam.value.pageSize + 1
+})
+
+// 添加接口定义
+interface ProjectDetail {
+  name: string
+  price: number
+  discount: number
+  discountPrice: number
+  moduleName: string
+  section: string
+  itemCode: string
+}
+
+// 添加删除选中项目的方法
+const handleDeleteSelectedItems = async () => {
+  try {
+    // 获取表格选中的行
+    const selectedRows = comboInfoTableRef.value?.getSelectionRows()
+    
+    if (!selectedRows?.length) {
+      message.warning('请先选择要删除的项目')
+      return
+    }
+
+    // 确认删除
+    await ElMessageBox.confirm('确定要删除选中的项目吗?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+
+    // 从表格数据中移除选中项
+    const selectedIds = selectedRows.map(row => row.itemCode)
+    comboInfoTable1.value = comboInfoTable1.value.filter(
+      item => !selectedIds.includes(item.itemCode)
+    )
+
+    message.success(`成功删除${selectedRows.length}个项目`)
+  } catch (error) {
+    if (error !== 'cancel') {
+      console.error('删除项目失败:', error)
+      message.error('删除项目失败')
+    }
+  }
+}
+
+// 添加身份证输入处理函数
+const handleIdCardInput = (value) => {
+  if (!value || value.length < 15) return
+  
+  // 验证身份证格式
+  const idCardRegex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+  if (!idCardRegex.test(value)) {
+    return
+  }
+  
+  // 生成体检编号：当前时间戳 + 身份证后四位
+  const timestamp = new Date().getTime().toString()
+  const idCardLast4 = value.slice(-4)
+  personParam.value.testNum = timestamp + idCardLast4
+  
+  // 计算性别：身份证第17位，奇数为男，偶数为女
+  if (value.length >= 17) {
+    const genderBit = parseInt(value.charAt(16))
+    personParam.value.sex = genderBit % 2 === 1 ? '男' : '女'
+  }
+  
+  // 计算年龄：根据身份证出生日期
+  if (value.length >= 14) {
+    try {
+      let birthYear, birthMonth, birthDay
+      
+      // 处理18位和15位身份证
+      if (value.length === 18) {
+        birthYear = value.substring(6, 10)
+        birthMonth = value.substring(10, 12)
+        birthDay = value.substring(12, 14)
+      } else {
+        // 15位身份证，出生年份是19XX年
+        birthYear = '19' + value.substring(6, 8)
+        birthMonth = value.substring(8, 10)
+        birthDay = value.substring(10, 12)
+      }
+      
+      const birthDate = new Date(`${birthYear}-${birthMonth}-${birthDay}`)
+      const today = new Date()
+      
+      let age = today.getFullYear() - birthDate.getFullYear()
+      const monthDiff = today.getMonth() - birthDate.getMonth()
+      
+      // 如果还没过生日，年龄减1
+      if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) {
+        age--
+      }
+      
+      personParam.value.age = age.toString()
+    } catch (error) {
+      console.error('计算年龄出错:', error)
+    }
+  }
+}
+
+// 添加行类名方法
+const getRowClassName = ({ row }) => {
+  // 如果处于编辑/新增模式，添加禁用样式
+  return personInfoCustomAdd.value ? 'disabled-row' : ''
+}
+
+// 确保表格分页参数正确
+watch(() => [comboInfoParam.value.pageNumber, comboInfoParam.value.pageSize], () => {
+  // 强制刷新表格视图
+  const temp = [...comboInfoTable1.value]
+  comboInfoTable1.value = []
+  nextTick(() => {
+    comboInfoTable1.value = temp
+  })
+})
+
+// 计算属性：是否可以编辑
+const isEditable = computed(() => {
+  return personInfoCustomAdd.value || isEditing.value
+})
 </script>
 
 <style lang="scss" scoped>
@@ -1091,4 +1752,139 @@ onMounted(async () => {
     }
   }
 }
+
+// 添加禁用行的样式
+:deep(.disabled-row) {
+  cursor: not-allowed !important;
+  opacity: 0.6;
+  pointer-events: none;
+}
+
+// 移除之前的选中行样式
+// :deep(.el-table__row.current-row) {
+//   background-color: #ecf5ff !important;
+// }
+
+.physicalRegister {
+  width: 100%;
+  height: 100%;
+}
+
+.expandCenter {
+  width: 24px;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f0f2f5;
+}
+
+.expandCenter .icon {
+  width: 24px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  border-radius: 4px;
+}
+
+.expandCenter .icon:hover {
+  background-color: #e6e8eb;
+}
+
+.pic {
+  width: 120px;
+  height: 150px;
+  margin-right: 15px;
+}
+
+.pic-box {
+  width: 100%;
+  height: 100%;
+  border: 1px dashed #dcdee2;
+  border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  position: relative;
+}
+
+.demo-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 4px;
+}
+
+.pic-box:hover .demo-upload-list-cover {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+}
+
+/* 调整表单布局样式 */
+.el-form-item {
+  margin-bottom: 8px !important;
+  white-space: nowrap;
+}
+
+.el-input {
+  width: 100%;
+}
+
+/* 确保输入框不会换行 */
+.el-input__inner {
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 调整表单项间距 */
+.el-form--inline .el-form-item {
+  margin-right: 8px;
+}
+
+/* 自定义表单项宽度 */
+.form-item-custom {
+  width: 180px;
+}
+
+/* 体检编号表单项宽度 */
+.form-item-test-num {
+  width: 240px; /* 更宽以适应体检编号 */
+}
+
+/* 身份证号表单项宽度 */
+.form-item-id-card {
+  width: 240px; /* 更宽以适应身份证号 */
+}
+
+/* 确保身份证号输入框不换行 */
+.form-item-id-card .el-input__inner,
+.form-item-test-num .el-input__inner {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 调整标签宽度 */
+.el-form-item__label {
+  width: 72px !important;
+}
+
+/* 确保表单项内容区域宽度适应内容 */
+.form-item-custom .el-form-item__content,
+.form-item-id-card .el-form-item__content,
+.form-item-test-num .el-form-item__content {
+  width: calc(100% - 72px);
+}
 </style>