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/ITjOrderService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java index 6d78e52..d6a85fa 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java @@ -130,7 +130,7 @@ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆) Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize, - Integer checkStatus, String compId, String beginTime, String endTime,String tjname); + Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tcm); public int selectTjOrderByCardId(String cardId); @@ -163,6 +163,8 @@ List<String> getHuoQuBlZlsqdh(String cardId, String bldh); Boolean delHuoQuZlsqdh(String cardId, String bldh); + int getOrderCountByTjNum(String tjNum); + Map<String,Object> getgetBghsList(String tjNumber, Integer page, Integer pageSize, String value, String beginTime, String endTime, String name); @@ -188,4 +190,9 @@ void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId); Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime); + + + //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆) + Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize, + String compId, String beginTime, String endTime,String tjname,String tcm,String deptId); } -- Gitblit v1.8.0