From 125d57fe9865d5a58cf83bd4b2352d874a99953b Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 13 十二月 2024 21:48:07 +0800
Subject: [PATCH] 20241213
---
ltkj-admin/pom.xml | 22 +++++++++++-----------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 10 +++++-----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index 52c77da..9728af6 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -266,17 +266,17 @@
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
-<!-- <plugin>-->
-<!-- <groupId>org.apache.maven.plugins</groupId>-->
-<!-- <artifactId>maven-jar-plugin</artifactId>-->
-<!-- <version>3.2.0</version>-->
-<!-- <configuration>-->
-<!-- <excludes>-->
-<!-- <!– 鎺掗櫎 Font 鏂囦欢澶� –>-->
-<!-- <exclude>**/Font/**</exclude>-->
-<!-- </excludes>-->
-<!-- </configuration>-->
-<!-- </plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <excludes>
+ <!-- 鎺掗櫎 Font 鏂囦欢澶� -->
+ <exclude>**/Font/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
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 c019590..680f09d 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
@@ -1470,14 +1470,14 @@
if (StrUtil.isNotBlank(customer.getCompName())){
hashMap.put("work", customer.getCompName());
}else {
- LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
- DictComp dictComp = dictCompService.getOne(wq111);
+// LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+// wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+// DictComp dictComp = dictCompService.getOne(wq111);
- if (dictComp == null) {
+ if (StrUtil.isBlank(tjOrder.getFirmName())) {
hashMap.put("work", "鏃�");
} else {
- hashMap.put("work", dictComp.getCnName());
+ hashMap.put("work", tjOrder.getFirmName());
}
}
hashMap.put("sex", sex);
--
Gitblit v1.8.0