From ba4eea8324f672321dae48bed279032ae8bedebd Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 02 一月 2025 17:16:28 +0800
Subject: [PATCH] zjh20250102
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 e30df00..da685f6 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
@@ -193,6 +193,7 @@
" parent_pro_id,\n" +
" parent_pro_name,\n" +
" ord_price,\n" +
+ " discount,\n" +
" now_price,\n" +
" create_time,\n" +
" pro_check_method,\n" +
@@ -204,7 +205,8 @@
"c.pro_name,\n" +
"b.pro_id,\n" +
"b.pro_name,\n" +
- "c.pro_price * (a.limits/10),\n" +
+ "c.pro_price,\n" +
+ "a.limits,\n" +
"c.pro_price * (a.limits/10),\n" +
"SYSDATE(),\n" +
"c.pro_check_method,\n" +
@@ -226,6 +228,7 @@
" parent_pro_id,\n" +
" parent_pro_name,\n" +
" ord_price,\n" +
+ " discount,\n" +
" now_price,\n" +
" create_time,\n" +
" pro_check_method,\n" +
@@ -240,8 +243,9 @@
"c.pro_name,\n" +
"b.pro_id,\n" +
"b.pro_name,\n" +
- "c.pro_price * (a.limits/10),\n" +
- "c.pro_price * (a.limits/10),\n" +
+ "c.pro_price,\n" +
+ "a.limits,\n" +
+ "(c.pro_price * (a.limits/10)),\n" +
"SYSDATE(),\n" +
"c.pro_check_method,\n" +
"c.pro_type,\n" +
@@ -277,7 +281,7 @@
@Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId} AND !ISNULL(a.pac_id)")
String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")String cardId);
- @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId}")
+ @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId} GROUP BY a.parent_pro_id")
BigDecimal getTbTransitionDxPriceByPac(@Param("cusId")String cusId,@Param("proId")Long proId,@Param("cardId")String cardId,@Param("pacId")Long pacId);
@@ -335,4 +339,9 @@
"WHERE b.pro_id IN(SELECT DISTINCT a.parent_pro_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND ISNULL(a.tj_num))" +
"AND b.grouping_id=#{pacId}")
String ttpanduantaocanshifouchongfu(@Param("idCard") String idCard,@Param("pacId") Long pacId);
+
+
+ @Select("SELECT a.parent_pro_name pro_name,b.pro_type,SUM(a.now_price) now_price,SUM(a.ord_price) ord_price,b.pro_check_method,a.discount FROM tb_transition a " +
+ "LEFT JOIN tj_project b ON b.pro_id=a.parent_pro_id WHERE ISNULL(a.tj_num) AND a.cus_id=#{idCard} GROUP BY a.parent_pro_id")
+ List<TbTransition> newgetTransitionList(String cusId);
}
--
Gitblit v1.8.0