基本完成处方模板回显

ruoyi-admin/src/main/java/org/dromara/web/service/impl/EnteralNutritionTemplateServiceImpl.java

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.web.domain.EnteralNutritionTemplate;
 import org.dromara.web.domain.bo.EnteralNutritionTemplateBo;
 import org.dromara.web.domain.vo.EnteralNutritionTemplateVo;
@@ -35,6 +36,7 @@ public class EnteralNutritionTemplateServiceImpl implements IEnteralNutritionTem
 
     private final EnteralNutritionTemplateMapper baseMapper;
     private final SysDeptMapper deptMapper;
+    private final SysUserMapper userMapper;
 
     /**
      * 查询肠内处方模板
@@ -72,6 +74,8 @@ public class EnteralNutritionTemplateServiceImpl implements IEnteralNutritionTem
                 case "3" -> e.setPrescriptionType(CONFIGURE_PRESCRIPTION.getRemark());
                 case "4" -> e.setPrescriptionType(LONG_TERM_PRESCRIPTION.getRemark());
             }
+            e.setCreateBy(userMapper.selectVoById(e.getCreateBy()).getName());
+            e.setUpdateBy(userMapper.selectVoById(e.getUpdateBy()).getName());
         });
 
         return TableDataInfo.build(result);

ruoyi-admin/src/main/java/org/dromara/web/service/impl/ProductNutritionServiceImpl.java

@@ -181,7 +181,8 @@ public class ProductNutritionServiceImpl implements IProductNutritionService {
             .select(ProductNutrition::getId, ProductNutrition::getProductName, ProductNutrition::getProductCategory,
                 ProductNutrition::getProductSpec, ProductNutrition::getProductSpecUnit, ProductNutrition::getPackageUnit,
                 ProductNutrition::getConfigSalePrice, ProductNutrition::getPackagePrice, ProductNutrition::getCalorie,
-                ProductNutrition::getDefaultUsage)
+                ProductNutrition::getDefaultUsage, ProductNutrition::getProductCode,
+                ProductNutrition::getProtein, ProductNutrition::getFat, ProductNutrition::getCarbohydrate)
             .orderByDesc(ProductNutrition::getId));
 
         if (CollUtil.isNotEmpty(dataList)) {