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/service/impl/TjOrderDetailServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 2a9d878..b18c21a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -107,11 +107,31 @@
     }
 
     @Override
+    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNullN(String orderId,String jxbz) {
+        return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNullN(orderId,jxbz);
+    }
+
+    @Override
+    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(String orderId) {
+        return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(orderId);
+    }
+
+    @Override
     public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNull(String orderId) {
         return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNull(orderId);
     }
 
     @Override
+    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(String orderId) {
+        return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(orderId);
+    }
+
+    @Override
+    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNullN(String orderId, String jxbz) {
+        return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNullN(orderId,jxbz);
+    }
+
+    @Override
     public List<TjOrderDetail> getTjOrderDetailListByOrderId(String orderId) {
         return tjOrderDetailMapper.getTjOrderDetailListByOrderId(orderId);
     }

--
Gitblit v1.8.0