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/ITjSamplingService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
index 0d0e8fd..bad2931 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjSampling;
import org.apache.ibatis.annotations.Param;
@@ -87,4 +88,17 @@
boolean updateHeBingXm(@Param("ids") List<String> ids);
String getBuKeHebingProName(List<String> ids);
+
+ AjaxResult mergeCaiYangTran(List<String> ids,String prefix);
+
+ String mergeCaiYangApi(List<String> ids,String prefix);
+
+ /**
+ * 鍒ゆ柇椤圭洰鏄惁鑳借繘琛屽悎骞�
+ * @param id 閲囨牱琛╥d
+ * @return
+ */
+ int isMergeItem(String id);
+
+ int isExistProId(String tjh,String proId);
}
--
Gitblit v1.8.0