From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 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 a22fa4c..d8e059a 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
@@ -108,25 +108,31 @@
List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
- @Select("SELECT\n" +
- "\tdep.dept_name,\n" +
- "\tpro.pro_name,\n" +
- "\tre.type,\n" +
- "\tus.nick_name doctor_name,\n" +
- "\tus.nick_name bcdoctor_name,\n" +
- "\t'缁熸敹' sffs,\n" +
- "\t'宸叉敹璐�' is_pay,\n" +
- "\tre.create_time qdcreate_time,\n" +
- "\tre.update_time bcupdate_time,\n" +
- "\tre.update_time zhupdate_time \n" +
- "FROM\n" +
- "\ttj_order_remark re\n" +
- "\tLEFT JOIN sys_dept dep ON re.dept_id = dep.dept_id\n" +
- "\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" +
- "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 '%璐�%'")
+ @Select({"<script>" +
+ "SELECT\n" +
+ " pro.pro_id,\n" +
+ " dep.dept_name,\n" +
+ " pro.pro_name,\n" +
+ " re.type,\n" +
+ " us.nick_name doctor_name,\n" +
+ " us.nick_name bcdoctor_name,\n" +
+ " '缁熸敹' sffs,\n" +
+ " '宸叉敹璐�' is_pay,\n" +
+ " re.create_time qdcreate_time,\n" +
+ " re.update_time bcupdate_time,\n" +
+ " re.update_time zhupdate_time\n" +
+ " FROM\n" +
+ " tj_order_remark re\n" +
+ " LEFT JOIN sys_dept dep ON re.dept_id = dep.dept_id\n" +
+ " 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.type != 2\n" +
+ " AND re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
+ " <when test='sfzpacs == true'> " +
+ " AND dep.org_type = 2"+
+ " </when>"+
+ "</script>"})
List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber,@Param("sfzpacs") boolean sfzpacs );
@@ -155,4 +161,12 @@
" AND (a.pro_name LIKE '%蹇冪數鍥�%' OR a.pro_name LIKE '%濡囨煡%' OR a.pro_name LIKE '%hpv%' OR a.pro_name LIKE '%tct%' OR a.pro_name LIKE '%濡囩浜旇仈妫�%'\n" +
" OR a.pro_name LIKE '%鐢靛瓙闃撮亾闀滄鏌�%' OR a.pro_name LIKE '%C14%' OR a.pro_name LIKE '%蹇冪悊妫�娴�%' OR a.pro_name LIKE '%鑲哄姛鑳芥鏌�%' OR a.pro_name LIKE '%闈欒剦%');")
boolean updateRemark(String tjNum);
+
+
+
+ @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
+ "\n" +
+ "WHERE a.deleted=0 AND b.org_type=3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+// AND c.need_report='Y' guo
+ List<TjOrderRemark> notHuaYanData(String tjnumber);
}
--
Gitblit v1.8.0