From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 030a92d..6c53e73 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -208,7 +208,7 @@
"FROM `tj_order_detail` \n" +
"where order_id=#{orderId}\n" +
"and pro_id IN\n" +
- "(select pro_id from tj_project where pro_parent_id=#{proParentId})")
+ "(select pro_id from tj_project where pro_parent_id=#{proParentId} and deleted=0 and pro_status=0)")
public List<TjOrderDetail> getDetailByOrderIdAndParId(@Param("orderId")Long orderId,@Param("proParentId")Long proParentId);
public List<TjOrderDetail> getDetailByOrderIdAndParIds(@Param("orderId")Long orderId,@Param("proParentIds")List<Long> proParentIds);
@@ -303,4 +303,8 @@
" LEFT JOIN sys_dept d ON p.dept_id = d.dept_id\n" +
" WHERE order_id = #{orderId} AND p.pro_parent_id <>0 AND o.is_return = #{type}")
List<ProFcListVo> getFcList(@Param("orderId") Long orderId, @Param("type") Integer type);
+
+
+ @Select("call newpacsJianChaData(#{tjnumber,mode=IN},1)")
+ List<TjOrderDetail> newgetDetailByOrderIdAndParId(String tjNumber);
}
--
Gitblit v1.8.0