From 91b430242c65f742ac06313bff34b6d9ec97ce50 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期二, 29 十月 2024 11:43:53 +0800
Subject: [PATCH] 错误收费金额修改
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 18e812b..cc25ed3 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
@@ -65,25 +65,31 @@
*/
public int deleteTbTransitionByIds(String[] ids);
- @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId}")
+ @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} and isnull(tj_num)")
public boolean deletedTbTransitionByCusId(String cusId);
@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}")
boolean updateTbTransitionByTjNum(String tjNum);
- @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}")
+ @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId} and isnull(tj_num)")
public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId);
@Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} and card_id=#{cardId}")
public List<TbTransition> getTbTransitionListByCusId(@Param("cusId")String cusId,@Param("cardId")String cardId);
- @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) and card_id=#{cardId}")
+ @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} and card_id=#{cardId} and jxbz=#{jxbz}")
+ public List<TbTransition> getBlTbTransitionListByCusId(@Param("cusId")String cusId,@Param("cardId")String cardId,@Param("jxbz") String jxbz);
+
+ @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) and isnull(tj_num)")
public boolean deletedTbTransitionListByCusIdAndPac(@Param("cusId")String cusId,@Param("cardId")String cardId);
@Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(tj_num)and card_id=#{cardId}")
@@ -93,7 +99,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)")
@@ -110,8 +116,17 @@
"a.ord_price=a.now_price,\n" +
"a.now_price=a.ord_price*(#{discount}/10)," +
"a.tj_num=#{tjNum}"+
- " WHERE a.cus_id=#{cusId} ")
+ " WHERE a.cus_id=#{cusId} AND ISNULL(a.tj_num) ")
boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount,@Param("tjNum")String tjNum);
+
+
+ @Update("UPDATE tb_transition a SET \n" +
+ " a.now_price=#{jg},\n" +
+ " a.tj_num=#{tjNum},\n" +
+ " a.card_id=#{cardId},\n" +
+ " a.jxbz=#{jxbz}\n" +
+ " WHERE a.id=#{id}")
+ public boolean updateTbTransitionById(@Param("id")String id,@Param("jxbz")String jxbz,@Param("tjNum")String tjNum,@Param("cardId")String cardId,@Param("jg")BigDecimal jg);
@Insert("INSERT INTO tb_transition(\n" +
@@ -138,7 +153,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" +
@@ -232,7 +248,19 @@
"a.card_id=#{cardId}\n" +
"WHERE\n" +
"\ta.cus_id =#{idCard}\n" +
- "\tAND ISNULL(a.tj_num)")
- boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId);
+ "\tAND a.tj_num = #{tjNumber}")
+ boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId,@Param("tjNumber") String tjNumber);
+
+ @Delete("DELETE FROM tb_transition WHERE jxbz=#{bldh}")
+ void deleteTjOrderDetailByjxbz(String bldh);
+
+ /**
+ * 鏍规嵁tjNum鍜宲arentProId鏌ヨ鎬讳环
+ * @param tjNum
+ * @param parentProId
+ * @return
+ */
+ @Select("SELECT SUM(now_price) FROM `tb_transition` WHERE `tj_num` = #{tjNum} AND `parent_pro_id` = #{parentProId}")
+ BigDecimal getLisPriceByTjNumAndParentProId(@Param("tjNum")String tjNum,@Param("parentProId")String parentProId);
}
--
Gitblit v1.8.0