From 2fd59db0ddab009d4856a67eb7d35a9365515818 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: Fri, 28 Feb 2025 09:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BE=8B?=
 =?UTF-8?q?=E5=A6=82=E6=A3=80=E5=87=BA=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EntrustMaterialCheckoutResultServiceImpl.java       | 5 +++--
 .../entrustment/vo/EntrustmentIdentificationMaterialVO.java  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
index f27e95e..948f27d 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
@@ -23,6 +23,7 @@ import digital.laboratory.platform.entrustment.service.EntrustmentIdentification
 import digital.laboratory.platform.entrustment.service.EntrustmentService;
 import digital.laboratory.platform.entrustment.vo.DetectionRateVO;
 import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
+import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO;
 import digital.laboratory.platform.sys.entity.Area;
 import digital.laboratory.platform.sys.entity.DrugLite;
 import org.apache.poi.ss.usermodel.*;
@@ -462,7 +463,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
                 BigDecimal d1 = new BigDecimal(molecule);
                 BigDecimal d2 = new BigDecimal(denominator); // 分母
                 // 计算百分比（保留2位小数，四舍五入）
-                double percentage = d1.divide(d2, 2, BigDecimal.ROUND_HALF_UP)
+                double percentage = d1.divide(d2, 4, BigDecimal.ROUND_HALF_UP)
                         .multiply(new BigDecimal(100))
                         .doubleValue();
                 nameList.add(drugName);
@@ -475,7 +476,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
         return vo ;
     }
 
-
+//    public IPage<EntrustmentIdentificationMaterialVO> getMaterialBy
 }
 
 
diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentIdentificationMaterialVO.java b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentIdentificationMaterialVO.java
index 040356d..c344610 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentIdentificationMaterialVO.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustmentIdentificationMaterialVO.java
@@ -8,4 +8,5 @@ public class EntrustmentIdentificationMaterialVO extends EntrustmentIdentificati
 	String formName;				// 检材性状
 	String sample1Type;				// 样本1的类型:A/B, 根据盒子的 sampleType 而得
 	String sample2Type;				// 样本2的类型:A/B, 根据盒子的 sampleType 而得
+
 }