From b60f30814143a9c61200504cfc783ae6cb66fd6d Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 14 二月 2025 14:53:51 +0800 Subject: [PATCH] zjh20250214 --- ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 7 ++++--- 1 files changed, 4 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 9b6e2a5..397ea96 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>"+ -- Gitblit v1.8.0