From 1630243ed75a92c60d0638e7d14477e4aadcf2b7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 四月 2025 17:41:44 +0800
Subject: [PATCH] zjh20250418

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

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 0d75038..b670d01 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -225,10 +225,25 @@
     List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
 
 
+    @Select({"<script>", "SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id ",
+            " WHERE a.deleted=0 and  b.need_report='Y' AND c.org_type !=1 AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
+            "<foreach collection='split' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>" })
+    List<TjOrderRemark> yiShengJianChaYjGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
+
+
     @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
             "\n" +
             "WHERE a.deleted=0 and b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
     List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);
+
+
+    @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
+            "\n" +
+            "WHERE a.deleted=0 and b.need_report='Y' AND c.org_type !=1 AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
+    List<TjOrderRemark> yiShengJianChaYjGetPrentProCJGLY(@Param("tjNumber")String tjNumber);
 
 
 
@@ -293,6 +308,6 @@
     @Update("UPDATE tj_order_remark a SET a.deleted=1 WHERE a.remark_id=#{remarkId}")
     void updateTjOrderRemarkdel(@Param("remarkId")String remarkId);
 
-    @Select("call tj_yxjcymxx(#{tjh,mode=IN})")
-    List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber);
+    @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
+    List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
 }

--
Gitblit v1.8.0