From 65a31963c2caa8e9852c0e5515f3de431e3aa810 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Thu, 11 Dec 2025 13:58:08 +0800
Subject: [PATCH] =?UTF-8?q?pad=E6=8E=A5=E5=8F=A3-=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95-=E6=9F=A5=E8=AF=A2=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E5=AF=B9=E5=BA=94=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nu/mapper/xml/NuInvoicingNuKcslMapper.xml | 45 ++++---------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml
index c1bdd10d..f65a179f 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml
@@ -56,43 +56,16 @@
 
     <select id="thdMaterialList" resultType="com.nu.entity.NuKcslEntity">
         select
-        material.id AS "materialInfo.id",
-        material.category_id AS "materialInfo.categoryId",
-        material.type_id AS "materialInfo.typeId",
-        material.medication_id AS "materialInfo.medicationId",
-        material.material_name AS "materialInfo.materialName",
-        material.material_no AS "materialInfo.materialNo",
-        material.specification_model AS "materialInfo.specificationModel",
-        material.sales_unit_price AS "materialInfo.salesUnitPrice",
-        material.reference_unit_price AS "materialInfo.referenceUnitPrice",
-        material.material_units AS "materialInfo.materialUnits",
-        material.multi_unit_switch AS "materialInfo.multiUnitSwitch",
-        material.one_unit AS "materialInfo.oneUnit",
-        material.one_unit_proportion AS "materialInfo.oneUnitProportion",
-        material.one_unit_price AS "materialInfo.oneUnitPrice",
-        material.two_unit AS "materialInfo.twoUnit",
-        material.two_unit_proportion AS "materialInfo.twoUnitProportion",
-        material.two_unit_price AS "materialInfo.twoUnitPrice",
-        material.multi_unit_type AS "materialInfo.multiUnitType",
-        material.suppliers AS "materialInfo.suppliers",
-        material.material_img AS "materialInfo.materialImg",
-        material.material_ident AS "materialInfo.materialIdent",
-        material.iz_enabled AS "materialInfo.izEnabled",
-        material.del_flag AS "materialInfo.delFlag",
-        material.create_by AS "materialInfo.createBy",
-        material.create_time AS "materialInfo.createTime",
-        material.update_by AS "materialInfo.updateBy",
-        material.update_time AS "materialInfo.updateTime",
-        material.sys_org_code AS "materialInfo.sysOrgCode",
-        material.pinyin AS "materialInfo.pinyin",
-        material.upper_limit AS "materialInfo.upperLimit",
-        material.lower_limit AS "materialInfo.lowerLimit",
-        material.tag_type AS "materialInfo.tagType",
-        material.iz_ybbx AS "materialInfo.izYbbx",
-        material.iz_jgyh AS "materialInfo.izJgyh",
-        info.th_num AS thNum
+        info.th_num AS thNum,
+        info.material_name AS "materialInfo.materialName",
+        info.material_no AS "materialInfo.materialNo",
+        info.specification_model AS "materialInfo.specificationModel",
+        info.sales_unit_price AS "materialInfo.salesUnitPrice",
+        info.material_units AS "materialInfo.materialUnits",
+        info.material_img AS "materialInfo.materialImg",
+        info.material_category_name as "materialInfo.categoryName",
+        info.material_type_name as "materialInfo.typeName"
         from nu_invoicing_thd_info info
-        LEFT JOIN nu_config_material_info material ON info.wl_id = material.id
         <where>
             <if test="thdNo != null and thdNo != ''">
                 and info.thd_no = #{thdNo}