From c5a0c0b290cba50f76d17843ac062ffa935b15d6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 30 十月 2024 18:03:18 +0800
Subject: [PATCH] zjh20241030

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 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 82ce1ad..0ef8cbd 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 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=3 or type=0 AND deleted=0")
+    @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")
     int getTjYqOrderRemarkByTjNum(String tjNumber);
 
     @Delete("DELETE  FROM tj_order_remark WHERE tj_number=#{tjNumber}")
@@ -67,7 +67,28 @@
     boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
 
 
-    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type =1 AND deleted='0'")
+    @Insert("INSERT INTO tj_order_remark(\n" +
+            "pro_id,\n" +
+            "dept_id,\n" +
+            "create_time,\n" +
+            "create_by,\n" +
+            "create_id,\n" +
+            "tj_number,\n" +
+            "type,\n" +
+            "update_by,\n" +
+            "update_time,\n" +
+            "update_id\n" +
+            ")\n" +
+            "\n" +
+            "SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},1,#{userName},SYSDATE(),#{userId} FROM tj_order_detail a " +
+            "LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.order_id=#{orderId} AND\n" +
+            "b.pro_parent_id=0")
+    boolean saveJSYTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
+
+
+
+    @Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.tj_number=#{tjNumber}" +
+            " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257)
     List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
 
 
@@ -104,7 +125,22 @@
             "\tLEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" +
             "\tLEFT JOIN sys_user us ON us.user_id = re.doctor_name \n" +
             "WHERE\n" +
-            "\tre.type != 2 and pro.need_report='Y' \n" +
-            "\tAND re.tj_number =#{tjNumber}")
+            "re.type != 2  \n" +//and pro.need_report='Y'
+            "AND re.tj_number =#{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'")
     List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
+
+
+    @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
+//    @Select("select * from test_remark")
+    List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
+
+    @Select("call pro_checkhyAndcg(0,#{tjnumber,mode=IN})")
+    List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber")String tjnumber);
+
+
+    @Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
+    void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);
+
+    @Delete("DELETE  FROM tj_order_remark WHERE jxbz=#{bldh}")
+    void deleteTjOrderDetailByjxbz(String bldh);
 }

--
Gitblit v1.8.0