diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
index f74c4cc6..c42c6969 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
@@ -179,7 +179,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
 
         // 分页查询
         IPage<DiagnosisTreatmentDto> diseaseTreatmentPage =
-            activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<>(pageNo, pageSize), queryWrapper);
+            activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<DiagnosisTreatmentDto>(pageNo, pageSize), queryWrapper);
 
         diseaseTreatmentPage.getRecords().forEach(e -> {
             // 医保标记枚举类回显赋值
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
index 8789c77e..3ba85325 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
@@ -4,35 +4,6 @@
     <select id="getDiseaseTreatmentPage" parameterType="java.util.Map"
             resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
 
-        SELECT
-        T3.id,
-        T3.category_code,
-        T3.bus_no,
-        T3.name,
-        T3.py_str,
-        T3.wb_str,
-        T3.type_enum,
-        T3.permitted_unit_code,
-        T3.org_id,
-        T3.location_id,
-        T3.yb_flag,
-        T3.yb_no,
-        T3.yb_match_flag,
-        T3.status_enum,
-        T3.body_site_code,
-        T3.specimen_code,
-        T3.description_text,
-        T3.rule_id,
-        T3.tenant_id,
-        T3.item_type_code,
-        T3.yb_type,
-        T3.retail_price,
-        T3.maximum_retail_price,
-        T3.chrgitm_lv,--医保等级
-        T3.children_json,--子项json
-        T3.pricing_flag--划价标记
-        FROM
-        (
         SELECT
         T1.id,
         T1.category_code,
@@ -57,24 +28,28 @@
         T2.type_code as item_type_code,
         T2.yb_type,
         T2.price as retail_price,--零售价
-        (   SELECT T4.amount
-        FROM adm_charge_item_definition T5
-        LEFT JOIN  adm_charge_item_def_detail T4 ON  T4.definition_id = T5.id
-        WHERE   T4.condition_code = '4'--4:限制
-        AND T5.instance_id = T1.id
-        AND T5.instance_table = 'wor_activity_definition'
-        ) as maximum_retail_price,--最高零售价
+        T4.amount as maximum_retail_price,--最高零售价
         T1.children_json,--子项json
         T1.pricing_flag--划价标记
         FROM wor_activity_definition T1
         LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id
+        LEFT JOIN adm_charge_item_definition T5 ON T5.instance_id = T1.id AND T5.instance_table = 'wor_activity_definition'
+        LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id AND T4.condition_code = '4'--4:限制
         <where>
             T1.delete_flag = '0'
-            AND  T2.instance_table = 'wor_activity_definition'
+            AND T2.instance_table = 'wor_activity_definition'
+            <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+                <choose>
+                    <when test="ew.customSqlSegment.contains('tenant_id')">
+                        ${ew.customSqlSegment.replaceFirst('tenant_id', 'T1.tenant_id').replaceFirst('WHERE', 'AND')}
+                    </when>
+                    <otherwise>
+                        ${ew.customSqlSegment.replaceFirst('WHERE', 'AND')}
+                    </otherwise>
+                </choose>
+            </if>
         </where>
         ORDER BY T1.bus_no DESC
-        ) AS T3
-        ${ew.customSqlSegment}
 
     </select>
 
diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue
index f2809c8c..57e92951 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue
@@ -49,13 +49,17 @@
         </div>
         <div class="filter-item">
           <label>科室：</label>
-          <select>
-            <option value="">请选择科室</option>
-            <option value="内科">内科</option>
-            <option value="儿科">儿科</option>
-            <option value="外科">外科</option>
-            <option value="妇科">妇科</option>
-          </select>
+          <el-tree-select
+                 placeholder="请选择科室"
+                 :data="departments"
+                 :props="{
+                   value: 'name',
+                   label: 'name',
+                   children: 'children'
+                 }"
+                 value-key="name"
+                 style="width: 100%;"
+               />
         </div>
         <div class="filter-item">
           <label>用户：</label>
@@ -140,9 +144,10 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
-import { useRouter } from 'vue-router';
+import { ref, reactive, computed, onMounted } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
 import { Edit, View, Delete } from '@element-plus/icons-vue';
+import { getLocationTree } from '@/views/charge/outpatientregistration/components/outpatientregistration';
 
 // 创建路由实例
 const router = useRouter();
@@ -150,6 +155,46 @@ const router = useRouter();
 // 侧边栏状态
 const sidebarActive = ref(false);
 
+// 科室数据
+const departments = ref([]);
+
+// 获取科室数据 - 与门诊挂号页面保持一致
+function getDepartmentList() {
+  console.log('调用getLocationTree API...');
+  getLocationTree().then((response) => {
+    console.log('getLocationTree API完整返回:', response);
+    console.log('getLocationTree API数据结构:', JSON.stringify(response.data, null, 2));
+    
+    // 检查数据结构并转换为适合el-tree-select的格式
+    if (Array.isArray(response.data)) {
+      // 直接使用数组数据
+      departments.value = response.data;
+    } else if (response.data && response.data.records) {
+      // 处理分页格式数据
+      departments.value = response.data.records;
+    } else if (response.data && response.data.rows) {
+      // 处理另一种分页格式数据
+      departments.value = response.data.rows;
+    } else {
+      console.error('API返回数据格式不符合预期:', response.data);
+      departments.value = [];
+    }
+    
+    console.log('最终科室数据:', JSON.stringify(departments.value, null, 2));
+  }).catch((error) => {
+    console.error('获取科室数据失败:', error);
+    departments.value = [];
+  });
+}
+
+// 获取科室数据 - 与门诊挂号页面保持一致，在组件初始化时直接调用
+getDepartmentList();
+
+// 初始化数据
+onMounted(() => {
+  // 其他初始化逻辑
+});
+
 // 表格数据
 const tableData = ref([
   {id: 2348, hospital: '演示医院', date: '2025-11-17', name: '血脂333', type: '检验套餐', level: '全院套餐', dept: '', user: '', amount: 40.00, fee: 0.00, total: 40.00, combined: '否', display: '是', enabled: '是', operator: '徐斌'},
diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
index bebe9a6b..4cd87a8b 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
@@ -27,6 +27,10 @@
           </button>
         </div>
         <div class="table-container">
+          <!-- 调试按钮 -->
+          <div style="margin-bottom: 10px;">
+            <el-button @click="debugDepartments">调试科室数据</el-button>
+          </div>
           <table class="data-table">
             <thead>
               <tr>
@@ -64,16 +68,22 @@
                 </td>
                 <td>
                   <template v-if="editingRowId === row.id">
-                    <select v-model="row.department" :style="inputStyle">
-                      <option 
-                        v-for="dept in departments" 
-                        :key="dept" 
-                        :value="dept"
-                      >
-                        {{ dept }}
-                      </option>
-                    </select>
-                  </template>
+                      <el-tree-select
+                      v-model="row.department"
+                      :data="departments"
+                      :props="{
+                        value: 'name',
+                        label: 'name',
+                        children: 'children',
+                      }"
+                      value-key="name"
+                      placeholder="请选择科室"
+                      check-strictly
+                      :expand-on-click-node="false"
+                      clearable
+                      style="width: 100%;"
+                    />
+                    </template>
                   <template v-else>
                     {{ row.department }}
                   </template>
@@ -184,16 +194,91 @@
               <tr 
                 v-for="(item, index) in inspectionItems" 
                 :key="item.id"
+                :class="{ 'editing': editingRowId === item.id }"
               >
                 <td>{{ index + 1 }}</td>
-                <td>{{ item.code }}</td>
-                <td>{{ item.name }}</td>
-                <td>{{ item.typeName }}</td>
-                <td>{{ item.department }}</td>
-                <td>{{ item.unit }}</td>
-                <td>{{ item.price }}</td>
-                <td>{{ item.ybNo || '-' }}</td>
-                <td>{{ item.status ? '启用' : '禁用' }}</td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <input v-model="item.code" type="text" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.code }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <input v-model="item.name" type="text" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.name }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <input v-model="item.typeName" type="text" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.typeName }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <el-tree-select
+                      v-model="item.department"
+                      :data="departments"
+                      :props="{
+                        value: 'name',
+                        label: 'name',
+                        children: 'children',
+                      }"
+                      value-key="name"
+                      placeholder="请选择科室"
+                      check-strictly
+                      :expand-on-click-node="false"
+                      clearable
+                      style="width: 100%;"
+                      @change="handleDepartmentChange($event, item)"
+                    />
+                  </template>
+                  <template v-else>
+                    {{ item.department }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <input v-model="item.unit" type="text" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.unit }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <input v-model="item.price" type="number" :style="inputStyle" step="0.01">
+                  </template>
+                  <template v-else>
+                    {{ item.price }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <input v-model="item.ybNo" type="text" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.ybNo || '-' }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === item.id">
+                    <select v-model="item.status" :style="inputStyle">
+                      <option value="true">启用</option>
+                      <option value="false">禁用</option>
+                    </select>
+                  </template>
+                  <template v-else>
+                    {{ item.status ? '启用' : '禁用' }}
+                  </template>
+                </td>
                 <td class="action-cell">
                   <div class="action-btn edit-btn" @click="editItem(item)">
                     <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -235,7 +320,7 @@
             </button>
             <button class="btn btn-success" @click="handlePackageManagement">套餐管理</button>
           </div>
