From 62eb109ad2041c38df8f48d41b95a85d2dc44cb7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 七月 2025 17:56:12 +0800
Subject: [PATCH] zjh20250715-2

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 fe32a38..ffbfa95 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
@@ -26,7 +26,7 @@
     @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND deleted='0'")
     List<TjOrderRemark> getTjOrderRemarkListByTjNum(String tjNumber);
 
-    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
+    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted=0 ")
     TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber, @Param("proParentId") String proParentId);
 
     @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")
@@ -288,8 +288,18 @@
     List<CsProVo> getYxJcXx(@Param("tjh") String tjNumber, @Param("ks") String ks);
 
 
-    @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
-            " WHERE b.need_report='Y' AND b.pro_delivery=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} ")
+//    @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
+//            " WHERE b.need_report='Y' AND b.pro_delivery=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} ")
+
+    @Select("call  yiShengJianChaGetPrentProWs(#{tjnumber,mode=IN})")
     List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber);
 
+
+    @Select("call csymxmxzqtyybcjk(#{tjh,mode=IN},#{xmid,mode=IN},#{yy,mode=IN},#{kslx,mode=IN},#{czy,mode=IN}," +
+            "#{czydm,mode=IN}) ")
+    void csymxmxzqtyybcjk(@Param("tjh")String tjNum,@Param("xmid") String proId,@Param("yy") String yy,
+                          @Param("kslx") String orgType,@Param("czy") String czy,@Param("czydm") String czydm);
+
+    @Select("call newpacsJianChaData(#{tjnumber,mode=IN},0)")
+    List<TjOrderRemark> newpacsJianChaData(String tjnumber);
 }

--
Gitblit v1.8.0