From 0ad32e695d64e3a00a7206c0183a1918e88c2766 Mon Sep 17 00:00:00 2001
From: Zhuangxingyu <zhuangxy@ccbjb.com.cn>
Date: Mon, 24 Feb 2025 15:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=20sql?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper}/ChargeItemDefSearchMapper.xml              | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 rename openhis-server/openhis-application/src/main/{java/com/openhis/web/datadictionary/mapper/xml => resources/mapper}/ChargeItemDefSearchMapper.xml (95%)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml
similarity index 95%
rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml
rename to openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml
index 0c4568cc..0c54714a 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml
+++ b/openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.datadictionary.mapper.ChargeItemDefSearchMapper">
 
     <select id="getMedList" resultType="com.openhis.web.datadictionary.dto.ChargeItemDefPageDto">
@@ -73,7 +71,7 @@
             <if test="itemDefSearchParam.getStatusEnum() != null">
                 AND T5.status_enum = #{itemDefSearchParam.statusEnum}
             </if>
-            <if test="itemDefSearchParam.getCategoryCode() != null">
+            <if test="itemDefSearchParam.getChargeItem() != null">
                 AND T5.category_code = #{itemDefSearchParam.chargeItem}
             </if>
         </where>
@@ -151,7 +149,7 @@
             <if test="itemDefSearchParam.getStatusEnum() != null">
                 AND T5.status_enum = #{itemDefSearchParam.statusEnum}
             </if>
-            <if test="itemDefSearchParam.getCategoryCode() != null">
+            <if test="itemDefSearchParam.getChargeItem() != null">
                 AND T5.category_code = #{itemDefSearchParam.chargeItem}
             </if>
         </where>
@@ -225,7 +223,7 @@
             <if test="itemDefSearchParam.getStatusEnum() != null">
                 AND T5.status_enum = #{itemDefSearchParam.statusEnum}
             </if>
-            <if test="itemDefSearchParam.getCategoryCode() != null">
+            <if test="itemDefSearchParam.getChargeItem() != null">
                 AND T5.category_code = #{itemDefSearchParam.chargeItem}
             </if>
         </where>