zhaowenxuan
2024-12-13 125d57fe9865d5a58cf83bd4b2352d874a99953b
20241213
2个文件已修改
32 ■■■■ 已修改文件
ltkj-admin/pom.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>-->
<!--                        &lt;!&ndash; 排除 Font 文件夹 &ndash;&gt;-->
<!--                        <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>
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);