From 9f6df2792c27b6d81dcbfc8878b08dc80253b5c3 Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Mon, 23 Dec 2024 15:16:36 +0800
Subject: [PATCH] =?UTF-8?q?20241223=20=E6=9B=B4=E6=96=B0=201.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=9F=E6=88=90=E7=9A=84=E9=89=B4=E5=AE=9A=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4=E4=B9=A6=E4=BB=A5=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entrustment/service/impl/EntrustmentServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index 6e93add..fd08947 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -458,11 +458,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         }
         CaseEvent caseEvent = caseEventService.getOne(Wrappers.<CaseEvent>query()
                 .eq("id", entrustment.getCaseId()));
-        String templatePath = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getAcceptNo();
+        String entrustmentNo = entrustment.getEntrustmentNo();
+        String templatePath = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustmentNo;
         String templateName = AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_IDENTIFY_ITEMS_CONFIRM_LETTER_TEMPLATE);
-        String originalFilename = "鉴定事项确认书-" + entrustment.getAcceptNo();
+        String originalFilename = "鉴定事项确认书-" + entrustmentNo;
         String fileType = ".docx";
-        String QRContent = entrustment.getAcceptNo();
+        String QRContent = entrustmentNo;
         List<String> listNameCollection = new ArrayList<>();
         listNameCollection.add("materialList");
         listNameCollection.add("drugList");
@@ -951,7 +952,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + ".pdf";
                 break;
             case "identItemBook":
-                retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getAcceptNo() + ".docx";
+                retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx";
                 break;
             case "identfyBook":
                 retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定文书-" + entrustment.getAcceptNo() + ".docx";