From 0829d4024345f075cce86e606e10667621d5a3e1 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 12 十二月 2024 13:32:51 +0800
Subject: [PATCH] 2024-12-12

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 145f86b..85b50bb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -400,7 +400,7 @@
 //
 //                        }
                     String str = "     ";
-                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),null,i.get(2),tjOrder.getTjNumber());
+                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",i.get(2),tjOrder.getTjNumber());
                         if (!maps.isEmpty()){
                             for (Map<String, Object> objectMap : maps) {
 //                                paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
@@ -464,13 +464,19 @@
                 paragraph.setAlignment(Element.ALIGN_LEFT);
                 document2.add(paragraph);
                 String str = "     ";
-                List<Map<String, Object>> advices = detail.getAdvices();
-                if (advices != null && !advices.isEmpty()) {
-                    for (Map<String, Object> m : advices) {
-                        paragraph = new Paragraph(str + m.get("bt").toString() + "锛�" + m.get("nr").toString(), defaultFont);
-                        paragraph.setAlignment(Element.ALIGN_LEFT);
-                        document2.add(paragraph);
-                    }
+//                List<Map<String, Object>> advices = detail.getAdvices();
+//                if (advices != null && !advices.isEmpty()) {
+//                    for (Map<String, Object> m : advices) {
+//                        paragraph = new Paragraph(str + m.get("bt").toString() + "锛�" + m.get("nr").toString(), defaultFont);
+//                        paragraph.setAlignment(Element.ALIGN_LEFT);
+//                        document2.add(paragraph);
+//                    }
+//                }
+                List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
+                for (Map<String, Object> objectMap : maps) {
+                    paragraph = new Paragraph(str+objectMap.get("bt").toString()+"锛�"+objectMap.get("nr").toString(),defaultFont);
+                    paragraph.setAlignment(Element.ALIGN_LEFT);
+                    document2.add(paragraph);
                 }
                 index++;
             }

--
Gitblit v1.8.0