-          <button class="btn btn-lg">保存</button>
+          <button class="btn btn-lg" @click="handleSave">保存</button>
         </div>
 
         <!-- 表单区域 -->
@@ -247,11 +332,17 @@
               <select class="form-control form-select">
                 <option value="1" selected>检验套餐</option>
               </select>
-            </div>
+            </div>  
 
+            <div class="form-item">
+                <span class="form-label">套餐类别</span>
+              <select class="form-control form-select" v-model="packageCategory" disabled>
+                <option value="检验套餐">检验套餐</option>
+              </select>
+            </div>
             <div class="form-item">
               <span class="form-label">套餐级别</span>
-              <select class="form-control form-select" id="packageLevel" v-model="packageLevel" @change="handlePackageLevelChange">
+              <select class="form-control form-select" id="packageLevel" v-model="packageLevel">
                 <option value="">请选择套餐级别</option>
                 <option value="全院套餐">全院套餐</option>
                 <option value="科室套餐">科室套餐</option>
@@ -260,49 +351,77 @@
             </div>
             <div class="form-item" id="departmentContainer" v-show="packageLevel === '科室套餐'">
               <span class="form-label">科室</span>
-              <select class="form-control form-select" id="departmentSelect">
-                <option value="">请选择科室</option>
-                <option value="内科">内科</option>
-                <option value="外科">外科</option>
-                <option value="儿科">儿科</option>
-                <option value="妇产科">妇产科</option>
-              </select>
+              <el-tree-select
+                  v-model="department"
+                  placeholder="请选择科室"
+                  :data="departments"
+                  :props="{
+                    value: 'name',
+                    label: 'name',
+                    children: 'children',
+                  }"
+                  value-key="name"
+                  check-strictly
+                  :expand-on-click-node="false"
+                  clearable
+                  style="width: 100%;"
+                  @change="handlePackageDepartmentChange"
+                />
             </div>
             <div class="form-item" id="userContainer" v-show="packageLevel === '个人套餐'">
               <span class="form-label">用户</span>
