From 1c4935c13c44f35bc59e77cff6a66e3131a35d94 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 17:56:21 +0800
Subject: [PATCH] 修改同步
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 17 ++++++++++++++---
1 files changed, 14 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 de247aa..52c516b 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
@@ -8,6 +8,7 @@
import com.ltkj.hosp.domain.TjOrderRemark;
import com.ltkj.hosp.vodomain.CsProVo;
import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
/**
* 鍖荤敓澶囨敞Mapper鎺ュ彛
@@ -60,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);
@@ -131,9 +133,12 @@
" 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 pro.need_report='Y'" +
" <when test='sfzpacs == true'> " +
" AND dep.org_type = 2"+
+ " </when>"+
+ " <when test='sfzpacs == false'>"+
+ " AND re.dept_id != 532 AND pro.pro_name not like '%璐�%'"+
" </when>"+
"</script>"})
List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber,@Param("sfzpacs") boolean sfzpacs );
@@ -278,4 +283,10 @@
" AND dep.org_type = 1"+
"</script>"})
List<CsProVo> cSWebGetProByTjNumAndOrderIdJy(String tjNumber);
+
+
+
+ List<TjOrderRemark> shoufeiyemianyishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
+
+ List<TjOrderRemark> shoufeiyemianweishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
}
--
Gitblit v1.8.0