From a51a70b780ef0ed24abb81b096c80649a0255ece Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 七月 2024 19:29:23 +0800
Subject: [PATCH] zjh 2024/07/2-1

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

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index b0933a7..82043c6 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -72,6 +72,9 @@
     @Delete("DELETE  FROM tb_transition WHERE tj_num=#{tjNum}")
     public boolean deletedTbTransitionByTjNum(String tjNum);
 
+    @Delete("DELETE  FROM tb_transition WHERE isnull(tj_num)  and  cus_id=#{cdId} and parent_pro_id=#{proId}")
+    public boolean delTbBycusCardIdAndProId(@Param("cdId") String cdId,@Param("proId")String proId);
+
     @Update("UPDATE tb_transition a SET "+
             "a.tj_num=null" +
             " WHERE a.tj_num=#{tjNum}")
@@ -93,7 +96,7 @@
 //    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id)  AND pro_id =#{proId}")
 //    public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
 
-    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId}  AND pro_id =#{proId}")
+    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId}  AND pro_id =#{proId} and ISNULL(tj_num)")
     public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
 
     @Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
@@ -138,7 +141,8 @@
             "\tb.pro_id,\n" +
             "\tb.pro_name,\n" +
             "\tTRUNCATE(c.pro_price,2),\n" +
-            " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
+            "\tTRUNCATE(c.pro_price,2),\n" +
+//            " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
             "\tSYSDATE(),\n" +
             "\tc.pro_check_method,\n" +
             "\tIFNULL(c.pro_type,''),\n" +

--
Gitblit v1.8.0