-              <select class="form-control form-select" id="userSelect">
+              <select class="form-control form-select">
                 <option value="">请选择用户</option>
+                <option value="1">张三</option>
+                <option value="2">李四</option>
+                <option value="3">王五</option>
+                <option value="4">赵六</option>
               </select>
             </div>
             <div class="form-item">
               <span class="form-label"><span style="color:red">*</span>套餐名称</span>
-              <input type="text" class="form-control" id="packageNameInput" placeholder="输入套餐名称" required>
+              <el-autocomplete
+                ref="autocompleteRef"
+                v-model="packageName"
+                :fetch-suggestions="queryDiagnosisItems"
+                placeholder="输入套餐名称或首字母搜索"
+                class="form-control"
+                @select="handleSelectPackage"
+                @focus="handleFocus"
+                clearable
+                trigger-on-focus
+                :min-length="0"
+              >
+                <template #suffix>
+                  <i class="el-icon-search"></i>
+                </template>
+              </el-autocomplete>
               <div class="error-message" id="packageNameError" style="color: #ff4d4f; font-size: 12px; margin-top: 4px; display: none;">套餐名称不能为空</div>
             </div>
             <div class="form-item">
               <span class="form-label">卫生机构</span>
-              <input type="text" class="form-control" value="演示医院" readonly>
+              <input type="text" class="form-control" :value="userStore.orgName" readonly>
             </div>
             <div class="form-item">
               <span class="form-label">套餐金额</span>
-              <input type="text" class="form-control" style="width: 120px;" value="45.00" id="packageAmountInput">
+              <input type="text" class="form-control" style="width: 120px;" :value="packageAmount.toFixed(2)" readonly>
             </div>
             <div class="form-item">
               <span class="form-label">折扣 %</span>
-              <input type="text" class="form-control">
+              <input type="text" class="form-control" v-model="discount" @input="calculateAmounts">
             </div>
             <div class="form-item">
               <span class="form-label">制单人</span>
-              <input type="text" class="form-control" readonly value="张三">
+              <input type="text" class="form-control" readonly :value="userStore.nickName">
             </div>
             <div class="form-item">
               <span class="form-label">是否停用</span>
               <div class="radio-group">
                 <label class="radio-item">
-                  <input type="radio" name="status" checked> 启用
+                  <input type="radio" v-model="isDisabled" :value="false" checked> 启用
                 </label>
                 <label class="radio-item">
-                  <input type="radio" name="status"> 停用
+                  <input type="radio" v-model="isDisabled" :value="true"> 停用
                 </label>
               </div>
             </div>
@@ -310,10 +429,10 @@
               <span class="form-label">显示套餐名</span>
               <div class="radio-group">
                 <label class="radio-item">
-                  <input type="radio" name="show_name" checked> 是
+                  <input type="radio" v-model="showPackageName" :value="true" checked> 是
                 </label>
                 <label class="radio-item">
-                  <input type="radio" name="show_name"> 否
+                  <input type="radio" v-model="showPackageName" :value="false"> 否
                 </label>
               </div>
             </div>
@@ -321,10 +440,10 @@
               <span class="form-label">生成服务费</span>
               <div class="radio-group">
                 <label class="radio-item">
-                  <input type="radio" name="fee_generation" checked> 是
+                  <input type="radio" v-model="generateServiceFee" :value="true" checked> 是
                 </label>
                 <label class="radio-item">
-                  <input type="radio" name="fee_generation"> 否
+                  <input type="radio" v-model="generateServiceFee" :value="false"> 否
                 </label>
               </div>
             </div>
@@ -332,81 +451,167 @@
               <span class="form-label">套餐价格</span>
               <div class="radio-group">
                 <label class="radio-item">
-                  <input type="radio" name="price_enabled" checked> 启用
+                  <input type="radio" v-model="enablePackagePrice" :value="true" checked> 启用
                 </label>
                 <label class="radio-item">
-                  <input type="radio" name="price_enabled"> 不启用
+                  <input type="radio" v-model="enablePackagePrice" :value="false"> 不启用
                 </label>
               </div>
             </div>
             <div class="form-item">
               <span class="form-label">备注</span>
-              <input type="text" class="form-control" placeholder>
+              <input type="text" class="form-control" v-model="remarks" placeholder="请输入备注">
             </div>
             <div class="form-item">
               <span class="form-label">服务费</span>
-              <input type="text" class="form-control">
+              <input type="text" class="form-control" :value="serviceFee.toFixed(2)" readonly>
             </div>
             <div class="form-item">
               <span class="form-label">lis分组</span>
               <select class="form-control form-select">
                 <option value="">请选择lis分组</option>
