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/LtkjExamJcbgdMapper.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java index 85e3793..e24f7a4 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java @@ -21,18 +21,21 @@ @DataSource(value = DataSourceType.MASTER) public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> { - @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx=0 ") - void deletedLtkjJcbgdByTjhAndTmh(String tmh); + @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx=0 and sgorzd=0 ") + void deletedLtkjJcbgdByTjhAndTmh(String tmh); - @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} ") - void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh); + @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} and lx=1 ") + void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh); - @Select ("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh") + @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} and lx=0 and sgorzd=1 ") + void deletedLtkjJcbgdByTjhAndTmhA(@Param("tjh") String tjh, @Param("tmh") String tmh); + + @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh") List<String> getJianJcBaoGaoDan(String cardId); @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} GROUP BY xmmc ") List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh); -@Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}") + @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}") List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId); } -- Gitblit v1.8.0