From 1a9b1c532d4afac46377e70fcda89faf21a1c489 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 01 二月 2024 16:46:40 +0800
Subject: [PATCH] 项目

---
 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