From ed277ece348dae9bc6e36c0fc9f69ae8a3825912 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 18 四月 2024 17:57:55 +0800
Subject: [PATCH] 填鸭表单

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java |   13 +++++++++----
 1 files changed, 9 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 b8a9572..e05e048 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
@@ -67,7 +67,8 @@
     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'")
+    @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,12 +105,16 @@
             "\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" +
+            "\tre.type != 2  \n" +//and pro.need_report='Y'
             "\tAND re.tj_number =#{tjNumber}")
     List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
 
 
-//    @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
-    @Select("select * from test_remark")
+    @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
+//    @Select("select * from test_remark")
     List<TjOrderRemark> addHuaYanTable(@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);
 }

--
Gitblit v1.8.0