+                <option v-for="group in lisGroupList" :key="group.id" :value="group.id">
+                  {{ group.groupName || group.lisGroupName }}
+                </option>
               </select>
             </div>
             <div class="form-item">
               <span class="form-label">血量</span>
-              <input type="text" class="form-control">
+              <input type="text" class="form-control" v-model="bloodVolume">
             </div>
           </div>
         </div>
 
-        <!-- 表格区域 -->
-        <div class="table-container">
-          <div class="table-header">
-            <div class="table-title">检验套餐明细</div>
-            <div>
-              <button class="action-btn" title="添加项目" id="addItemBtn">+</button>
-            </div>
+        <!-- 检验套餐明细表格区域 -->
+        <div class="table-container" style="width: 100%; margin-top: 20px;">
+          <div class="table-header" style="display: flex; justify-content: space-between; align-items: center; padding: 10px;">
+            <div class="table-title" style="font-size: 16px; font-weight: bold;">检验套餐明细</div>
+            <button class="action-btn" title="添加项目" @click="addPackageItem" style="width: 32px; height: 32px; font-size: 20px; display: flex; align-items: center; justify-content: center;">+</button>
           </div>
           
           <table class="data-table">
             <thead>
               <tr>
-                <th style="width: 40px;">行</th>
+                <th style="width: 40px;">行号</th>
                 <th style="width: 250px;">项目名称/规格</th>
-                <th>剂量</th>
-                <th>途径</th>
-                <th>频次</th>
-                <th>天数</th>
-                <th>数量</th>
-                <th>单位</th>
-                <th>单价</th>
-                <th>金额</th>
-                <th>服务费</th>
-                <th>总金额</th>
-                <th>产地</th>
-                <th>操作</th>
+                <th style="width: 100px;">剂量</th>
+                <th style="width: 100px;">途径</th>
+                <th style="width: 100px;">频次</th>
+                <th style="width: 80px;">天数</th>
+                <th style="width: 80px;">数量</th>
+                <th style="width: 80px;">单位</th>
+                <th style="width: 100px;">单价</th>
+                <th style="width: 100px;">金额</th>
+                <th style="width: 100px;">服务费</th>
+                <th style="width: 100px;">总金额</th>
+                <th style="width: 150px;">产地</th>
+                <th style="width: 80px;">操作</th>
               </tr>
             </thead>
             <tbody>
-              <tr v-for="(item, index) in packageItems" :key="index">
+              <tr v-for="(item, index) in packageItems" :key="index" :class="{ 'editing': editingRowId === index }">
                 <td>{{ index + 1 }}</td>
-                <td>{{ item.name }}</td>
-                <td>{{ item.dosage }}</td>
-                <td>{{ item.route }}</td>
-                <td>{{ item.frequency }}</td>
-                <td>{{ item.days }}</td>
-                <td>{{ item.quantity }}</td>
-                <td>{{ item.unit }}</td>
-                <td>{{ item.unitPrice }}</td>
-                <td>{{ item.amount }}</td>
-                <td>{{ item.serviceFee }}</td>
-                <td>{{ item.totalAmount }}</td>
-                <td>{{ item.origin }}</td>
                 <td>
-                  <div class="table-actions">
-                    <div class="action-btn" title="编辑">✏️</div>
-                    <div class="action-btn" title="删除">🗑️</div>
+                  <template v-if="editingRowId === index">
+                    <input
+                      type="text"
+                      v-model="item.name"
+                      placeholder="请输入或选择项目名称"
+                      @focus="handleItemFocus(index)"
+                      :style="inputStyle"
+                    />
+                  </template>
+                  <template v-else>
+                    {{ item.name }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <input type="text" v-model="item.dosage" placeholder="剂量" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.dosage || '-' }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <select v-model="item.route" style="width: 100%;" :style="inputStyle">
+                      <option value="">请选择</option>
+                      <option value="项/人">项/人</option>
+                      <option value="次/人">次/人</option>
+                      <!-- 可根据实际需求添加更多选项 -->
+                    </select>
+                  </template>
+                  <template v-else>
+                    {{ item.route || '-' }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <select v-model="item.frequency" style="width: 100%;" :style="inputStyle">
+                      <option value="">请选择</option>
+                      <option value="一次">一次</option>
+                      <option value="每日">每日</option>
+                      <option value="每周">每周</option>
+                      <!-- 可根据实际需求添加更多选项 -->
+                    </select>
+                  </template>
+                  <template v-else>
+                    {{ item.frequency || '-' }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <input type="number" v-model.number="item.days" placeholder="天数" style="width: 100%;" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.days || '-' }}
+                  </template>
+                </td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <input type="number" v-model.number="item.quantity" placeholder="数量" style="width: 100%;" @input="updateItemAmount(item)" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.quantity || '-' }}
+                  </template>
+                </td>
+                <td>{{ item.unit || '-' }}</td>
+                <td>{{ item.unitPrice.toFixed(2) }}</td>
+                <td>{{ item.amount.toFixed(2) }}</td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <input type="number" v-model.number="item.serviceFee" placeholder="服务费" style="width: 100%;" step="0.01" @input="updateItemTotalAmount(item)" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.serviceFee.toFixed(2) }}
+                  </template>
+                </td>
+                <td>{{ item.totalAmount.toFixed(2) }}</td>
+                <td>
+                  <template v-if="editingRowId === index">
+                    <input type="text" v-model="item.origin" placeholder="产地" style="width: 100%;" :style="inputStyle">
+                  </template>
+                  <template v-else>
+                    {{ item.origin || '-' }}
+                  </template>
+                </td>
+                <td class="action-cell">
+                  <div class="table-actions" style="display: flex; gap: 5px;">
+                    <div class="action-btn edit-btn" title="编辑" @click="handleEditItem(index)">
+                      <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                        <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>
+                        <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>
+                      </svg>
+                    </div>
+                    <div class="action-btn delete-btn" title="删除" @click="deletePackageItem(index)">
+                      <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                        <polyline points="3 6 5 6 21 6"></polyline>
+                        <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
+                        <line x1="10" y1="11" x2="10" y2="17"></line>
+                        <line x1="14" y1="11" x2="14" y2="17"></line>
+                      </svg>
+                    </div>
                   </div>
                 </td>
               </tr>
