From bdc5003fb2fe5f7f12e6898c6e95f5e5f8a046b4 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 29 Jul 2025 23:04:27 +0800
Subject: [PATCH] irradiation_standards

---
 Dockerfile                                                   | 3 ---
 .../java/org/jeecg/modules/database/entity/Experiment.java   | 5 +++++
 .../jeecg/modules/database/mapper/xml/ExperimentMapper.xml   | 4 ++++
 .../database/service/impl/ExperimentDocServiceImpl.java      | 5 ++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 588b8c4..dea48e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,4 @@ COPY --from=build /app/physical-launcher/target/physical-launcher-3.7.0.jar phys
 COPY --from=build /app/templates ./templates
 ENV PROFILE=dev
 
-RUN apt update && apt install -y tesseract-ocr libtesseract-dev
-ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
-
 CMD sleep 10;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=${PROFILE}
\ No newline at end of file
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
index 49e3915..315b215 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
@@ -256,4 +256,9 @@ public class Experiment implements Serializable {
     @TableField(exist = false)
     private ExperimentReview ExperimentReview;
 
+
+    @Schema(description = "辐照标准")
+    @TableField(exist = false)
+    private String radiationStandard;
+
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
index 25025d1..2b5372d 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
@@ -10,6 +10,7 @@
         left join experiment_deviation_equipment d on d.experiment_id = e.id
         left join experiment_report r on r.experiment_id = e.id
         left join experiment_radiation_process rp on rp.experiment_id = e.id
+        left join irradiation_standards ir on rp.radiation_standard = ir.id
         <where>
             e.status is not null
             <choose>
@@ -24,6 +25,9 @@
                 </otherwise>
             </choose>
 
+            <if test="experiment.radiationStandard != null and experiment.radiationStandard != ''">
+                and ir.name like concat('%', #{experiment.radiationStandard}, '%')
+            </if>
             <if test="experiment.radiationSourceType != null and experiment.radiationSourceType != ''">
                 and rp.radiation_source like concat('%', #{experiment.radiationSourceType}, '%')
             </if>
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
index 8d4368e..879224b 100755
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
@@ -425,9 +425,8 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
             List<String> standardCode = new ArrayList<>();
             for (ExperimentRadiationProcess radiationProcess : radiationProcessList) {
                 String radiationStandard = radiationProcess.getRadiationStandard();
-                if (StringUtils.isNotBlank(radiationStandard) && radiationStandard.contains(",")) {
-                    String standardId = radiationStandard.split(",")[1];
-                    IrradiationStandards standards = irradiationStandardsService.getById(standardId);
+                if (StringUtils.isNotBlank(radiationStandard)) {
+                    IrradiationStandards standards = irradiationStandardsService.getById(radiationStandard);
                     if (Objects.nonNull(standards)) {
                         standardName.add(standards.getName());
                         standardCode.add(standards.getCode());