From b73fedc4026231b31cbc99f9fdad54c8e73a1a34 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 04 七月 2025 17:39:24 +0800
Subject: [PATCH] 2025-0704
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 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 9b6e2a5..cc747d2 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
@@ -27,7 +27,7 @@
List<TjOrderRemark> getTjOrderRemarkListByTjNum(String tjNumber);
@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);
+ TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber, @Param("proParentId") String proParentId);
@Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")
int getTjYqOrderRemarkByTjNum(String tjNumber);
@@ -51,7 +51,6 @@
String getTjOrderRemarkProIdList(String tjNumber);
-
@Insert("INSERT INTO tj_order_remark(\n" +
"pro_id,\n" +
"dept_id,\n" +
@@ -61,13 +60,14 @@
"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);
+ boolean saveTjOrderRemarkByOrderId(@Param("tjNumber") String tjNumber, @Param("userName") String userName, @Param("userId") String userId, @Param("orderId") String orderId);
@Insert("INSERT INTO tj_order_remark(\n" +
@@ -86,12 +86,12 @@
"SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},1,#{userName},SYSDATE(),#{userId} 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 saveJSYTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
-
+ boolean saveJSYTjOrderRemarkByOrderId(@Param("tjNumber") String tjNumber, @Param("userName") String userName, @Param("userId") String userId, @Param("orderId") String orderId);
@Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.tj_number=#{tjNumber}" +
- " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257)
+ " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")
+//and a.dept_id in (269,270,253,254,255,257)
List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
@@ -102,13 +102,13 @@
@Select("SELECT b.pro_id FROM tj_package_project a " +
"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> getTjProIdsByTjNumAndPacIc(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
+ List<Long> getTjProIdsByTjNumAndPacIc(@Param("tjNumber") String tjNumber, @Param("pacId") String pacId);
@Select("SELECT b.pro_id FROM tj_package_project a " +
"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);
+ List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber, @Param("pacId") String pacId);
@Select({"<script>" +
@@ -132,12 +132,12 @@
" 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>"+
+ " AND dep.org_type = 2" +
+ " </when>" +
"</script>"})
- List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber,@Param("sfzpacs") boolean sfzpacs );
+ List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber, @Param("sfzpacs") boolean sfzpacs);
@Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
@@ -145,11 +145,11 @@
List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
@Select("call pro_checkhyAndcg(0,#{tjnumber,mode=IN})")
- List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber")String tjnumber);
+ List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber") String tjnumber);
@Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
- void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);
+ void updateTjOrderRemark(@Param("tjnumber") String tjnumber, @Param("proId") String proId);
@Delete("DELETE FROM tj_order_remark WHERE jxbz=#{bldh}")
void deleteTjOrderDetailByjxbz(String bldh);
@@ -167,17 +167,17 @@
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}")
- @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
+ @Select("call notHuaYanData(#{tjnumber,mode=IN})")
List<TjOrderRemark> notHuaYanData(String tjnumber);
- @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 = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
-// AND c.need_report='Y' guo
+ // @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 = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+ @Select("call pacsJianChaData(#{tjnumber,mode=IN})")
List<TjOrderRemark> pacsJianChaData(String tjnumber);
@@ -188,7 +188,7 @@
List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu3(@Param("tjNumber") String tjNumber);
- void tjYishengjianchajianyi(Map<String,Object> map);
+ void tjYishengjianchajianyi(Map<String, Object> map);
@Select("SELECT COUNT(*) a FROM tj_order_remark a WHERE a.deleted=0 AND a.tj_number=#{tjNum} AND a.type =1;")
@@ -202,7 +202,7 @@
"SET\n" +
" a.sfbz=#{ls}\n" +
"WHERE b.order_id=#{orderId} AND a.jxbz=#{jxbz}")
- void updateTjOrderRemarkSfbzByJxbz(@Param("orderId") String orderId,@Param("jxbz") String jxbz,@Param("ls") String ls);
+ void updateTjOrderRemarkSfbzByJxbz(@Param("orderId") String orderId, @Param("jxbz") String jxbz, @Param("ls") String ls);
@Update("\n" +
@@ -210,23 +210,22 @@
"SET\n" +
" a.sfbz=#{ls}\n" +
"WHERE b.order_id=#{orderId} AND ISNULL(a.jxbz)")
- void updateTjOrderRemarkSfbzByJxbzisnull(@Param("orderId") String orderId,@Param("ls") String ls);
+ void updateTjOrderRemarkSfbzByJxbzisnull(@Param("orderId") String orderId, @Param("ls") String ls);
@Select({"<script>", "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 ",
- " WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
+ " WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
"<foreach collection='split' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
- "</script>" })
- List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
+ "</script>"})
+ 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" +
"\n" +
"WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);
-
@Select({"<script>" +
@@ -249,8 +248,8 @@
" 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.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' " +
- " AND dep.org_type in (1,2 )"+
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
+ " AND dep.org_type in (1,2 )" +
"</script>"})
List<CsProVo> ysjcGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber);
@@ -275,14 +274,32 @@
" 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"+
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y' " +
+ " 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);
+
+ @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
+ List<CsProVo> getYxJcXx(@Param("tjh") String tjNumber, @Param("ks") String ks);
+
+
+// @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
+// " WHERE b.need_report='Y' AND b.pro_delivery=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} ")
+
+ @Select("call yiShengJianChaGetPrentProWs(#{tjnumber,mode=IN})")
+ List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber);
+
+
+ @Select("call csymxmxzqtyybcjk(#{tjh,mode=IN},#{xmid,mode=IN},#{yy,mode=IN},#{kslx,mode=IN},#{czy,mode=IN}," +
+ "#{czydm,mode=IN}) ")
+ void csymxmxzqtyybcjk(@Param("tjh")String tjNum,@Param("xmid") String proId,@Param("yy") String yy,
+ @Param("kslx") String orgType,@Param("czy") String czy,@Param("czydm") String czydm);
+
+ @Select("call newpacsJianChaData(#{tjnumber,mode=IN},0)")
+ List<TjOrderRemark> newpacsJianChaData(String tjnumber);
}
--
Gitblit v1.8.0