From 82f9a7eb2c8ebe41399795b1aff23e76c725053a Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 9 Dec 2025 10:22:21 +0800 Subject: [PATCH] =?UTF-8?q?pad=E6=8E=A5=E5=8F=A3-=E8=AF=B7=E9=A2=86?= =?UTF-8?q?=E5=8D=95-=E5=B7=B2=E6=8F=90=E4=BA=A4=E8=AF=B7=E9=A2=86?= =?UTF-8?q?=E5=8D=95=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=80=E3=80=81=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/entity/InvoicingQldInfoEntity.java | 5 +++++ .../qld/mapper/xml/NuInvoicingQldInfoMapper.xml | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldInfoEntity.java index 3fdde687..336584fa 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldInfoEntity.java @@ -52,4 +52,9 @@ public class InvoicingQldInfoEntity implements Serializable { * 物料信息 */ private MaterialInfoEntity materialInfo; + + /**服务类别名称*/ + private String categoryName; + /**服务类型名称*/ + private String typeName; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml index 2b0ee89c..b8444418 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml @@ -40,11 +40,15 @@ material.lower_limit AS "materialInfo.lowerLimit", material.tag_type AS "materialInfo.tagType", material.iz_ybbx AS "materialInfo.izYbbx", - material.iz_jgyh AS "materialInfo.izJgyh" + material.iz_jgyh AS "materialInfo.izJgyh", + maca.category_name as "materialInfo.categoryName", + maty.type_name as "materialInfo.typeName" FROM nu_invoicing_qld_info info LEFT JOIN nu_config_material_info material ON info.wl_id = material.id + LEFT JOIN nu_config_material_category maca ON material.category_id = maca.id + LEFT JOIN nu_config_material_type maty ON material.type_id = maty.id WHERE info.qld_no IN @@ -52,7 +56,9 @@ GROUP BY info.wl_id, - material.id + material.id, + maca.id, + maty.id ORDER BY MAX(info.create_time) DESC