From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
index f911252..3cb9de5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
@@ -99,7 +99,7 @@
                "\n" +
                "SELECT a.parent_pro_id,SUM(a.now_price)ys  FROM tb_transition a WHERE a.cus_id=#{cusIdCard}  AND pac_id=#{groupingId} AND ISNULL(a.tj_num) GROUP BY a.parent_pro_id)aa\n" +
                "ON\n" +
-               "g.pro_id=aa.parent_pro_id   AND g.grouping_id=#{groupingId} AND (g.ys_price-aa.ys)>0")
+               "trim(g.pro_id)=trim(aa.parent_pro_id ) where g.grouping_id=#{groupingId} AND (g.ys_price-aa.ys)>0")
        List<Map<String,Object>> huoquxiangmuchajia(@Param("groupingId") String groupingId, @Param("cusIdCard") String cusIdCard);
 
 }

--
Gitblit v1.8.0