代码提交 定价管理代码修改

openhis-server/core-common/src/main/java/com/core/common/enums/ChargeItemEnum.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.core.common.enums;
+
+/**
+ * 收费项目
+ *
+ * @author zxy
+ * @date 2025-02-24
+ */
+public enum ChargeItemEnum {
+
+    /**
+     * 床位费
+     */
+    BED_FEE("01", "床位费"),
+    /**
+     * 诊察费
+     */
+    DIAGNOSTIC_FEE("02", "诊察费"),
+    /**
+     * 检查费
+     */
+    CHECK_FEE("03", "检查费"),
+    /**
+     * 化验费
+     */
+    DIAGNOSTIC_TEST_FEE("04", "化验费"),
+    /**
+     * 治疗费
+     */
+    MEDICAL_EXPENSE_FEE("05", "治疗费"),
+    /**
+     * 手术费
+     */
+    OPERATION_FEE("06", "手术费"),
+    /**
+     * 护理费
+     */
+    NURSING_FEE("07", "护理费"),
+    /**
+     * 卫生材料费
+     */
+    SANITARY_MATERIALS_FEE("08", "卫生材料费"),
+    /**
+     * 西药费
+     */
+    WEST_MEDICINE("09", "西药费"),
+    /**
+     * 中药饮片费
+     */
+    CHINESE_MEDICINE_SLICES_FEE("10", "中药饮片费"),
+    /**
+     * 中成药费
+     */
+    CHINESE_MEDICINE_FEE("11", "中成药费"),
+    /**
+     * 一般诊疗费
+     */
+    GENERAL_CONSULTATION_FEE("12", "一般诊疗费"),
+    /**
+     * 挂号费
+     */
+    REGISTRATION_FEE("13", "挂号费"),
+    /**
+     * 其他费
+     */
+    OTHER_FEE("14", "其他费");
+
+    private final String code;
+    private final String info;
+
+    ChargeItemEnum(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.enums.AssignSeqEnum;
+import com.core.common.enums.ChargeItemEnum;
 import com.core.common.enums.DefinitionTypeEnum;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
@@ -28,6 +29,7 @@ import com.openhis.administration.service.IChargeItemDefAppService;
 import com.openhis.administration.service.IChargeItemDefinitionService;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto;
+import com.openhis.web.datadictionary.dto.ChargeItemOptionDto;
 import com.openhis.web.datadictionary.dto.ItemDefSearchParam;
 import com.openhis.web.datadictionary.dto.ItemDefinitionDto;
 import com.openhis.web.datadictionary.mapper.ChargeItemDefSearchMapper;
@@ -51,15 +53,74 @@ public class ItemDefinitionController {
     private IChargeItemDefAppService chargeItemDefAppService;
     @Autowired(required = false)
     private ChargeItemDefSearchMapper chargeItemDefSearchMapper;
-    // @Autowired(required = false)
-    // private IMedicationDefinitionService medicationDefinitionService;
-    // @Autowired(required = false)
-    // private IDeviceDefinitionService deviceDefinitionService;
-    // @Autowired(required = false)
-    // private IActivityDefinitionService activityDefinitionService;
     @Autowired(required = false)
     private AssignSeqUtil assignSeqUtil;
 
+    /**
+     * 项目定价列表
+     *
+     * @param itemDefSearchParam 查询条件
+     * @return 项目定价列表
+     */
+    @GetMapping(value = "/init")
+    public R<?> getInitDefinitionOptions(ItemDefSearchParam itemDefSearchParam) {
+        List<ChargeItemOptionDto> chargeItemOptions = new ArrayList<>();
+        if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) {
+            // 西药
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.WEST_MEDICINE.getCode())
+                .setLabel(ChargeItemEnum.WEST_MEDICINE.getInfo()));
+            // 中药饮片
+            chargeItemOptions
+                .add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode())
+                    .setLabel(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo()));
+            // 中成药
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode())
+                .setLabel(ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo()));
+            // 其他
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode())
+                .setLabel(ChargeItemEnum.OTHER_FEE.getInfo()));
+        } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) {
+            // 卫生材料
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode())
+                .setLabel(ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo()));
+            // 其他
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode())
+                .setLabel(ChargeItemEnum.OTHER_FEE.getInfo()));
+        } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) {
+            // 床位
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.BED_FEE.getCode())
+                .setLabel(ChargeItemEnum.BED_FEE.getInfo()));
+            // 诊察
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_FEE.getCode())
+                .setLabel(ChargeItemEnum.DIAGNOSTIC_FEE.getInfo()));
+            // 检查
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHECK_FEE.getCode())
+                .setLabel(ChargeItemEnum.CHECK_FEE.getInfo()));
+            // 化验
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode())
+                .setLabel(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo()));
+            // 治疗
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode())
+                .setLabel(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo()));
+            // 手术
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OPERATION_FEE.getCode())
+                .setLabel(ChargeItemEnum.OPERATION_FEE.getInfo()));
+            // 护理费
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.NURSING_FEE.getCode())
+                .setLabel(ChargeItemEnum.NURSING_FEE.getInfo()));
+            // 其他
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode())
+                .setLabel(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo()));
+            // 挂号
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.REGISTRATION_FEE.getCode())
+                .setLabel(ChargeItemEnum.REGISTRATION_FEE.getInfo()));
+            // 其他
+            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode())
+                .setLabel(ChargeItemEnum.OTHER_FEE.getInfo()));
+        }
+        return R.ok(chargeItemOptions);
+    }
+
     /**
      * 项目定价列表
      *
@@ -72,60 +133,12 @@ public class ItemDefinitionController {
     @GetMapping(value = "/item-definition-page")
     public R<?> getDefinitionPage(ItemDefSearchParam itemDefSearchParam,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        // region
+        @RequestParam(value = "searchKey", defaultValue = "10") String searchKey, HttpServletRequest request) {
-        /// todo: 代码未测试
-        // 获取定价查询条件
-        // ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
-        // BeanUtils.copyProperties(itemDefSearchParam, chargeItemDefinition);
-
-        // ====================================================================================
-
-        // 查询【费用定价管理】分页列表
-        // Page<ChargeItemDefinition> chargeItemDefinitionPage =
-        // chargeItemDefinitionMapper.getPage(itemDefSearchParam, pageNo, pageSize);
-        // if (chargeItemDefinitionPage.getRecords() != null) {
-        // List<ChargeItemDefApp> chargeItemDefAppList = chargeItemDefAppService.listByIds(chargeItemDefinitionPage
-        // .getRecords().stream().filter(e -> e.getInstanceTable().equals("adm_charge_item_def_app"))
-        // .map(ChargeItemDefinition::getInstanceId).collect(Collectors.toList()));
-        // // 通过 DefinitionType 区分药品定价/器具定价/手术定价
-        // if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) {
-        // // 获取药品定价列表
-        // List<MedicationDefinition> medicationList =
-        // medicationDefinitionService.listByIds(chargeItemDefinitionPage.getRecords().stream()
-        // .filter(e -> e.getInstanceTable().equals("med_medication_definition"))
-        // .map(ChargeItemDefinition::getInstanceId).collect(Collectors.toList()));
-        //
-        // return R.ok(ItemDefinitionAssembler.assembleMedDefinitionDto(chargeItemDefinitionPage,
-        // chargeItemDefAppList, medicationList, itemDefSearchParam));
-        // } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) {
-        // // 获取器具定价列表
-        // List<DeviceDefinition> deviceDefinitionList = deviceDefinitionService.listByIds(chargeItemDefinitionPage
-        // .getRecords().stream().filter(e -> e.getInstanceTable().equals("adm_device_definition"))
-        // .map(ChargeItemDefinition::getInstanceId).collect(Collectors.toList()));
-        //
-        // return R.ok(ItemDefinitionAssembler.assembleDevDefinitionDto(chargeItemDefinitionPage,
-        // chargeItemDefAppList, deviceDefinitionList, itemDefSearchParam));
-        // } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) {
-        // List<ActivityDefinition> activityDefinitionList =
-        // activityDefinitionService.listByIds(chargeItemDefinitionPage.getRecords().stream()
-        // .filter(e -> e.getInstanceTable().equals("wor_activity_definition"))
-        // .map(ChargeItemDefinition::getInstanceId).collect(Collectors.toList()));
-        //
-        // return R.ok(ItemDefinitionAssembler.assembleProDefinitionDto(chargeItemDefinitionPage,
-        // chargeItemDefAppList, activityDefinitionList, itemDefSearchParam));
-        // } else {
-        // return R.ok(new Page<ChargeItemDefPageDto>());
-        // }
-        // } else {
-        // return R.ok(new Page<ChargeItemDefPageDto>());
-        // }
-        // endregion
 
         IPage<ChargeItemDefPageDto> chargeItemDefinitionPage = new Page<>();
         List<ChargeItemDefPageDto> chargeItemDefinitionList;
 
-        // TODO: 待测试
         // 跳过的数量
         int skipCount = 0;
         if (pageNo > 0) {
@@ -135,51 +148,29 @@ public class ItemDefinitionController {
         if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 获取定价列表
             chargeItemDefinitionList =
-                chargeItemDefSearchMapper.getMedList(itemDefSearchParam, pageNo, pageSize, skipCount);
+                chargeItemDefSearchMapper.getMedList(itemDefSearchParam, pageNo, pageSize, searchKey, skipCount);
-            // 设置分页条件
-            chargeItemDefinitionPage.setSize(pageSize);
-            chargeItemDefinitionPage.setCurrent(pageNo);
-            if (chargeItemDefinitionList.size() > 0) {
-                chargeItemDefinitionPage.setTotal(chargeItemDefinitionList.get(0).getTotalCount());
-                chargeItemDefinitionPage.setRecords(chargeItemDefinitionList);
-            } else {
-                chargeItemDefinitionPage.setTotal(0);
-                chargeItemDefinitionPage.setRecords(new ArrayList<>());
-            }
-            return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
         } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 获取定价列表
             chargeItemDefinitionList =
-                chargeItemDefSearchMapper.getDevList(itemDefSearchParam, pageNo, pageSize, skipCount);
+                chargeItemDefSearchMapper.getDevList(itemDefSearchParam, pageNo, pageSize, searchKey, skipCount);
-            // 设置分页条件
-            chargeItemDefinitionPage.setSize(pageSize);
-            chargeItemDefinitionPage.setCurrent(pageNo);
-            if (chargeItemDefinitionList.size() > 0) {
-                chargeItemDefinitionPage.setTotal(chargeItemDefinitionList.get(0).getTotalCount());
-                chargeItemDefinitionPage.setRecords(chargeItemDefinitionList);
-            } else {
-                chargeItemDefinitionPage.setTotal(0);
-                chargeItemDefinitionPage.setRecords(new ArrayList<>());
-            }
-            return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
         } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 获取定价列表
             chargeItemDefinitionList =
-                chargeItemDefSearchMapper.getActList(itemDefSearchParam, pageNo, pageSize, skipCount);
+                chargeItemDefSearchMapper.getActList(itemDefSearchParam, pageNo, pageSize, searchKey, skipCount);
-            // 设置分页条件
-            chargeItemDefinitionPage.setSize(pageSize);
-            chargeItemDefinitionPage.setCurrent(pageNo);
-            if (chargeItemDefinitionList.size() > 0) {
-                chargeItemDefinitionPage.setTotal(chargeItemDefinitionList.get(0).getTotalCount());
-                chargeItemDefinitionPage.setRecords(chargeItemDefinitionList);
-            } else {
-                chargeItemDefinitionPage.setTotal(0);
-                chargeItemDefinitionPage.setRecords(new ArrayList<>());
-            }
-            return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
         } else {
-            return R.ok(new Page<>(), MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
+            chargeItemDefinitionList = new ArrayList<>();
         }
+        // 设置分页条件
+        chargeItemDefinitionPage.setSize(pageSize);
+        chargeItemDefinitionPage.setCurrent(pageNo);
+        if (chargeItemDefinitionList.size() > 0) {
+            chargeItemDefinitionPage.setTotal(chargeItemDefinitionList.get(0).getTotalCount());
+            chargeItemDefinitionPage.setRecords(chargeItemDefinitionList);
+        } else {
+            chargeItemDefinitionPage.setTotal(0);
+            chargeItemDefinitionPage.setRecords(new ArrayList<>());
+        }
+        return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
     }
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.datadictionary.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 收费项目下拉框
+ *
+ * @author zxy
+ * @date 2025-02-24
+ */
+@Data
+@Accessors(chain = true)
+public class ChargeItemOptionDto {
+
+    /** 值 */
+    private String value;
+
+    /** 标签 */
+    private String label;
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java

@@ -22,6 +22,4 @@ public class ItemDefSearchParam {
     private String chargeItem;
     /** 模糊搜索条件 */
     private String searchKey;
-    /** 状态 */
-    private Integer statusEnum;
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java

@@ -25,11 +25,13 @@ public interface ChargeItemDefSearchMapper extends BaseMapper<ChargeItemDefiniti
      * @param itemDefSearchParam 查询条件
      * @param pageNo 页码
      * @param pageSize 页面大小
+     * @param searchKey 模糊搜索条件
      * @param skipCount 跳过条数
      * @return 分页查询
      */
     List<ChargeItemDefPageDto> getMedList(@Param("itemDefSearchParam") ItemDefSearchParam itemDefSearchParam,
-        @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize, @Param("skipCount") Integer skipCount);
+        @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize, @Param("searchKey") String searchKey,
+        @Param("skipCount") Integer skipCount);
 
     /**
      * 器具费用定价分页查询
@@ -37,11 +39,13 @@ public interface ChargeItemDefSearchMapper extends BaseMapper<ChargeItemDefiniti
      * @param itemDefSearchParam 查询条件
      * @param pageNo 页码
      * @param pageSize 页面大小
+     * @param searchKey 模糊搜索条件
      * @param skipCount 跳过条数
      * @return 分页查询
      */
     List<ChargeItemDefPageDto> getDevList(@Param("itemDefSearchParam") ItemDefSearchParam itemDefSearchParam,
-        @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize, @Param("skipCount") int skipCount);
+        @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize, @Param("searchKey") String searchKey,
+        @Param("skipCount") int skipCount);
 
     /**
      * 活动费用定价分页查询
@@ -49,9 +53,11 @@ public interface ChargeItemDefSearchMapper extends BaseMapper<ChargeItemDefiniti
      * @param itemDefSearchParam 查询条件
      * @param pageNo 页码
      * @param pageSize 页面大小
+     * @param searchKey 模糊搜索条件
      * @param skipCount 跳过条数
      * @return 分页查询
      */
     List<ChargeItemDefPageDto> getActList(@Param("itemDefSearchParam") ItemDefSearchParam itemDefSearchParam,
-        @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize, @Param("skipCount") int skipCount);
+        @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize, @Param("searchKey") String searchKey,
+        @Param("skipCount") int skipCount);
 }

openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml

@@ -63,13 +63,10 @@
             ON T3.id = T4.medication_def_id) T5
         <where>
             T5.instance_table = 'med_medication_definition'
-            <if test="itemDefSearchParam.getSearchKey() != null">
+            <if test="searchKey != null">
-                AND T5.charge_name LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                AND T5.charge_name LIKE CONCAT('%', #{searchKey}, '%')
-                OR T5.code LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                OR T5.item_no LIKE CONCAT('%', #{searchKey}, '%')
-                OR T5.py_code LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                OR T5.py_str LIKE CONCAT('%', #{searchKey}, '%')
-            </if>
-            <if test="itemDefSearchParam.getStatusEnum() != null">
-                AND T5.status_enum = #{itemDefSearchParam.statusEnum}
             </if>
             <if test="itemDefSearchParam.getChargeItem() != null">
                 AND T5.category_code = #{itemDefSearchParam.chargeItem}
@@ -101,8 +98,8 @@
         T5.priority,
         T5.amount,
         T5.item_no,
-        T5.py_code,
+        T5.py_str,
-        T5.wb_code,
+        T5.wb_str,
         T5.unit_code,
         T5.category_code,
         T5.lot_number,
@@ -125,11 +122,11 @@
         T2.condition_yb_code,
         T2.priority,
         T2.amount,
-        T3.code AS item_no,
+        T3.bus_no AS item_no,
-        T3.py_code,
+        T3.py_str,
-        T3.wb_code,
+        T3.wb_str,
         T3.unit_code AS unit_code,
-        T3.device_class AS category_code,
+        T3.category_enum AS category_code,
         T4.lot_number
         FROM
         adm_charge_item_definition T1
@@ -138,16 +135,13 @@
         LEFT JOIN adm_device_definition T3
         ON T1.instance_id = T3.id
         LEFT JOIN adm_device T4
-        ON T3.id = T4.def_id) T5
+        ON T3.id = T4.device_def_id) T5
         <where>
             T5.instance_table = 'adm_device_definition'
-            <if test="itemDefSearchParam.getSearchKey() != null">
+            <if test="searchKey != null">
-                AND T5.charge_name LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                AND T5.charge_name LIKE CONCAT('%', #{searchKey}, '%')
-                OR T5.code LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                OR T5.item_no LIKE CONCAT('%', #{searchKey}, '%')
-                OR T5.py_code LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                OR T5.py_str LIKE CONCAT('%', #{searchKey}, '%')
-            </if>
-            <if test="itemDefSearchParam.getStatusEnum() != null">
-                AND T5.status_enum = #{itemDefSearchParam.statusEnum}
             </if>
             <if test="itemDefSearchParam.getChargeItem() != null">
                 AND T5.category_code = #{itemDefSearchParam.chargeItem}
@@ -179,8 +173,8 @@
         T5.priority,
         T5.amount,
         T5.item_no,
-        T5.py_code,
+        T5.py_str,
-        T5.wb_code,
+        T5.wb_str,
         T5.unit_code,
         T5.category_code,
         COUNT(1) OVER() AS TOTAL_COUNT
@@ -202,10 +196,10 @@
         T2.condition_yb_code,
         T2.priority,
         T2.amount,
-        T3.code AS item_no,
+        T3.bus_no AS item_no,
-        T3.py_code,
+        T3.py_str,
-        T3.wb_code,
+        T3.wb_str,
-        T3.permitted_unit AS unit_code,
+        T3.permitted_unit_code AS unit_code,
         T3.type_enum AS category_code
         FROM
         adm_charge_item_definition T1
@@ -215,13 +209,10 @@
         ON T1.instance_id = T3.id) T5
         <where>
             T5.instance_table = 'wor_activity_definition'
-            <if test="itemDefSearchParam.getSearchKey() != null">
+            <if test="searchKey != null">
-                AND T5.charge_name LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                AND T5.charge_name LIKE CONCAT('%', #{searchKey}, '%')
-                OR T5.code LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                OR T5.item_no LIKE CONCAT('%', #{searchKey}, '%')
-                OR T5.py_code LIKE CONCAT('%', #{itemDefSearchParam.searchKey}, '%')
+                OR T5.py_str LIKE CONCAT('%', #{searchKey}, '%')
-            </if>
-            <if test="itemDefSearchParam.getStatusEnum() != null">
-                AND T5.status_enum = #{itemDefSearchParam.statusEnum}
             </if>
             <if test="itemDefSearchParam.getChargeItem() != null">
                 AND T5.category_code = #{itemDefSearchParam.chargeItem}