。。。

ruoyi-admin/src/main/java/org/dromara/web/controller/ProductNutritionController.java

@@ -3,6 +3,7 @@ package org.dromara.web.controller;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -48,7 +49,13 @@ public class ProductNutritionController extends BaseController {
         return productNutritionService.queryPageList(bo, pageQuery);
     }
 
-    @SaCheckPermission("warehouse:nutrition:list")
+    @SaCheckPermission(
+        value = {
+            "warehouse:nutrition:list",
+            "basicPublicTemplate:enteralNutritionTemplate:add"
+        },
+        mode = SaMode.OR
+    )
     @GetMapping("/listAll")
     public TableDataInfo<ProductNutritionVo> listAll() {
         return productNutritionService.listAll();
@@ -84,7 +91,13 @@ public class ProductNutritionController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("warehouse:nutrition:query")
+    @SaCheckPermission(
+        value = {
+            "warehouse:nutrition:query",
+            "basicPublicTemplate:enteralNutritionTemplate:add"
+        },
+        mode = SaMode.OR
+    )
     @GetMapping("/{id}")
     public R<ProductNutritionVo> getInfo(@NotNull(message = "主键不能为空")
                                          @PathVariable Long id) {

ruoyi-admin/src/main/java/org/dromara/web/domain/NutritionEducationTemplate.java

@@ -24,7 +24,7 @@ public class NutritionEducationTemplate extends TenantEntity {
     /**
      *
      */
-    @TableId(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EnteralNutritionTemplateBo.java

@@ -69,5 +69,4 @@ public class EnteralNutritionTemplateBo extends BaseEntity {
      */
     private Integer type;
 
-
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EnteralNutritionTemplateVo.java

@@ -97,5 +97,4 @@ public class EnteralNutritionTemplateVo implements Serializable {
 
     private String prescriptionDepartmentName;
 
-
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/ProductNutritionVo.java

@@ -691,5 +691,4 @@ public class ProductNutritionVo implements Serializable {
     @ExcelProperty(value = "上架 ")
     private String putFlag;
 
-
 }

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

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 
+import static org.dromara.common.core.enums.biz.FeeType.*;
+
 /**
  * 肠内处方模板Service业务层处理
  *
@@ -64,6 +66,14 @@ public class EnteralNutritionTemplateServiceImpl implements IEnteralNutritionTem
         for (EnteralNutritionTemplateVo record : records)
             record.setPrescriptionDepartmentName(depts.get(record.getPrescriptionId()));
 
+        records.forEach(e -> {
+            switch (e.getPrescriptionType()) {
+                case "2" -> e.setPrescriptionType(PRE_PACKAGED_PRESCRIPTION.getRemark());
+                case "3" -> e.setPrescriptionType(CONFIGURE_PRESCRIPTION.getRemark());
+                case "4" -> e.setPrescriptionType(LONG_TERM_PRESCRIPTION.getRemark());
+            }
+        });
+
         return TableDataInfo.build(result);
     }