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