From 07cf0b9e26f158ff1fd94c207febb47d47587d3b 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: Tue, 8 Oct 2024 15:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EntrustmentIdentificationMaterialServiceImpl.java    | 1 -
 .../entrustment/service/impl/EntrustmentServiceImpl.java      | 4 +++-
 .../platform/entrustment/vo/MaterialListForBookVo.java        | 4 ++--
 3 files changed, 5 insertions(+), 4 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 49c4f40..3694e4e 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
@@ -188,7 +188,6 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
         im.setQuantity(ce.getQuantity());       // ??
         im.setUnit(ce.getUnit());
         im.setAdditionalProperties(ce.getAdditionalProperties());
-
         im.setPersonName(ce.getPersonName());
         im.setPersonCert(ce.getPersonCert());
         im.setPersonId(ce.getPersonId());
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 5f88520..b5e4ef1 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
@@ -535,6 +535,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         dm.put("ac_yy", entrustment.getAcceptTime().getYear());//受理年
         dm.put("ac_mm", entrustment.getAcceptTime().getMonthValue());//受理月
         dm.put("ac_day", entrustment.getAcceptTime().getDayOfMonth());//受理日
+        dm.put("value1", "☑");//受理日
         //条形码  因为调用feign接口的原因，图片传输过程中会受影响，这里改为在生成的地方再生成
         return dm;
     }
@@ -673,10 +674,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             eg.setMaterialName(item.getName());
             eg.setFormName(StringUtils.isNotBlank(item.getColor()) ? item.getColor() + item.getFormName() : "" + item.getFormName());
             eg.setSpecies(item.getTypeName());
-            eg.setPack(item.getPack());
+            eg.setPackComplete(item.getPackComplete());
             eg.setDrugsValue(item.getDrugsValue());
             eg.setRtSampleQuantity(item.getRtSampleQuantity());
             eg.setRemark(item.getRemark());
+            eg.setOrderNo(item.getOrderNo());
             BigDecimal totalSampleMass = new BigDecimal(0);
             //因为现在有的检材可以不用复称，例如送来的一支电子烟，所以我们用送检的数量与单位进行描述即可
             if (item.getSample1RepeatWeigh() == null || item.getSample1RepeatWeigh().compareTo(BigDecimal.ZERO) == 0) {
diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java b/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java
index fddc020..92f4fce 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java
@@ -21,9 +21,9 @@ public class MaterialListForBookVo {
     private String retainedSampleDes;//留存样
     private String totalSampleDes;//总计描述
     private String species;//种类
-    private String pack;//包装
-
+    private boolean packComplete;//包装
     private String drugsValue;//疑似物种类
     private Integer rtSampleQuantity;//留存样个数
     private String remark;//备注
+    private Integer orderNo;//顺序号
 }