@@ -419,14 +624,82 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-import { useRouter } from 'vue-router';
+import useUserStore from '@/store/modules/user';
+import { ref, reactive, onMounted, watch, computed, nextTick, getCurrentInstance } from 'vue';
+import { ElMessage, ElAutocomplete, ElMessageBox } from 'element-plus';
+import * as echarts from 'echarts';
+import { useRouter, useRoute } from 'vue-router';
+import { formatDate } from '@/utils/index';
 import request from '@/utils/request';
-import { listInspectionType, addInspectionType, updateInspectionType, delInspectionType } from '@/api/system/inspectionType';
+import { listInspectionType, getInspectionType, addInspectionType, updateInspectionType, delInspectionType } from '@/api/system/inspectionType';
+import { listLisGroup } from '@/api/system/checkType';
+import { getDiagnosisTreatmentList } from '@/views/catalog/diagnosistreatment/components/diagnosistreatment';
+import { getLocationTree } from '@/views/charge/outpatientregistration/components/outpatientregistration';
+
+// 获取当前登录用户信息
+const userStore = useUserStore();
 
 // 创建路由实例
 const router = useRouter();
+const route = useRoute();
+
+// 存储LIS分组数据
+const lisGroupList = ref([]);
+
+// 获取就诊科室数据 - 与门诊挂号页面保持一致，在组件初始化时直接调用
+getLocationInfo();
+
+onMounted(() => {
+  // 其他初始化逻辑
+});
+
+// 获取LIS分组数据
+const getLisGroupList = async () => {
+  try {
+    const response = await listLisGroup();
+    if (response.code === 200) {
+      console.log('完整LIS分组响应:', response); // 记录完整响应
+      
+      // 适配可能的不同响应格式
+      let items = [];
+      
+      // 检查响应数据
+      if (response.data) {
+        // 格式1: {data: {rows: [], total: number}} - 标准分页格式
+        if (response.data.rows && Array.isArray(response.data.rows)) {
+          items = response.data.rows;
+          console.log('LIS分组分页数据:', items);
+        }
+        // 格式2: {data: []} - 简单数组格式
+        else if (Array.isArray(response.data)) {
+          items = response.data;
+          console.log('LIS分组数组数据:', items);
+        }
+        // 格式3: {data: {data: []}} - 双重嵌套格式
+        else if (response.data.data && Array.isArray(response.data.data)) {
+          items = response.data.data;
+          console.log('LIS分组双重嵌套数据:', items);
+        }
+        // 格式4: {data: {data: {rows: []}}} - 双重嵌套分页格式
+        else if (response.data.data && response.data.data.rows && Array.isArray(response.data.data.rows)) {
+          items = response.data.data.rows;
+          console.log('LIS分组双重嵌套分页数据:', items);
+        }
+        // 其他格式
+        else {
+          console.log('无法识别的数据格式:', response.data);
+        }
+      }
+      
+      lisGroupList.value = items;
+    } else {
+      ElMessage.error('获取LIS分组数据失败');
+    }
+  } catch (error) {
+    console.error('获取LIS分组数据失败:', error);
+    ElMessage.error('获取LIS分组数据失败');
+  }
+};
 
 // 导航数据
 const navItems = ref(['检验类型', '检验项目', '套餐设置']);
@@ -454,7 +727,72 @@ const getInspectionTypeList = () => {
 };
 const editingRowId = ref(null);
 const inputStyle = { width: '100%', height: '28px', padding: '0 4px', border: '1px solid #d9d9d9', borderRadius: '2px' };
