From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 8cb477f..71e92c1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -25,14 +25,17 @@
@Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} and a.lx=0 ")
LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
- @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx=0 ")
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx=0 and sgorzd=0 ")
void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
@Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh} and lx=1 ")
void deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh} and lx=0 ")
+ void sdtbdeletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
+
@Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx=1 ")
- void deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh);
+ void deletedLtkjJcsqdByTjhandtmh1(@Param("tjh") String tjh);
@Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
@@ -44,6 +47,13 @@
"a.yxzd jgzt,a.bg_nr jgbx,'0',sysdate()\n" +
"FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.lx=0 GROUP BY a.xmmc")
void saveLtkjExamJcsqd(String tjh);
+
+ @Insert("INSERT INTO ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, " +
+ "`sqsj`, `jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
+ "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
+ "a.yxzd jgzt,a.bg_nr jgbx,'1',sysdate()\n" +
+ "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.tmh=#{tmh} and a.lx=1 GROUP BY a.xmmc")
+ void saveXdtLtkjExamJcsqd(@Param("tjh") String tjh,@Param("tmh")String tmh);
@Select("SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw," +
"a.yxzd jgzt,a.yxbx jgbx FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
@@ -59,14 +69,7 @@
@Param("page")int page,
@Param("status")String status);
- @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and jcxmid = #{xmid} and lx=0 ")
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and jcxmid = #{xmid} and lx=0 and sgorzd=1 ")
void deletedLtkjJcsqdByTjhAndProId(@Param("tjh") String tjh,@Param("xmid") String xmid);
-
- @Insert("INSERT INTO ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, `sqsj`, " +
- "`jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
- "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
- "a.yxzd jgzt,a.bg_nr jgbx,'1',sysdate()\n" +
- "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.lx=1 GROUP BY a.xmmc")
- void saveLtkjExamJcsqdxdt(String tjh);
}
--
Gitblit v1.8.0