From a6c2fcf68b27c50f2390e6b9d7e050cc3f76eceb Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 切库

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 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 c9a779a..397ea96 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
@@ -2,11 +2,13 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ltkj.hosp.domain.TjOrderRemark;
 import com.ltkj.hosp.vodomain.CsProVo;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 鍖荤敓澶囨敞Mapper鎺ュ彛
@@ -59,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);
@@ -130,7 +133,7 @@
             "            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 re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
             "            <when test='sfzpacs == true'>   " +
             "               AND dep.org_type = 2"+
             "            </when>"+
@@ -217,7 +220,7 @@
             "#{id}",
             "</foreach>",
             "</script>" })
-    List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") List<Integer> split);
+    List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
 
 
     @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
@@ -251,4 +254,36 @@
             " AND dep.org_type in (1,2 )"+
             "</script>"})
     List<CsProVo> ysjcGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber);
+
+    @Select({"<script>" +
+            "SELECT\n" +
+            "            pro.pro_id,\n" +
+            "            dep.dept_name,\n" +
+            "            dep.dept_id,\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 AND\n" +
+            "             re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
+            "             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