关联套餐设置页面对应字段

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 -> {
             // 医保标记枚举类回显赋值

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
+        T4.amount as maximum_retail_price,--最高零售价
-        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,--最高零售价
         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>
 

openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue

@@ -49,13 +49,17 @@
         </div>
         <div class="filter-item">
           <label>科室：</label>
-          <select>
+          <el-tree-select
-            <option value="">请选择科室</option>
+                 placeholder="请选择科室"
-            <option value="内科">内科</option>
+                 :data="departments"
-            <option value="儿科">儿科</option>
+                 :props="{
-            <option value="外科">外科</option>
+                   value: 'name',
-            <option value="妇科">妇科</option>
+                   label: 'name',
-          </select>
+                   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 { ref, reactive, computed, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
+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: '徐斌'},