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/resources/mapper/TjPackageMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ltkj-hosp/src/main/resources/mapper/TjPackageMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjPackageMapper.xml
index ed14c8f..6b78b04 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjPackageMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjPackageMapper.xml
@@ -54,7 +54,8 @@
                sale_num,
                category_id,
                his_pac_bm,
-               pym,tj_category
+               pym,
+               tj_category
         from tj_package
     </sql>
 
@@ -64,6 +65,7 @@
             <if test="pacName != null  and pacName != ''">and pac_name like concat('%', #{pacName}, '%')</if>
             <if test="pacRemark != null  and pacRemark != ''">and pac_remark like concat('%', #{pacRemark}, '%')</if>
             <if test="categoryId != null  and categoryId != ''">and category_id = #{categoryId}</if>
+            <if test="tjCategory != null  and tjCategory != ''">and tj_category = #{tjCategory}</if>
             and deleted =0
         </where>
     </select>

--
Gitblit v1.8.0