化验项目列表返回 配置的药剂的名字

ruoyi-system/src/main/java/com/ruoyi/business/domain/TAssayItemExtra.java

@@ -51,4 +51,8 @@ public class TAssayItemExtra extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    //2025年03月17日10:57:55 新返回字段
+    //药剂的名字
+    private String name;
+
 }

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TAssayItemServiceImpl.java

@@ -4,7 +4,9 @@ import java.math.BigDecimal;
 import java.util.*;
 
 import com.ruoyi.business.domain.TAssayItemExtra;
+import com.ruoyi.business.domain.TMedicine;
 import com.ruoyi.business.mapper.TAssayItemExtraMapper;
+import com.ruoyi.business.mapper.TMedicineMapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -35,6 +37,9 @@ public class TAssayItemServiceImpl implements ITAssayItemService
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private TMedicineMapper tMedicineMapper;
+
 
     /**
      * 查询化验项目
@@ -57,6 +62,18 @@ public class TAssayItemServiceImpl implements ITAssayItemService
         tAssayItem.setFyList(fyList);
         tAssayItem.setFyAmount(fyList.stream().map(TAssayItemExtra::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
         List<TAssayItemExtra> yjList = this.assayItemExtraMapper.selectTAssayItemExtraList(TAssayItemExtra.builder().itemId(id).type(1).build());
+        //2025年03月17日10:58:48 额外处理一下药剂的名字
+        if(!CollectionUtils.isEmpty(yjList)){
+            for (TAssayItemExtra tAssayItemExtra : yjList) {
+                Long relativeId = tAssayItemExtra.getRelativeId();
+                if(!Objects.isNull(relativeId)){
+                    TMedicine tMedicine = this.tMedicineMapper.selectTMedicineById(relativeId);
+                    if(!Objects.isNull(tMedicine)){
+                        tAssayItemExtra.setName(tMedicine.getName());
+                    }
+                }
+            }
+        }
         tAssayItem.setYjList(yjList);
         tAssayItem.setYjAmount(yjList.stream().map(TAssayItemExtra::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
         //2025年03月13日11:16:04 额外返回创建人和编辑人对象