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-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java index 2855b89..b8cbecc 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java @@ -58,12 +58,12 @@ public TableDataInfo list(@RequestBody DictSfxm dictSfxm) { startPage(); String pym = dictSfxm.getPym(); - if(null !=pym && !"".equals(pym)) { + if(null !=pym && !pym.isEmpty()) { pym=dictSfxm.getPym().toUpperCase(Locale.ROOT); dictSfxm.setPym(pym); } List<DictSfxm> list = dictSfxmService.selectDictSfxmList(dictSfxm); - if (null != list && list.size() > 0) { + if (null != list && !list.isEmpty()) { for (DictSfxm sfxm : list) { DictHosp hosp = dictHospService.getById(sfxm.getYqid()); if (null != hosp) { @@ -188,7 +188,7 @@ map.put("date", sfxmList); map.put("total", sfxms.size()); } else { - map.put("date", 0); + map.put("date", null); map.put("total", 0); } return AjaxResult.success(map); @@ -209,7 +209,7 @@ map.put("date", sfxmList); map.put("total", sfx.size()); } else { - map.put("date", 0); + map.put("date", null); map.put("total", 0); } return AjaxResult.success(map); -- Gitblit v1.8.0