diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java
index 94105cf..c91161d 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java
@@ -80,16 +80,14 @@ public class ExperimentDeviationEquipmentController
     @PostMapping(value = "/add")
     public Result<ExperimentDeviationEquipment> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
         Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空！");
-        Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空！");
-
-        String equipmentNo = experimentDeviationEquipment.getManagementNo();
-        if (StringUtils.isNotBlank(equipmentNo) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
-            Equipment equipment = equipmentService.getByManagementNo(equipmentNo);
-            experimentDeviationEquipment.setEquipmentId(equipment.getId());
-            experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
-        }
         String sampleId = experimentDeviationEquipment.getSampleId();
         Assert.hasText(sampleId, "样品ID不能为空！");
+
+        String equipmentId = experimentDeviationEquipment.getEquipmentId();
+        if (StringUtils.isNotBlank(equipmentId) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
+            Equipment equipment = equipmentService.getById(equipmentId);
+            experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
+        }
         if (StringUtils.contains(sampleId, ",")) {
             for (String id : sampleId.split(",")) {
                 ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment);
@@ -114,14 +112,14 @@ public class ExperimentDeviationEquipmentController
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<ExperimentDeviationEquipment> edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
         Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空！");
-        String equipmentNo = experimentDeviationEquipment.getManagementNo();
-        if (StringUtils.isNotBlank(equipmentNo) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
-            Equipment equipment = equipmentService.getByManagementNo(equipmentNo);
-            experimentDeviationEquipment.setEquipmentId(equipment.getId());
-            experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
-        }
         String sampleId = experimentDeviationEquipment.getSampleId();
         Assert.hasText(sampleId, "样品ID不能为空！");
+
+        String equipmentId = experimentDeviationEquipment.getEquipmentId();
+        if (StringUtils.isNotBlank(equipmentId) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) {
+            Equipment equipment = equipmentService.getById(equipmentId);
+            experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
+        }
         if (StringUtils.contains(sampleId, ",")) {
             for (String id : sampleId.split(",")) {
                 ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment);