From 32bacff4cd7455eac8eb34e35744b40d9fdb2384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Wed, 8 Jan 2025 17:25:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=A7=94=E6=89=98=E4=B9=A6=E5=92=8C=E7=A1=AE=E8=AE=A4=E4=B9=A6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A3=80=E6=9D=90=E5=9C=A8=E6=9C=AA=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E6=97=B6=E7=9A=84=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E6=A3=80=E6=9D=90=E7=BC=96=E5=8F=B7=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BAOrderNo=E3=80=82=202.=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=A7=94=E6=89=98=E4=B9=A6=E5=92=8C=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E4=B9=A6=E7=9A=84=E9=99=90=E5=88=B6=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=BA=94=E8=AF=A5=E6=98=AF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8F=90=E4=BA=A4=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BA=BA=E5=B0=B1=E5=8F=AF=E4=BB=A5=E5=9C=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=88=97=E8=A1=A8=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=AF=8F=E6=AC=A1=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E9=83=BD=E5=BA=94=E8=AF=A5=E6=98=AF=E9=87=8D=E6=96=B0=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E7=9B=B4=E5=88=B0=E5=AE=A1=E6=A0=B8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=B0=B1=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E4=BA=86=E3=80=82=203.?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A3=80=E6=9D=90=E4=B9=8B=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E9=89=B4=E5=AE=9A?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...mentIdentificationMaterialServiceImpl.java | 20 +++++++++----
 .../service/impl/EntrustmentServiceImpl.java  | 28 +++++++++++--------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
index c5af0f8..559c96c 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
@@ -591,6 +591,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
 
     /**
      * 更新检材是否审批通过
+     *
      * @param identificationMaterial
      * @param updateWrapper
      * @param im
@@ -1093,7 +1094,15 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
         if (attCount > 0) {
             throw new RuntimeException(String.format("这个检材下有 %d 个附件, 必须先删除全部附件后才能删除检材物证!", attCount));
         }
+
         if (this.removeById(id)) {
+            String entrustId = entrustmentIdentificationMaterial.getEntrustmentId();
+            Entrustment entrustment = entrustmentService.getById(entrustId);
+            List<EntrustmentIdentificationMaterial> materialList = this.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId));
+            if (materialList != null && materialList.size() > 0) {
+                entrustment.setEntrustRequirement(entrustmentService.buildEntrustReq(materialList));
+                entrustmentService.updateById(entrustment);
+            }
             return entrustmentIdentificationMaterial;
         } else {
             return null;
@@ -1173,7 +1182,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
 
     @Override
     @Transactional
-    public List<EntrustmentIdentificationMaterial>  createNewIm(List<EntrustmentIdentificationMaterial> identificationMaterialList, DLPUser dlpUser) {
+    public List<EntrustmentIdentificationMaterial> createNewIm(List<EntrustmentIdentificationMaterial> identificationMaterialList, DLPUser dlpUser) {
 
         Entrustment entrustment = entrustmentService.getById(identificationMaterialList.get(0).getEntrustmentId());
         if (!dlpUser.isStaff() && entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
@@ -1512,7 +1521,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                 Integer analysisOption = material.getAnalysisOption();
                 material.setQuantity(material.getQuantity().setScale(2, BigDecimal.ROUND_HALF_UP));
                 //2025-1-8日修改：在打印委托书或鉴定事项确认书时，将检测选项转换为中文名称后加上检测二字
-                material.setAnalysisOptionValue(AnalysisOptionEnums.fromCode(analysisOption).getChineseName()+"检测");
+                material.setAnalysisOptionValue(AnalysisOptionEnums.fromCode(analysisOption).getChineseName() + "检测");
                 material.setPrintDrawTime(LocalDateTimeUtil.format(material.getDrawTime(), "yyyy-MM-dd"));
                 List<DrugLite> candidateDrugs = material.getCandidateDrugs();
                 String drugsValue = "";
@@ -1537,8 +1546,8 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
      * 将委托鉴定材料保存到第三方系统
      *
      * @param identificationMaterial 委托鉴定材料对象
-     * @param entrustment          委托对象
-     * @param id                   材料唯一标识
+     * @param entrustment            委托对象
+     * @param id                     材料唯一标识
      */
     private void saveEntrustMaterialToThirdSys(EntrustmentIdentificationMaterial identificationMaterial, Entrustment entrustment, String id) {
         EntrustOfThirdSys entrustOfThirdSys = synchronizeDataService.getOne(new LambdaQueryWrapper<EntrustOfThirdSys>().eq(EntrustOfThirdSys::getEntrustMainId, entrustment.getId()));
@@ -1566,7 +1575,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
      * 设置委托鉴定材料的鉴定编号
      *
      * @param identificationMaterial 委托鉴定材料对象
-     * @param cj                   案件事件对象
+     * @param cj                     案件事件对象
      */
     private void setMaterialIdentificationNo(EntrustmentIdentificationMaterial identificationMaterial, CaseEvent cj) {
         if (StrUtil.isNotBlank(identificationMaterial.getEvidenceId())) {
@@ -1582,6 +1591,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
 
     /**
      * 校验案件信息是否合法
+     *
      * @param identificationMaterial
      * @return
      */
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 2e85967..d8e4f27 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
@@ -443,7 +443,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
                 .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId)
                 .orderByAsc(isAccepted != -1, EntrustmentIdentificationMaterial::getAcceptNo)
-                .orderByAsc(isAccepted == -1, EntrustmentIdentificationMaterial::getImNo));
+                .orderByAsc(isAccepted == -1, EntrustmentIdentificationMaterial::getOrderNo));
         if (isAccepted != -1) {
             // 受理过的才进行排序，否则采用检材编号排序
             Collections.sort(materialList, new Comparator<EntrustmentIdentificationMaterial>() {
@@ -497,7 +497,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         //构造委托部分需要的数据
         dm.put("clientOrgName", entrustment.getClientOrgName());//委托单位
         dm.put("identificationNo", entrustment.getAcceptNo());//受理编号
-        dm.put("year", entrustment.getEntrustmentTime().getYear());
+        dm.put("year", entrustment.getEntrustmentTime() != null ? entrustment.getEntrustmentTime().getYear() : LocalDate.now().getYear());
 
         dm.put("materialDes", buildMaterialDes(materialList));//检材描述
         dm.put("identifyReq", entrustment.getEntrustRequirement());//鉴定要求
@@ -688,7 +688,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         eg.setAcceptNo(item.getAcceptNo());
         eg.setIndexNo(item.getShortNameDes() + "检材");
         eg.setMaterialName(item.getName());
-        eg.setFormName(StringUtils.isNotBlank(item.getColor()) ? item.getColor() + item.getFormName() : "" + item.getFormName());
+        // 先暂时去掉这个功能，他们可能
+        //eg.setFormName(StringUtils.isNotBlank(item.getColor()) ? item.getColor() + item.getFormName() : "" + item.getFormName());
+        eg.setFormName(item.getFormName());
         eg.setSpecies(item.getTypeName());
         eg.setPackComplete(item.getPackComplete());
         eg.setDrugsValue(item.getDrugsValue());
@@ -1893,7 +1895,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         }
 
         if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) {
-            throw new RuntimeException("委托不在待送检确认状态");
+            return null;
         }
 
         if (!dlpUser.isStaff()) {
@@ -2117,7 +2119,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         // 转换临时目录中的 word 文档为 PDF
         String pdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".docx";
         try {
-            if (!ossFile.objectExist(pdfFilePath)) {
+            //这里加一下判断条件，由于贵阳市局这里的情况是审核的时候就需要查看委托书，所以为了保证每一次提交过来的委托都是最新的，所以在审核通过以前应该每次查看都是重新生成
+            if (!ossFile.objectExist(pdfFilePath) || ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) {
                 GenerateEntrustmentLetterPDF(ev);
                 return pdfFilePath;
             }
@@ -2144,8 +2147,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", id));
         }
 
-        if (ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) {
-            throw new RuntimeException("委托状态必须在[待送检]及之后才能打印鉴定委托书");
+        if (ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
+            throw new RuntimeException("委托状态必须在委托创建之后才能打印鉴定委托书");
         }
 
         if (!dlpUser.isStaff()) {
@@ -2213,7 +2216,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService.list(
                 Wrappers.<EntrustmentIdentificationMaterial>query()
                         .eq("entrustment_id", ev.getId())
-                        .orderByAsc("create_time")
+                        .orderByAsc("order_no")
         );
         entrustmentIdentificationMaterialService.conformityDrugs(materialList);
         //设置检材描述
@@ -2624,9 +2627,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         }
 
         // 正在受理和已受理这2个状态下可以打印
-        if (ev.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() &&
-                ev.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) {
-            throw new RuntimeException("委托不在[受理中]或[已受理]状态");
+        //这里再次修改一下，以前是待受理和已受理两个状态才能生成，由于贵阳市局这里的情况是需要在审核的时候查看确认书，所以如果状态是在委托提交以前我们才不允许生成
+        if (ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()) {
+            throw new RuntimeException("委托不在可以生成确认书的状态");
         }
 
         // if (!StrUtil.equalsIgnoreCase(ev.getClientOrgId(), dlpUser.getOrgId())) {
@@ -2647,7 +2650,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         try {
             //如果文件不存在，则生成，否则直接从OSS中获取
             //if (!ossFile.objectExist(pdfFilePath)) {
-            if (!ossFile.objectExist(downFile)) {
+            //这里加一个判断，由于贵阳市局的确认书需要在审核的时候就能打印出来，为了保证每一次生成的确认书都是委托单位提交过来的最新版，所以我们在审核通过之前，每一次生成委托书都应该重新生成，审核成功以后就不用再重新生成了
+            if (!ossFile.objectExist(downFile) || ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) {
 
                 if (this.generateIdentifyItemsBook(ev.getId())) {
                     ossFile.fileGet(downFile, httpServletResponse.getOutputStream());