基本完成处方模板回显

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

@@ -2,6 +2,7 @@ package org.dromara.web.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -45,6 +46,19 @@ public class EnteralNutritionConsumableController extends BaseController {
         return enteralNutritionConsumableService.queryPageList(bo, pageQuery);
     }
 
+    @SaCheckPermission(
+        value = {
+            "system:nutritionConsumable:list",
+            "basicPublicTemplate:enteralNutritionTemplate:add",
+            "basicPublicTemplate:enteralNutritionTemplate:edit"
+        },
+        mode = SaMode.OR
+    )
+    @GetMapping("/listAll")
+    public TableDataInfo<EnteralNutritionConsumableVo> listAll() {
+        return enteralNutritionConsumableService.queryAllList();
+    }
+
     /**
      * 导出肠内营养耗材列表
      */

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

@@ -45,6 +45,12 @@ public class EnteralNutritionTemplateController extends BaseController {
         return enteralNutritionTemplateService.queryPageList(bo, pageQuery);
     }
 
+    @SaCheckPermission("basicPublicTemplate:enteralNutritionTemplate:list")
+    @GetMapping("/listAll")
+    public TableDataInfo<EnteralNutritionTemplateVo> listAll() {
+        return enteralNutritionTemplateService.listAll();
+    }
+
     /**
      * 导出肠内处方模板列表
      */

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

@@ -24,7 +24,7 @@ public class EnteralNutritionTemplate extends TenantEntity {
     /**
      * ID
      */
-    @TableId(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -70,4 +70,10 @@ public class EnteralNutritionTemplate extends TenantEntity {
      */
     private Integer type;
 
+    /**
+     * 0、个人模板
+     * 1、公共基础模板
+     */
+    private Integer templateType;
+
 }

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

@@ -63,10 +63,16 @@ public class EnteralNutritionTemplateBo extends BaseEntity {
     private String delFlag;
 
     /**
-     * 1、预包装处方模板
-     * 2、配置处方模板
-     * 3、长嘱处方模板
+     * 2、预包装处方模板
+     * 3、配置处方模板
+     * 4、长嘱处方模板
      */
     private Integer type;
 
+    /**
+     * 0、个人模板
+     * 1、公共基础模板
+     */
+    private Integer templateType;
+
 }

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

@@ -97,4 +97,10 @@ public class EnteralNutritionTemplateVo implements Serializable {
 
     private String prescriptionDepartmentName;
 
+    /**
+     * 0、个人模板
+     * 1、基础公共模板
+     */
+    private Integer templateType;
+
 }

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

@@ -65,4 +65,6 @@ public interface IEnteralNutritionConsumableService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TableDataInfo<EnteralNutritionConsumableVo> queryAllList();
 }

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

@@ -65,4 +65,6 @@ public interface IEnteralNutritionTemplateService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TableDataInfo<EnteralNutritionTemplateVo> listAll();
 }

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.warm.flow.core.utils.CollUtil;
 import org.dromara.web.domain.EnteralNutritionConsumable;
 import org.dromara.web.domain.bo.EnteralNutritionConsumableBo;
 import org.dromara.web.domain.vo.EnteralNutritionConsumableVo;
@@ -142,4 +143,15 @@ public class EnteralNutritionConsumableServiceImpl implements IEnteralNutritionC
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public TableDataInfo<EnteralNutritionConsumableVo> queryAllList() {
+
+        List<EnteralNutritionConsumableVo> list = baseMapper.selectVoList(
+            Wrappers.lambdaQuery(EnteralNutritionConsumable.class)
+                .orderByDesc(EnteralNutritionConsumable::getId)
+        );
+
+        return TableDataInfo.build(list);
+    }
 }

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

@@ -103,6 +103,7 @@ public class EnteralNutritionTemplateServiceImpl implements IEnteralNutritionTem
         lqw.in(!deptIds.isEmpty(), EnteralNutritionTemplate::getPrescriptionId, deptIds);
 
         lqw.eq(bo.getType() != null, EnteralNutritionTemplate::getType, bo.getType());
+        lqw.eq(bo.getTemplateType() != null, EnteralNutritionTemplate::getTemplateType, bo.getTemplateType());
         lqw.eq(bo.getPrescriptionId() != null, EnteralNutritionTemplate::getPrescriptionId, bo.getPrescriptionId());
         lqw.eq(StringUtils.isNotBlank(bo.getContent()), EnteralNutritionTemplate::getContent, bo.getContent());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EnteralNutritionTemplate::getStatus, bo.getStatus());
@@ -161,4 +162,10 @@ public class EnteralNutritionTemplateServiceImpl implements IEnteralNutritionTem
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public TableDataInfo<EnteralNutritionTemplateVo> listAll() {
+        List<EnteralNutritionTemplateVo> result = baseMapper.selectVoList();
+        return TableDataInfo.build(result);
+    }
 }

script/sql/biz/update.sql

@@ -18,3 +18,4 @@ ADD COLUMN expertise VARCHAR(200) COMMENT '擅长疾病',
 ADD COLUMN signature_img VARCHAR(200) COMMENT '签名图片路径';
 
 ALTER TABLE `enteral_nutrition_template` ADD COLUMN `type` tinyint(1) COMMENT '处方类型';
+ALTER TABLE `enteral_nutrition_template` ADD COLUMN `template_type` tinyint(1) COMMENT '模板类型(0 个人模板; 1 基础公共模板)';