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 |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 ad6d7df..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
@@ -4,6 +4,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ltkj.hosp.domain.TjOrderRemark;
+import com.ltkj.hosp.vodomain.CsProVo;
 import org.apache.ibatis.annotations.*;
 
 /**
@@ -25,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}")
@@ -84,4 +85,26 @@
             "LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
             "WHERE b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
     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" +
+            "\tre.type != 2 and pro.need_report='Y' \n" +
+            "\tAND re.tj_number =#{tjNumber}")
+    List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
 }

--
Gitblit v1.8.0