From 408e037640b27edfc0b800a437d02be2deb4fcc4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 14 二月 2025 14:39:50 +0800
Subject: [PATCH] zjh20250214
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 9b6e2a5..5e0908c 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
@@ -61,10 +61,11 @@
"tj_number,\n" +
"update_by,\n" +
"update_time,\n" +
- "update_id\n" +
+ "update_id,\n" +
+ "type\n" +
")\n" +
"\n" +
- "SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},#{userName},SYSDATE(),#{userId} FROM tj_order_detail a " +
+ "SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},#{userName},SYSDATE(),#{userId},IF(b.need_report<>'Y',1,0) 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 saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
@@ -132,7 +133,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
// " re.type != 2 AND\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
" <when test='sfzpacs == true'> " +
" AND dep.org_type = 2"+
" </when>"+
@@ -214,7 +215,7 @@
@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 b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
+ " WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
"<foreach collection='split' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
@@ -249,7 +250,7 @@
" LEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" +
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' " +
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
" AND dep.org_type in (1,2 )"+
"</script>"})
List<CsProVo> ysjcGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber);
@@ -275,7 +276,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
// " re.type != 2 AND\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y' " +
" AND dep.org_type = 1"+
"</script>"})
List<CsProVo> cSWebGetProByTjNumAndOrderIdJy(String tjNumber);
--
Gitblit v1.8.0