From c63daceb66fbb7faa56849e695c07e28447818b9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 14:18:46 +0800
Subject: [PATCH] pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 3caa03c..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
@@ -7,6 +7,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -20,12 +21,21 @@
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
- @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
- void deletedLtkjJcbgdByTjhAndTmh(String tmh);
+ @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx=0 and sgorzd=0 ")
+ void deletedLtkjJcbgdByTjhAndTmh(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=1 ")
+ void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh);
+
+ @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}")
+ List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);
}
--
Gitblit v1.8.0