From 11e0493f73200db32f82649dcb5cdce1e3eb0311 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 27 Jan 2026 17:16:45 +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]=E8=AF=A6=E6=83=85=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java | 9 ++++++--- .../main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java | 11 +++++++---- .../java/com/hxhq/business/utils/pdf/resource/Dosage.java | 6 +++--- .../main/java/com/hxhq/business/utils/pdf/resource/Drug.java | 10 +++++----- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java index bc31809..6caf86c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java @@ -18,15 +18,18 @@ public class GyzjJcnrUtil { mapLang.put("入库","In Storage"); mapLang.put("未入库","Not in Storage"); mapLang.put("已发放","In Use"); - mapLang.put("已锁定","'Locked'"); + mapLang.put("已锁定","Locked"); mapLang.put("待归档","Pending Archiving"); - mapLang.put("归档","'Archived'"); + mapLang.put("归档","Archived"); mapLang.put("待解档","Pending De-archiving"); mapLang.put("借阅开始时间","Checkout Start Date"); mapLang.put("借阅结束时间","Checkout End Date"); mapLang.put("处置方式","Dispose Method"); mapLang.put("处置原因","Reason"); + mapLang.put("处置","Dispose"); mapLang.put("处置量","Amount"); + mapLang.put("使用","Usage"); + mapLang.put("配制完成","Configuration completed"); mapLang.put("处置人","Operator"); mapLang.put("复核人","Reviewer"); mapLang.put("监督人","Supervisor"); @@ -69,7 +72,7 @@ public class GyzjJcnrUtil { mapLang.put("失效日期","Expiration"); mapLang.put("制剂状态","Status"); mapLang.put("所属表单","In Record"); - mapLang.put("所属试验信息","From Study"); + mapLang.put("表单所属试验","From Study"); mapLang.put("表单所属人","By User"); mapLang.put("基本信息","Information"); mapLang.put("表单信息","Record Information"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java index ba38486..5d8026b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java @@ -18,16 +18,19 @@ public class MjyJcnrUtil { mapLang.put("入库","In Storage"); mapLang.put("未入库","Not in Storage"); mapLang.put("已发放","In Use"); - mapLang.put("已锁定","'Locked'"); + mapLang.put("已锁定","Locked"); mapLang.put("待归档","Pending Archiving"); - mapLang.put("归档","'Archived'"); + mapLang.put("归档","Archived"); mapLang.put("待解档","Pending De-archiving"); mapLang.put("借阅开始时间","Checkout Start Date"); mapLang.put("借阅结束时间","Checkout End Date"); + mapLang.put("处置","Dispose"); mapLang.put("处置方式","Dispose Method"); mapLang.put("处置原因","Reason"); mapLang.put("处置量","Amount"); mapLang.put("处置人","Operator"); + mapLang.put("使用","Usage"); + mapLang.put("配制完成","Configuration completed"); mapLang.put("复核人","Reviewer"); mapLang.put("监督人","Supervisor"); mapLang.put("钥匙1领取人","Key 1 User"); @@ -63,12 +66,12 @@ public class MjyJcnrUtil { mapLang.put("失效日期","Expiration"); mapLang.put("制剂状态","Status"); mapLang.put("所属表单","In Record"); - mapLang.put("所属试验信息","From Study"); + mapLang.put("表单所属试验","From Study"); mapLang.put("表单所属人","By User"); mapLang.put("基本信息","Information"); mapLang.put("表单信息","Record Information"); mapLang.put("稽查轨迹","Track Record"); - mapLang.put("给药制剂台账","Formulation Table"); + mapLang.put("麻精药台账","Drug Table"); mapLang.put("备注","Comment"); mapLang.put("签名人","Signed By"); 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 0efc690..111b7e5 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 @@ -64,7 +64,7 @@ public class Dosage { // 表单信息 PdfBaseUtil.addUnderlinedTitle(document, getName("表单信息"), 10, true); Map formData3 = new LinkedHashMap<>(); - formData3.put(getName("所属试验信息"), gyzj.getStudyMc()); + formData3.put(getName("表单所属试验"), gyzj.getStudyMc()); formData3.put(getName("所属表单"), gyzj.getBdMc()); formData3.put(getName("表单所属人"), gyzj.getBdgsrMc()); PdfBaseUtil.addFormTableColumns(document, formData3, 2); @@ -158,7 +158,7 @@ public class Dosage { for (JsonNode node : jsonArray) { if (node.get("name") != null) { String name = node.get("name").asText(); - String value = node.get("value").asText(); + String value = node.get("value")!=null? node.get("value").asText():""; result.add(name + "：" + value); } } @@ -171,7 +171,7 @@ public class Dosage { for (JsonNode node : jsonArray) { if (node.get("name") != null) { String name = node.get("name").asText(); - String value = node.get("value").asText(); + String value =node.get("value")!=null? node.get("value").asText():""; result.add(name + "：" + value); } } 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 b0fd093..39dac70 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 @@ -63,11 +63,11 @@ public class Drug { // 表单信息 PdfBaseUtil.addUnderlinedTitle(document, getName("表单信息"), 10, true); Map formData3 = new LinkedHashMap<>(); - formData3.put(getName("所属试验信息"), mjy.getStudyMc()); + formData3.put(getName("表单所属试验"), mjy.getStudyMc()); formData3.put(getName("所属表单"), mjy.getBdMc()); formData3.put(getName("表单所属人"), mjy.getBdgsrMc()); PdfBaseUtil.addFormTableColumns(document, formData3, 2); - PdfBaseUtil.addUnderlinedTitle(document, getName("给药制剂台账") , 10, true); + PdfBaseUtil.addUnderlinedTitle(document, getName("麻精药台账") , 10, true); // 台账 addTz(document, mjyTzList, lang); PdfBaseUtil.addUnderlinedTitle(document, getName("稽查轨迹") , 10, true); @@ -128,7 +128,7 @@ public class Drug { table.addCell(PdfBaseUtil.createCell(mjyTz.getQmrMc(), contentFont)); table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(mjyTz.getLqrMc()) ? mjyTz.getLqrMc() : "" + (StringUtils.isNoneBlank(mjyTz.getGhrMc()) ? mjyTz.getGhrMc() : ""), contentFont)); table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(mjyTz.getFfrMc()) ? mjyTz.getFfrMc() : "" + (StringUtils.isNoneBlank(mjyTz.getJsrMc()) ? mjyTz.getJsrMc() : ""), contentFont)); - table.addCell(PdfBaseUtil.createCell(mjyTz.getQmyy(), contentFont)); + table.addCell(PdfBaseUtil.createCell(getName(mjyTz.getQmyy()), contentFont)); table.addCell(PdfBaseUtil.createCell(mjyTz.getBdMc(), contentFont)); table.addCell(PdfBaseUtil.createCell(mjyTz.getCzl() + mjyTz.getCzldw(), contentFont)); table.addCell(PdfBaseUtil.createCell(mjyTz.getRemark(), contentFont)); @@ -157,7 +157,7 @@ public class Drug { for (JsonNode node : jsonArray) { if (node.get("name") != null) { String name = node.get("name").asText(); - String value = node.get("value").asText(); + String value = node.get("value")!=null? node.get("value").asText():""; result.add(name + "：" + value); } } @@ -170,7 +170,7 @@ public class Drug { for (JsonNode node : jsonArray) { if (node.get("name") != null) { String name = node.get("name").asText(); - String value = node.get("value").asText(); + String value = node.get("value")!=null? node.get("value").asText():""; result.add(name + "：" + value); } }