-const departments = ref(['检验科', '病理科', '放射科', '超声科']);
+const departments = ref([]);
+
+/** 查询就诊科室 - 与门诊挂号页面保持一致 */
+function getLocationInfo() {
+  console.log('调用getLocationTree API...');
+  getLocationTree().then((response) => {
+    console.log('getLocationTree API完整返回:', response);
+    console.log('getLocationTree API数据结构:', JSON.stringify(response.data, null, 2));
+    
+    // 检查数据结构并转换为适合el-tree-select的格式
+    if (Array.isArray(response.data)) {
+      // 直接使用数组数据
+      departments.value = response.data;
+    } else if (response.data && response.data.records) {
+      // 处理分页格式数据
+      departments.value = response.data.records;
+    } else if (response.data && response.data.rows) {
+      // 处理另一种分页格式数据
+      departments.value = response.data.rows;
+    } else {
+      console.error('API返回数据格式不符合预期:', response.data);
+      departments.value = [];
+    }
+    
+    console.log('最终科室数据:', JSON.stringify(departments.value, null, 2));
+  }).catch((error) => {
+    console.error('获取科室数据失败:', error);
+    departments.value = [];
+  });
+}
+
+// 处理科室选择变化
+function handleDepartmentChange(selectedNode, item) {
+  console.log('选择的科室节点:', selectedNode);
+  // 如果selectedNode是对象，只取name属性
+  if (typeof selectedNode === 'object' && selectedNode !== null) {
+    item.department = selectedNode.name;
+  } else {
+    // 否则直接使用（可能是字符串）
+    item.department = selectedNode;
+  }
+}
+
+// 处理套餐科室选择变化
+function handlePackageDepartmentChange(selectedNode) {
+  console.log('选择的套餐科室节点:', selectedNode);
+  // 如果selectedNode是对象，只取name属性
+  if (typeof selectedNode === 'object' && selectedNode !== null) {
+    department.value = selectedNode.name;
+  } else {
+    // 否则直接使用（可能是字符串）
+    department.value = selectedNode;
+  }
+}
+
+// 调试科室数据
+function debugDepartments() {
+  console.log('当前科室数据:', departments.value);
+  console.log('第一个检验项目科室:', inspectionItems.value[0]?.department);
+  // 尝试模拟选择一个科室
+  if (departments.value && departments.value.length > 0) {
+    const firstDept = departments.value[0];
+    console.log('尝试选择科室:', firstDept.name);
+    inspectionItems.value[0].department = firstDept.name;
+  }
+}
 
 // 检验项目数据
 const inspectionItems = ref([
@@ -464,12 +802,303 @@ const inspectionItems = ref([
 ]);
 
 // 套餐相关数据
+const packageCategory = ref('检验套餐');
 const packageLevel = ref('');
+const packageName = ref('');
+const department = ref('');
+const discount = ref('');
+const isDisabled = ref(false);
+const showPackageName = ref(true);
+const generateServiceFee = ref(true);
+const enablePackagePrice = ref(true);
+const packageAmount = ref(0.00);
+const serviceFee = ref(0.00);
+const bloodVolume = ref('');
+const remarks = ref('');
+const autocompleteRef = ref();
 const packageItems = ref([
-  { name: '血常规（五分类）', dosage: '项/人', route: '项/人', frequency: '', days: '', quantity: 1, unit: '项', unitPrice: 15.00, amount: 15.00, serviceFee: 0.00, totalAmount: 15.00, origin: '' },
+  { name: '血常规五分类', dosage: '项/人', route: '项/人', frequency: '', days: '', quantity: 1, unit: '项', unitPrice: 25.00, amount: 25.00, serviceFee: 0.00, totalAmount: 25.00, origin: '' },
   { name: '总IgE测定', dosage: '项/人', route: '项/人', frequency: '', days: '', quantity: 1, unit: '项', unitPrice: 30.00, amount: 30.00, serviceFee: 0.00, totalAmount: 30.00, origin: '' }
 ]);
 
+// 查询诊疗目录中的检验项目
+const queryDiagnosisItems = (queryString, cb) => {
+  // 调用诊疗目录API，查询检验类别的项目
+  const params = {
+    searchKey: queryString || '',
+    pageNo: 1,
+    pageSize: 100 // 增加分页大小，显示更多项目
+  };
+  
+  getDiagnosisTreatmentList(params).then(response => {
+    console.log('诊疗目录API完整返回:', response);
+    
+    // 处理不同的数据结构
+    let data;
+    if (response.data && response.data.records) {
+      data = response.data.records;
+    } else if (response.data && Array.isArray(response.data)) {
+      data = response.data;
+    } else if (response.data && response.data.rows) {
+      data = response.data.rows;
+    } else {
+      console.error('API返回数据格式不符合预期:', response.data);
+      return cb([]);
+    }
+    
+    // 添加调试信息，查看返回的数据结构
+    console.log('诊疗目录返回数据:', data);
+    
+    // 过滤出目录类别为检验的项目
+    // 支持多种可能的字段名
+    const inspectionItems = data.filter(item => {
+      return item.categoryCode_dictText === '检验' || 
+             item.categoryName === '检验' ||
+             item.category === '检验';
+    });
+    
+    // 处理每个检验项目，确保有正确的字段映射
+    const results = inspectionItems.map(item => {
+      // 确保每个项目都有必要的字段
+      return {
+        value: item.name || item.itemName || item.drugName || '',
+        label: `${item.name || item.itemName || item.drugName || ''} - ${item.unit || item.usageUnit || '项'} - ¥${item.retailPrice || item.price || item.unitPrice || 0.00}`,
+        name: item.name || item.itemName || item.drugName || '',
+        unit: item.unit || item.usageUnit || '',
+        retailPrice: item.retailPrice || item.price || item.unitPrice || 0.00,
+        ...item
+      };
+    });
+    
+    console.log('处理后的检验项目:', results);
+    cb(results);
+  }).catch(error => {
+    console.error('查询诊疗目录失败:', error);
+    ElMessage.error('查询诊疗目录失败，请稍后重试');
+    cb([]);
+  });
+};
+
+// 处理项目名称输入框获得焦点事件
+const handleItemFocus = (index) => {
+  // 可以在这里添加项目选择逻辑，或者留空让用户直接输入
+};
+
+// 处理输入框获得焦点事件，手动触发下拉框显示
+const handleFocus = () => {
+  // 延迟执行，确保输入框已经获得焦点
+  setTimeout(() => {
+    // 手动触发查询，获取所有检验项目
+    if (autocompleteRef.value) {
+      // 模拟空输入查询
+      queryDiagnosisItems('', (results) => {
+        // 设置建议列表
+        autocompleteRef.value.suggestions = results;
+        // 显示下拉框
+        autocompleteRef.value.showPopper = true;
+      });
+    }
+  }, 100);
+};
+
+// 添加新的套餐项目
+let addingItem = false;
+const addPackageItem = () => {
+  if (addingItem) return; // 防止重复调用
+  addingItem = true;
+  
+  const newItem = {
+    name: '',
+    dosage: '',
+    route: '',
+    frequency: '',
+    days: '',
+    quantity: 1,
+    unit: '',
+    unitPrice: 0.00,
+    amount: 0.00,
+    serviceFee: 0.00,
+    totalAmount: 0.00,
+    origin: ''
+  };
+  packageItems.value.push(newItem);
+  
+  // 延迟重置标志位，确保不会影响其他操作
+  setTimeout(() => {
+    addingItem = false;
+  }, 100);
+};
+
+// 删除套餐项目
+const deletePackageItem = (index) => {
+  ElMessageBox.confirm('确定要删除该项目吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    packageItems.value.splice(index, 1);
+    calculateAmounts();
+    ElMessage.success('删除成功');
+  }).catch(() => {
+    // 取消删除
+  });
+};
+
+// 处理选择诊疗项目
+const handleItemSelect = (item, selectedItem) => {
+  console.log('选择的诊疗项目:', selectedItem);
+  // 将选中的项目名称、使用单位、单价赋值到检验套餐明细行对应的字段中
+  item.name = selectedItem.name || selectedItem.value; // 使用name或value作为项目名称
+  item.unit = selectedItem.unit || selectedItem.usageUnit || ''; // 使用unit或usageUnit作为使用单位
+  item.unitPrice = parseFloat(selectedItem.retailPrice || selectedItem.price || 0.00); // 使用retailPrice或price作为单价
+  item.quantity = 1; // 默认数量为1
+  item.serviceFee = calculateItemServiceFee(item); // 计算该项目的服务费
+  updateItemAmount(item);
+  ElMessage.success(`已选择检验项目: ${item.name}`);
+};
+
+// 更新项目金额（考虑折扣）
+const updateItemAmount = (item) => {
+  // 计算项目原价金额
+  const originalAmount = (item.quantity || 1) * (item.unitPrice || 0.00);
+  
+  // 应用折扣到项目金额
+  let discountedAmount = originalAmount;
+  if (discount.value && !isNaN(parseFloat(discount.value))) {
+    const discountRate = parseFloat(discount.value) / 100;
+    discountedAmount = originalAmount * (1 - discountRate);
+  }
+  
+  // 更新项目金额
+  item.amount = parseFloat(discountedAmount.toFixed(2));
+  
+  // 基于折扣后的金额计算服务费
+  item.serviceFee = calculateItemServiceFee(item);
+  
+  // 更新项目总金额
+  updateItemTotalAmount(item);
+  
+  // 重新计算套餐金额和服务费
+  calculateAmounts();
+};
+
+// 更新项目总金额
+const updateItemTotalAmount = (item) => {
+  item.totalAmount = (item.amount || 0.00) + (item.serviceFee || 0.00);
+};
+
+// 处理编辑项目
+const handleEditItem = (index) => {
+  if (editingRowId === index) {
+    // 保存编辑
+    editingRowId.value = null;
+    ElMessage.success('保存成功');
+  } else {
+    // 进入编辑模式
+    editingRowId.value = index;
+  }
+};
+
+// 计算单个项目的服务费（基于折扣后的金额）
+const calculateItemServiceFee = (item) => {
+  if (!generateServiceFee.value) return 0;
+  
+  // 服务费是项目折扣后金额的10%
+  return parseFloat((item.amount * 0.1).toFixed(2));
+};
+
+// 重新分配所有项目的服务费（基于折扣后的金额）
+const redistributeServiceFee = () => {
+  if (!generateServiceFee.value) {
+    // 如果不生成服务费，将所有项目的服务费设为0
+    packageItems.value.forEach(item => {
+      item.serviceFee = 0;
+      updateItemTotalAmount(item);
+    });
+    return;
+  }
+  
+  // 重新计算每个项目的服务费
+  packageItems.value.forEach(item => {
+    item.serviceFee = calculateItemServiceFee(item);
+    updateItemTotalAmount(item);
+  });
+};
+
+// 计算套餐金额和服务费
+const calculateAmounts = () => {
+  // 更新每个项目的折扣金额
+  packageItems.value.forEach(item => {
+    // 计算项目原价金额
+    const originalAmount = (item.quantity || 1) * (item.unitPrice || 0.00);
+    
+    // 应用折扣到项目金额
+    let discountedAmount = originalAmount;
+    if (discount.value && !isNaN(parseFloat(discount.value))) {
+      const discountRate = parseFloat(discount.value) / 100;
+      discountedAmount = originalAmount * (1 - discountRate);
+    }
+    
+    // 更新项目金额
+    item.amount = parseFloat(discountedAmount.toFixed(2));
+  });
+  
+  // 重新分配所有项目的服务费
+  redistributeServiceFee();
+  
+  // 计算套餐总金额（基于项目的折扣后金额）
+  const totalAmount = packageItems.value.reduce((sum, item) => sum + (item.amount || 0), 0);
+  
+  // 更新套餐金额
+  packageAmount.value = parseFloat(totalAmount.toFixed(2));
+  
+  // 计算套餐总服务费
+  if (generateServiceFee.value) {
+    serviceFee.value = parseFloat(packageItems.value.reduce((sum, item) => sum + (item.serviceFee || 0), 0).toFixed(2));
+  } else {
+    serviceFee.value = 0;
+  }
+};
+
+// 选择套餐项目
+const handleSelectPackage = (item) => {
+  console.log('选择的检验项目:', item);
+  // 直接更新套餐金额
+  if (item.retailPrice) {
+    // 清空现有套餐项目列表
+    packageItems.value = [];
+    
+    // 创建新的套餐项目
+    const newPackageItem = {
+      name: item.name,
+      dosage: '项/人',
+      route: '项/人',
+      frequency: '',
+      days: '',
+      quantity: 1,
+      unit: item.unit || '项',
+      unitPrice: parseFloat(item.retailPrice),
+      amount: parseFloat(item.retailPrice),
+      serviceFee: 0.00, // 初始化为0
+      totalAmount: parseFloat(item.retailPrice), // 初始总金额
+      origin: ''
+    };
+    
+    // 添加到套餐项目列表
+    packageItems.value.push(newPackageItem);
+    
+    // 调用updateItemAmount计算折扣后的金额和服务费
+    updateItemAmount(newPackageItem);
+    
+    // 更新套餐名称
+    packageName.value = item.name;
+  } else {
+    console.error('选择的项目没有价格信息:', item);
+    ElMessage.warning('选择的项目没有价格信息');
+  }
+  ElMessage.success(`已选择检验项目: ${item.name}`);
+};
+
 // 检验类型相关方法
 const addNewRow = () => {
   const newRow = { id: Date.now(), code: '', name: '', department: departments.value[0], sortOrder: tableData.value.length + 1, remark: '' };
@@ -610,15 +1239,42 @@ const addNewItem = () => {
 
 const editItem = (item) => {
   console.log('编辑检验项目', item);
+  if (editingRowId.value === item.id) {
+    // 保存编辑
+    editingRowId.value = null;
+    ElMessage.success('保存成功');
+  } else {
+    // 进入编辑模式
+    editingRowId.value = item.id;
+  }
 };
 
 const deleteItem = (id) => {
-  console.log('删除检验项目', id);
+  ElMessageBox.confirm('确定要删除该检验项目吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    const index = inspectionItems.value.findIndex(item => item.id === id);
+    if (index !== -1) {
+      inspectionItems.value.splice(index, 1);
+      ElMessage.success('删除成功');
+    }
+  }).catch(() => {
+    // 取消删除
+  });
 };
 
 // 套餐相关方法
-const handlePackageLevelChange = () => {
-  console.log('套餐级别变更为：', packageLevel.value);
+const handleSave = () => {
+  // 验证套餐级别是否选择
+  if (!packageLevel.value) {
+    alert('请选择套餐级别');
+    return;
+  }
+  
+  // 这里可以添加其他表单验证和保存逻辑
+  console.log('保存表单数据');
 };
 
 const handlePackageManagement = () => {
@@ -635,12 +1291,25 @@ const refreshPage = () => {
 // 页面加载时获取数据
 onMounted(() => {
     getInspectionTypeList();
+    getLisGroupList();
     // 检查URL参数，如果有tab参数则切换到对应导航项
     const query = router.currentRoute.value.query;
     if (query.tab === '0' || query.tab === '1' || query.tab === '2') {
       activeNav.value = parseInt(query.tab);
     }
+    // 初始化计算套餐金额和服务费
+    calculateAmounts();
   });
+
+// 监听生成服务费选项变更
+watch(generateServiceFee, (newVal) => {
+  calculateAmounts();
+});
+
+// 监听套餐项目变化
+watch(packageItems, (newVal) => {
+  calculateAmounts();
+}, { deep: true });
 </script>
 
 <style>
@@ -891,7 +1560,7 @@ onMounted(() => {
   background-color: #00b27a;
   color: #fff;
 }
-
+  
 .btn-lg {
   height: 36px;
   padding: 0 24px;
@@ -997,6 +1666,25 @@ onMounted(() => {
   gap: 8px;
 }
 
+/* 表格内输入框和选择框样式 */
+.data-table input,
+.data-table select {
+  width: 100%;
+  height: 28px;
+  padding: 0 8px;
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  font-size: 12px;
+  box-sizing: border-box;
+}
+
+.data-table input:focus,
+.data-table select:focus {
+  outline: none;
+  border-color: #40a9ff;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
 /* 编辑模式行样式 */
 .data-table tr.editing {
   background-color: #f0f7ff;