From 92a623ed62880c20798ed2089ccabe8c74b83dbc Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Mon, 19 Jan 2026 13:06:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86]=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java    | 4 ++--
 .../src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java
index 465c628..fc18581 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java
@@ -151,7 +151,7 @@ public class Dosage {
         for (GyzjJcgj jcgj : gyzjJcgjList) {
             StringJoiner result = new StringJoiner(", ");
             if ("en".equals(lang)) {
-                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + getName(jcgj.getJcnrEn()), 10, false);
+                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + jcgj.getJcmcEn(), 10, false);
                 if (StringUtils.isNoneBlank(jcgj.getJcnrEn())) {
                     ObjectMapper mapper = new ObjectMapper();
                     JsonNode jsonArray = mapper.readTree(jcgj.getJcnrEn());
@@ -164,8 +164,8 @@ public class Dosage {
                     }
                 }
             } else {
+                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + jcgj.getJcmc(), 10, false);
                 if (StringUtils.isNoneBlank(jcgj.getJcnr())) {
-                    PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + getName(jcgj.getJcmc()), 10, false);
                     ObjectMapper mapper = new ObjectMapper();
                     JsonNode jsonArray = mapper.readTree(jcgj.getJcnr());
                     for (JsonNode node : jsonArray) {
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java
index 4124f9e..8627225 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java
@@ -150,7 +150,7 @@ public class Drug {
         for (MjyJcgj jcgj : mjyJcgjList) {
             StringJoiner result = new StringJoiner(", ");
             if ("en".equals(lang)) {
-                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + getName(jcgj.getJcnrEn()), 10, false);
+                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + jcgj.getJcmcEn(), 10, false);
                 if (StringUtils.isNoneBlank(jcgj.getJcnrEn())) {
                     ObjectMapper mapper = new ObjectMapper();
                     JsonNode jsonArray = mapper.readTree(jcgj.getJcnrEn());
@@ -163,7 +163,7 @@ public class Drug {
                     }
                 }
             } else {
-                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + getName(jcgj.getJcmc()), 10, false);
+                PdfBaseUtil.addUnderlinedTitle(document, PdfExportUtil.parseDateToStr(jcgj.getCreateTime())+ "     " + jcgj.getJcmc(), 10, false);
                 if (StringUtils.isNoneBlank(jcgj.getJcnr())) {
                     ObjectMapper mapper = new ObjectMapper();
                     JsonNode jsonArray = mapper.readTree(jcgj.getJcnr());