From 8575b943f262c0d708d74be85e74cfeb53624994 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 26 Nov 2025 16:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=B7=E9=A2=86=E5=8D=95-?=
 =?UTF-8?q?=E8=AF=B7=E9=A2=86=E8=BD=A6=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20-=20=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=9A=E8=B4=AD=E7=89=A9=E8=BD=A6id?=
 =?UTF-8?q?=E3=80=81=E5=B7=B2=E8=AF=B7=E9=A2=86=E7=89=A9=E5=93=81=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BlWarehouseMaterialInfo.java                    | 7 ++++---
 .../mapper/xml/BlWarehouseMaterialInfoMapper.xml           | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
index eb735ca0..8342d2db 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
@@ -195,8 +195,9 @@ public class BlWarehouseMaterialInfo implements Serializable {
     @TableField(exist = false)
     private java.lang.String medicationName;
     @TableField(exist = false)
-    private java.lang.String zhiDingId;
+    private java.lang.String zhiDingId;//置顶Id
     @TableField(exist = false)
-    private Date zhiDingTime;
-
+    private Date zhiDingTime;//置顶时间
+    @TableField(exist = false)
+    private String gwcId;//购物车ID
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
index e03b47e9..92df7dc4 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
@@ -146,10 +146,12 @@
                               c.item_text as tagName,
                               if(d.wl_id is null, '0', '1') as isAdd,
                               e.id AS zhiDingId,
-                              e.create_time AS zhiDingTime
+                              e.create_time AS zhiDingTime,
+                              d.id AS gwcId,
+                              d.ql_num AS qlNum
                           from nu_warehouse_material_info a
                                    left join nu_config_material_info b on a.wl_id = b.id
-                                   left join (select wl_id from nu_invoicing_qld_gwc where nu_id = #{dto.nuId} and elder_id = #{dto.elderId} GROUP BY wl_id) d on a.wl_id = d.wl_id
+                                   left join (select id,wl_id,ql_num from nu_invoicing_qld_gwc where nu_id = #{dto.nuId} and elder_id = #{dto.elderId} GROUP BY id,wl_id,ql_num) d on a.wl_id = d.wl_id
                                    left join sys_dict_item c on  b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
                           left join nu_invoicing_qld_wlzd e on b.id = e.wl_id and e.nu_id = #{dto.nuId} and e.elder_id = #{dto.elderId}
                       ) a