From fc868e56b1e8199d2c4267fae74c44cfa62a777f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 31 一月 2024 09:13:51 +0800
Subject: [PATCH] zjh 本地 2024/01/31 -1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 1896fef..82ce1ad 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
@@ -26,7 +26,7 @@
@Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber,@Param("proParentId") String proParentId);
- @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type=3 AND deleted=0")
+ @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type=3 or type=0 AND deleted=0")
int getTjYqOrderRemarkByTjNum(String tjNumber);
@Delete("DELETE FROM tj_order_remark WHERE tj_number=#{tjNumber}")
@@ -104,7 +104,7 @@
"\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 \n" +
+ "\tre.type != 2 and pro.need_report='Y' \n" +
"\tAND re.tj_number =#{tjNumber}")
List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
}
--
Gitblit v1.8.0