Merge branch 'main' of http://192.168.1.121/yp/wkx-his

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

@@ -0,0 +1,106 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.web.domain.bo.DailyMealPlanBo;
+import org.dromara.web.domain.vo.DailyMealPlanVo;
+import org.dromara.web.service.IDailyMealPlanService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 院内膳食主
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/patients/dailyMealPlan")
+public class DailyMealPlanController extends BaseController {
+
+    private final IDailyMealPlanService dailyMealPlanService;
+
+    /**
+     * 查询日常膳食主列表
+     */
+    @SaCheckPermission("patients:dailyMealPlan:list")
+    @GetMapping("/list")
+    public TableDataInfo<DailyMealPlanVo> list(DailyMealPlanBo bo, PageQuery pageQuery) {
+        return dailyMealPlanService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出日常膳食主列表
+     */
+    @SaCheckPermission("patients:dailyMealPlan:export")
+    @Log(title = "日常膳食主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DailyMealPlanBo bo, HttpServletResponse response) {
+        List<DailyMealPlanVo> list = dailyMealPlanService.queryList(bo);
+        ExcelUtil.exportExcel(list, "日常膳食主", DailyMealPlanVo.class, response);
+    }
+
+    /**
+     * 获取日常膳食主详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("patients:dailyMealPlan:query")
+    @GetMapping("/{id}")
+    public R<DailyMealPlanVo> getInfo(@NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(dailyMealPlanService.queryById(id));
+    }
+
+    /**
+     * 新增日常膳食主
+     */
+    @SaCheckPermission("patients:dailyMealPlan:add")
+    @Log(title = "日常膳食主", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DailyMealPlanBo bo) {
+        return toAjax(dailyMealPlanService.insertByBo(bo));
+    }
+
+    /**
+     * 修改日常膳食主
+     */
+    @SaCheckPermission("patients:dailyMealPlan:edit")
+    @Log(title = "日常膳食主", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DailyMealPlanBo bo) {
+        return toAjax(dailyMealPlanService.updateByBo(bo));
+    }
+
+    /**
+     * 删除日常膳食主
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("patients:dailyMealPlan:remove")
+    @Log(title = "日常膳食主", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(dailyMealPlanService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,106 @@
+package org.dromara.web.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.web.domain.bo.DailyMealRecipeBo;
+import org.dromara.web.domain.vo.DailyMealRecipeVo;
+import org.dromara.web.service.IDailyMealRecipeService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 日常膳食食谱明细
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/patients/dailyMealRecipe")
+public class DailyMealRecipeController extends BaseController {
+
+    private final IDailyMealRecipeService dailyMealRecipeService;
+
+    /**
+     * 查询日常膳食食谱明细列表
+     */
+    @SaCheckPermission("patients:dailyMealRecipe:list")
+    @GetMapping("/list")
+    public TableDataInfo<DailyMealRecipeVo> list(DailyMealRecipeBo bo, PageQuery pageQuery) {
+        return dailyMealRecipeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出日常膳食食谱明细列表
+     */
+    @SaCheckPermission("patients:dailyMealRecipe:export")
+    @Log(title = "日常膳食食谱明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DailyMealRecipeBo bo, HttpServletResponse response) {
+        List<DailyMealRecipeVo> list = dailyMealRecipeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "日常膳食食谱明细", DailyMealRecipeVo.class, response);
+    }
+
+    /**
+     * 获取日常膳食食谱明细详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("patients:dailyMealRecipe:query")
+    @GetMapping("/{id}")
+    public R<DailyMealRecipeVo> getInfo(@NotNull(message = "主键不能为空")
+                                        @PathVariable Long id) {
+        return R.ok(dailyMealRecipeService.queryById(id));
+    }
+
+    /**
+     * 新增日常膳食食谱明细
+     */
+    @SaCheckPermission("patients:dailyMealRecipe:add")
+    @Log(title = "日常膳食食谱明细", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DailyMealRecipeBo bo) {
+        return toAjax(dailyMealRecipeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改日常膳食食谱明细
+     */
+    @SaCheckPermission("patients:dailyMealRecipe:edit")
+    @Log(title = "日常膳食食谱明细", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DailyMealRecipeBo bo) {
+        return toAjax(dailyMealRecipeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除日常膳食食谱明细
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("patients:dailyMealRecipe:remove")
+    @Log(title = "日常膳食食谱明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(dailyMealRecipeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,106 @@
+package org.dromara.web.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.web.domain.bo.HospitalMealPlanBo;
+import org.dromara.web.domain.vo.HospitalMealPlanVo;
+import org.dromara.web.service.IHospitalMealPlanService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 院内膳食主
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/patients/hospitalMealPlan")
+public class HospitalMealPlanController extends BaseController {
+
+    private final IHospitalMealPlanService hospitalMealPlanService;
+
+    /**
+     * 查询院内膳食主列表
+     */
+    @SaCheckPermission("patients:hospitalMealPlan:list")
+    @GetMapping("/list")
+    public TableDataInfo<HospitalMealPlanVo> list(HospitalMealPlanBo bo, PageQuery pageQuery) {
+        return hospitalMealPlanService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出院内膳食主列表
+     */
+    @SaCheckPermission("patients:hospitalMealPlan:export")
+    @Log(title = "院内膳食主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HospitalMealPlanBo bo, HttpServletResponse response) {
+        List<HospitalMealPlanVo> list = hospitalMealPlanService.queryList(bo);
+        ExcelUtil.exportExcel(list, "院内膳食主", HospitalMealPlanVo.class, response);
+    }
+
+    /**
+     * 获取院内膳食主详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("patients:hospitalMealPlan:query")
+    @GetMapping("/{id}")
+    public R<HospitalMealPlanVo> getInfo(@NotNull(message = "主键不能为空")
+                                         @PathVariable Long id) {
+        return R.ok(hospitalMealPlanService.queryById(id));
+    }
+
+    /**
+     * 新增院内膳食主
+     */
+    @SaCheckPermission("patients:hospitalMealPlan:add")
+    @Log(title = "院内膳食主", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HospitalMealPlanBo bo) {
+        return toAjax(hospitalMealPlanService.insertByBo(bo));
+    }
+
+    /**
+     * 修改院内膳食主
+     */
+    @SaCheckPermission("patients:hospitalMealPlan:edit")
+    @Log(title = "院内膳食主", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HospitalMealPlanBo bo) {
+        return toAjax(hospitalMealPlanService.updateByBo(bo));
+    }
+
+    /**
+     * 删除院内膳食主
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("patients:hospitalMealPlan:remove")
+    @Log(title = "院内膳食主", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(hospitalMealPlanService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,104 @@
+package org.dromara.web.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.web.domain.bo.HospitalMealRecipeBo;
+import org.dromara.web.domain.vo.HospitalMealRecipeVo;
+import org.dromara.web.service.IHospitalMealRecipeService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 院内膳食食谱明细
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/patients/hospitalMealRecipe")
+public class HospitalMealRecipeController extends BaseController {
+
+    private final IHospitalMealRecipeService hospitalMealRecipeService;
+
+    /**
+     * 查询院内膳食食谱明细列表
+     */
+    @SaCheckPermission("patients:hospitalMealRecipe:list")
+    @GetMapping("/list")
+    public TableDataInfo<HospitalMealRecipeVo> list(HospitalMealRecipeBo bo, PageQuery pageQuery) {
+        return hospitalMealRecipeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出院内膳食食谱明细列表
+     */
+    @SaCheckPermission("patients:hospitalMealRecipe:export")
+    @Log(title = "院内膳食食谱明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HospitalMealRecipeBo bo, HttpServletResponse response) {
+        List<HospitalMealRecipeVo> list = hospitalMealRecipeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "院内膳食食谱明细", HospitalMealRecipeVo.class, response);
+    }
+
+    /**
+     * 获取院内膳食食谱明细详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("patients:hospitalMealRecipe:query")
+    @GetMapping("/{id}")
+    public R<HospitalMealRecipeVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(hospitalMealRecipeService.queryById(id));
+    }
+
+    /**
+     * 新增院内膳食食谱明细
+     */
+    @SaCheckPermission("patients:hospitalMealRecipe:add")
+    @Log(title = "院内膳食食谱明细", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HospitalMealRecipeBo bo) {
+        return toAjax(hospitalMealRecipeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改院内膳食食谱明细
+     */
+    @SaCheckPermission("patients:hospitalMealRecipe:edit")
+    @Log(title = "院内膳食食谱明细", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HospitalMealRecipeBo bo) {
+        return toAjax(hospitalMealRecipeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除院内膳食食谱明细
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("patients:hospitalMealRecipe:remove")
+    @Log(title = "院内膳食食谱明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(hospitalMealRecipeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,80 @@
+package org.dromara.web.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 日常膳食主对象 daily_meal_plan
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("daily_meal_plan")
+public class DailyMealPlan extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 看诊类型
+     */
+    private String type;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String outpatientNo;
+
+    /**
+     * 科室ID
+     */
+    private Long deptId;
+
+    /**
+     * 推荐/配餐开始日期
+     */
+    private Date recommendStartDate;
+
+    /**
+     * 推荐/配餐结束日期
+     */
+    private Date recommendEndDate;
+
+    /**
+     * 处方状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,100 @@
+package org.dromara.web.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 日常膳食食谱明细对象 daily_meal_recipe
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("daily_meal_recipe")
+public class DailyMealRecipe extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 院内膳食主表ID
+     */
+    private Long planId;
+
+    /**
+     * 食谱序号(1-7)
+     */
+    private Long recipeNo;
+
+    /**
+     * 餐次(如早餐/午餐/晚餐/早加/晚加等)
+     */
+    private String mealTime;
+
+    /**
+     * 用餐时间
+     */
+    private Date eatTime;
+
+    /**
+     * 食物名称
+     */
+    private String foodName;
+
+    /**
+     * 食物id
+     */
+    private Long foodId;
+
+    /**
+     * 食谱分类Id
+     */
+    private Long foodCategoryId;
+
+    /**
+     * 食谱分类
+     */
+    private String foodCategoryName;
+
+    /**
+     * 食物重量(g)
+     */
+    private Long foodWeight;
+
+    /**
+     * 热量(kcal)
+     */
+    private Long calorie;
+
+    /**
+     * 份数
+     */
+    private Long amount;
+
+    /**
+     * 金额
+     */
+    private Long price;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,79 @@
+package org.dromara.web.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 院内膳食主对象 hospital_meal_plan
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hospital_meal_plan")
+public class HospitalMealPlan extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 看诊类型
+     */
+    private String type;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String outpatientNo;
+
+    /**
+     * 科室ID
+     */
+    private Long deptId;
+
+    /**
+     * 推荐/配餐开始日期
+     */
+    private Date recommendStartDate;
+
+    /**
+     * 推荐/配餐结束日期
+     */
+    private Date recommendEndDate;
+
+    /**
+     * 处方状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,99 @@
+package org.dromara.web.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 院内膳食食谱明细对象 hospital_meal_recipe
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hospital_meal_recipe")
+public class HospitalMealRecipe extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 院内膳食主表ID
+     */
+    private Long planId;
+
+    /**
+     * 食谱序号(1-7)
+     */
+    private Long recipeNo;
+
+    /**
+     * 餐次(如早餐/午餐/晚餐/早加/晚加等)
+     */
+    private String mealTime;
+
+    /**
+     * 用餐时间
+     */
+    private Date eatTime;
+
+    /**
+     * 食物名称
+     */
+    private String foodName;
+
+    /**
+     * 食物id
+     */
+    private Long foodId;
+
+    /**
+     * 食谱分类Id
+     */
+    private Long foodCategoryId;
+
+    /**
+     * 食谱分类
+     */
+    private String foodCategoryName;
+
+    /**
+     * 食物重量(g)
+     */
+    private Long foodWeight;
+
+    /**
+     * 热量(kcal)
+     */
+    private Long calorie;
+
+    /**
+     * 份数
+     */
+    private Long amount;
+
+    /**
+     * 金额
+     */
+    private Long price;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,81 @@
+package org.dromara.web.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.web.domain.DailyMealPlan;
+import org.dromara.web.domain.HospitalMealPlan;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 院内膳食主业务对象 daily_meal_plan
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DailyMealPlan.class, reverseConvertGenerate = false)
+public class DailyMealPlanBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 看诊类型
+     */
+    private String type;
+
+    /**
+     * 患者ID
+     */
+    @NotNull(message = "患者ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long patientId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String outpatientNo;
+
+    /**
+     * 科室ID
+     */
+    private Long deptId;
+
+    /**
+     * 推荐/配餐开始日期
+     */
+    private Date recommendStartDate;
+
+    /**
+     * 推荐/配餐结束日期
+     */
+    private Date recommendEndDate;
+
+    /**
+     * 处方状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<Date> dateRange;
+
+    @NotEmpty(message = "院内膳食明细不能为空", groups = {AddGroup.class, EditGroup.class})
+    private List<DailyMealRecipeBo> mealRecipeList;
+
+
+}

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

@@ -0,0 +1,97 @@
+package org.dromara.web.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.web.domain.DailyMealRecipe;
+import org.dromara.web.domain.HospitalMealRecipe;
+
+import java.util.Date;
+
+/**
+ * 日常膳食食谱明细业务对象 daily_meal_recipe
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DailyMealRecipe.class, reverseConvertGenerate = false)
+public class DailyMealRecipeBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 院内膳食主表ID
+     */
+    @NotNull(message = "院内膳食主表ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long planId;
+
+    /**
+     * 食谱序号(1-7)
+     */
+    @NotNull(message = "食谱序号(1-7)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long recipeNo;
+
+    /**
+     * 餐次(如早餐/午餐/晚餐/早加/晚加等)
+     */
+    @NotBlank(message = "餐次(如早餐/午餐/晚餐/早加/晚加等)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String mealTime;
+
+    /**
+     * 用餐时间
+     */
+    private Date eatTime;
+
+    /**
+     * 食物名称
+     */
+    private String foodName;
+
+    /**
+     * 食物id
+     */
+    private Long foodId;
+
+    /**
+     * 食谱分类Id
+     */
+    private Long foodCategoryId;
+
+    /**
+     * 食谱分类
+     */
+    private String foodCategoryName;
+
+    /**
+     * 食物重量(g)
+     */
+    private Long foodWeight;
+
+    /**
+     * 热量(kcal)
+     */
+    private Long calorie;
+
+    /**
+     * 份数
+     */
+    private Long amount;
+
+    /**
+     * 金额
+     */
+    private Long price;
+
+
+}

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

@@ -0,0 +1,81 @@
+package org.dromara.web.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.web.domain.HospitalMealPlan;
+import org.dromara.web.domain.HospitalMealRecipe;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 院内膳食主业务对象 hospital_meal_plan
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HospitalMealPlan.class, reverseConvertGenerate = false)
+public class HospitalMealPlanBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 看诊类型
+     */
+    private String type;
+
+    /**
+     * 患者ID
+     */
+    @NotNull(message = "患者ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long patientId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String outpatientNo;
+
+    /**
+     * 科室ID
+     */
+    private Long deptId;
+
+    /**
+     * 推荐/配餐开始日期
+     */
+    private Date recommendStartDate;
+
+    /**
+     * 推荐/配餐结束日期
+     */
+    private Date recommendEndDate;
+
+    /**
+     * 处方状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<Date> dateRange;
+
+    @NotEmpty(message = "日常膳食明细不能为空", groups = {AddGroup.class, EditGroup.class})
+    private List<HospitalMealRecipeBo> mealRecipeList;
+
+
+}

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

@@ -0,0 +1,97 @@
+package org.dromara.web.domain.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.web.domain.HospitalMealRecipe;
+
+/**
+ * 院内膳食食谱明细业务对象 hospital_meal_recipe
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HospitalMealRecipe.class, reverseConvertGenerate = false)
+public class HospitalMealRecipeBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 院内膳食主表ID
+     */
+    @NotNull(message = "院内膳食主表ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long planId;
+
+    /**
+     * 食谱序号(1-7)
+     */
+    @NotNull(message = "食谱序号(1-7)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long recipeNo;
+
+    /**
+     * 餐次(如早餐/午餐/晚餐/早加/晚加等)
+     */
+    @NotBlank(message = "餐次(如早餐/午餐/晚餐/早加/晚加等)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String mealTime;
+
+    /**
+     * 用餐时间
+     */
+    private Date eatTime;
+
+    /**
+     * 食物名称
+     */
+    private String foodName;
+
+    /**
+     * 食物id
+     */
+    private Long foodId;
+
+    /**
+     * 食谱分类Id
+     */
+    private Long foodCategoryId;
+
+    /**
+     * 食谱分类
+     */
+    private String foodCategoryName;
+
+    /**
+     * 食物重量(g)
+     */
+    private Long foodWeight;
+
+    /**
+     * 热量(kcal)
+     */
+    private Long calorie;
+
+    /**
+     * 份数
+     */
+    private Long amount;
+
+    /**
+     * 金额
+     */
+    private Long price;
+
+
+}

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

@@ -0,0 +1,90 @@
+package org.dromara.web.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.web.domain.DailyMealPlan;
+import org.dromara.web.domain.HospitalMealPlan;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 日常膳食主视图对象 daily_meal_plan
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DailyMealPlan.class)
+public class DailyMealPlanVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 看诊类型
+     */
+    @ExcelProperty(value = "看诊类型")
+    private String type;
+
+    /**
+     * 患者ID
+     */
+    @ExcelProperty(value = "患者ID")
+    private Long patientId;
+
+    /**
+     * 门诊/住院号
+     */
+    @ExcelProperty(value = "门诊/住院号")
+    private String outpatientNo;
+
+    /**
+     * 科室ID
+     */
+    @ExcelProperty(value = "科室ID")
+    private Long deptId;
+
+    /**
+     * 推荐/配餐开始日期
+     */
+    @ExcelProperty(value = "推荐/配餐开始日期")
+    private Date recommendStartDate;
+
+    /**
+     * 推荐/配餐结束日期
+     */
+    @ExcelProperty(value = "推荐/配餐结束日期")
+    private Date recommendEndDate;
+
+    /**
+     * 处方状态
+     */
+    @ExcelProperty(value = "处方状态")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    private Date createTime;
+
+    private Long createBy;
+
+    private String createByUser;
+
+
+}

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

@@ -0,0 +1,108 @@
+package org.dromara.web.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.web.domain.DailyMealRecipe;
+import org.dromara.web.domain.HospitalMealRecipe;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 日常膳食食谱明细视图对象 daily_meal_recipe
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DailyMealRecipe.class)
+public class DailyMealRecipeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 院内膳食主表ID
+     */
+    @ExcelProperty(value = "院内膳食主表ID")
+    private Long planId;
+
+    /**
+     * 食谱序号(1-7)
+     */
+    @ExcelProperty(value = "食谱序号(1-7)")
+    private Long recipeNo;
+
+    /**
+     * 餐次(如早餐/午餐/晚餐/早加/晚加等)
+     */
+    @ExcelProperty(value = "餐次(如早餐/午餐/晚餐/早加/晚加等)")
+    private String mealTime;
+
+    /**
+     * 用餐时间
+     */
+    @ExcelProperty(value = "用餐时间")
+    private Date eatTime;
+
+    /**
+     * 食物名称
+     */
+    @ExcelProperty(value = "食物名称")
+    private String foodName;
+
+    /**
+     * 食物id
+     */
+    @ExcelProperty(value = "食物id")
+    private Long foodId;
+
+    /**
+     * 食谱分类Id
+     */
+    @ExcelProperty(value = "食谱分类Id")
+    private Long foodCategoryId;
+
+    /**
+     * 食谱分类
+     */
+    @ExcelProperty(value = "食谱分类")
+    private String foodCategoryName;
+
+    /**
+     * 食物重量(g)
+     */
+    @ExcelProperty(value = "食物重量(g)")
+    private Long foodWeight;
+
+    /**
+     * 热量(kcal)
+     */
+    @ExcelProperty(value = "热量(kcal)")
+    private Long calorie;
+
+    /**
+     * 份数
+     */
+    @ExcelProperty(value = "份数")
+    private Long amount;
+
+    /**
+     * 金额
+     */
+    @ExcelProperty(value = "金额")
+    private Long price;
+
+
+}

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

@@ -0,0 +1,93 @@
+package org.dromara.web.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.web.domain.HospitalMealPlan;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 院内膳食主视图对象 hospital_meal_plan
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HospitalMealPlan.class)
+public class HospitalMealPlanVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 看诊类型
+     */
+    @ExcelProperty(value = "看诊类型")
+    private String type;
+
+    /**
+     * 患者ID
+     */
+    @ExcelProperty(value = "患者ID")
+    private Long patientId;
+
+    /**
+     * 门诊/住院号
+     */
+    @ExcelProperty(value = "门诊/住院号")
+    private String outpatientNo;
+
+    /**
+     * 科室ID
+     */
+    @ExcelProperty(value = "科室ID")
+    private Long deptId;
+
+    /**
+     * 推荐/配餐开始日期
+     */
+    @ExcelProperty(value = "推荐/配餐开始日期")
+    private Date recommendStartDate;
+
+    /**
+     * 推荐/配餐结束日期
+     */
+    @ExcelProperty(value = "推荐/配餐结束日期")
+    private Date recommendEndDate;
+
+    /**
+     * 处方状态
+     */
+    @ExcelProperty(value = "处方状态")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    private Date createTime;
+
+    private Long createBy;
+
+    private String createByUser;
+
+
+}

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

@@ -0,0 +1,112 @@
+package org.dromara.web.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.web.domain.HospitalMealRecipe;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 院内膳食食谱明细视图对象 hospital_meal_recipe
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HospitalMealRecipe.class)
+public class HospitalMealRecipeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 院内膳食主表ID
+     */
+    @ExcelProperty(value = "院内膳食主表ID")
+    private Long planId;
+
+    /**
+     * 食谱序号(1-7)
+     */
+    @ExcelProperty(value = "食谱序号(1-7)")
+    private Long recipeNo;
+
+    /**
+     * 餐次(如早餐/午餐/晚餐/早加/晚加等)
+     */
+    @ExcelProperty(value = "餐次(如早餐/午餐/晚餐/早加/晚加等)")
+    private String mealTime;
+
+    /**
+     * 用餐时间
+     */
+    @ExcelProperty(value = "用餐时间")
+    private Date eatTime;
+
+    /**
+     * 食物名称
+     */
+    @ExcelProperty(value = "食物名称")
+    private String foodName;
+
+    /**
+     * 食物id
+     */
+    @ExcelProperty(value = "食物id")
+    private Long foodId;
+
+    /**
+     * 食谱分类Id
+     */
+    @ExcelProperty(value = "食谱分类Id")
+    private Long foodCategoryId;
+
+    /**
+     * 食谱分类
+     */
+    @ExcelProperty(value = "食谱分类")
+    private String foodCategoryName;
+
+    /**
+     * 食物重量(g)
+     */
+    @ExcelProperty(value = "食物重量(g)")
+    private Long foodWeight;
+
+    /**
+     * 热量(kcal)
+     */
+    @ExcelProperty(value = "热量(kcal)")
+    private Long calorie;
+
+    /**
+     * 份数
+     */
+    @ExcelProperty(value = "份数")
+    private Long amount;
+
+    /**
+     * 金额
+     */
+    @ExcelProperty(value = "金额")
+    private Long price;
+
+
+}

ruoyi-admin/src/main/java/org/dromara/web/mapper/DailyMealPlanMapper.java

@@ -0,0 +1,18 @@
+package org.dromara.web.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.DailyMealPlan;
+import org.dromara.web.domain.vo.DailyMealPlanVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 日常膳食主Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Repository
+public interface DailyMealPlanMapper extends BaseMapperPlus<DailyMealPlan, DailyMealPlanVo> {
+
+}

ruoyi-admin/src/main/java/org/dromara/web/mapper/DailyMealRecipeMapper.java

@@ -0,0 +1,18 @@
+package org.dromara.web.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.DailyMealRecipe;
+import org.dromara.web.domain.vo.DailyMealRecipeVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 日常膳食食谱明细Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Repository
+public interface DailyMealRecipeMapper extends BaseMapperPlus<DailyMealRecipe, DailyMealRecipeVo> {
+
+}

ruoyi-admin/src/main/java/org/dromara/web/mapper/HospitalMealPlanMapper.java

@@ -0,0 +1,18 @@
+package org.dromara.web.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.HospitalMealPlan;
+import org.dromara.web.domain.vo.HospitalMealPlanVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 院内膳食主Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Repository
+public interface HospitalMealPlanMapper extends BaseMapperPlus<HospitalMealPlan, HospitalMealPlanVo> {
+
+}

ruoyi-admin/src/main/java/org/dromara/web/mapper/HospitalMealRecipeMapper.java

@@ -0,0 +1,18 @@
+package org.dromara.web.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.HospitalMealRecipe;
+import org.dromara.web.domain.vo.HospitalMealRecipeVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 院内膳食食谱明细Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Repository
+public interface HospitalMealRecipeMapper extends BaseMapperPlus<HospitalMealRecipe, HospitalMealRecipeVo> {
+
+}

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

@@ -0,0 +1,69 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.web.domain.bo.DailyMealPlanBo;
+import org.dromara.web.domain.vo.DailyMealPlanVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 日常膳食主Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+public interface IDailyMealPlanService {
+
+    /**
+     * 查询院内膳食主
+     *
+     * @param id 主键
+     * @return 日常膳食主
+     */
+    DailyMealPlanVo queryById(Long id);
+
+    /**
+     * 分页查询院内膳食主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 日常膳食主分页列表
+     */
+    TableDataInfo<DailyMealPlanVo> queryPageList(DailyMealPlanBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的日常膳食主列表
+     *
+     * @param bo 查询条件
+     * @return 日常膳食主列表
+     */
+    List<DailyMealPlanVo> queryList(DailyMealPlanBo bo);
+
+    /**
+     * 新增日常膳食主
+     *
+     * @param bo 日常膳食主
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DailyMealPlanBo bo);
+
+    /**
+     * 修改日常膳食
+     *
+     * @param bo 日常膳食主
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DailyMealPlanBo bo);
+
+    /**
+     * 校验并批量删除日常膳食主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,69 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.web.domain.bo.DailyMealRecipeBo;
+import org.dromara.web.domain.vo.DailyMealRecipeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 日常膳食食谱明细Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+public interface IDailyMealRecipeService {
+
+    /**
+     * 查询日常膳食食谱明细
+     *
+     * @param id 主键
+     * @return 日常膳食食谱明细
+     */
+    DailyMealRecipeVo queryById(Long id);
+
+    /**
+     * 分页查询日常膳食食谱明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 日常膳食食谱明细分页列表
+     */
+    TableDataInfo<DailyMealRecipeVo> queryPageList(DailyMealRecipeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的日常膳食食谱明细列表
+     *
+     * @param bo 查询条件
+     * @return 日常膳食食谱明细列表
+     */
+    List<DailyMealRecipeVo> queryList(DailyMealRecipeBo bo);
+
+    /**
+     * 新增日常膳食食谱明细
+     *
+     * @param bo 日常膳食食谱明细
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DailyMealRecipeBo bo);
+
+    /**
+     * 修改院内膳食食谱明细
+     *
+     * @param bo 日常膳食食谱明细
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DailyMealRecipeBo bo);
+
+    /**
+     * 校验并批量删除日常膳食食谱明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,69 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.web.domain.bo.HospitalMealPlanBo;
+import org.dromara.web.domain.vo.HospitalMealPlanVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 院内膳食主Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+public interface IHospitalMealPlanService {
+
+    /**
+     * 查询院内膳食主
+     *
+     * @param id 主键
+     * @return 院内膳食主
+     */
+    HospitalMealPlanVo queryById(Long id);
+
+    /**
+     * 分页查询院内膳食主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 院内膳食主分页列表
+     */
+    TableDataInfo<HospitalMealPlanVo> queryPageList(HospitalMealPlanBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的院内膳食主列表
+     *
+     * @param bo 查询条件
+     * @return 院内膳食主列表
+     */
+    List<HospitalMealPlanVo> queryList(HospitalMealPlanBo bo);
+
+    /**
+     * 新增院内膳食主
+     *
+     * @param bo 院内膳食主
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HospitalMealPlanBo bo);
+
+    /**
+     * 修改院内膳食主
+     *
+     * @param bo 院内膳食主
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HospitalMealPlanBo bo);
+
+    /**
+     * 校验并批量删除院内膳食主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,69 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.web.domain.bo.HospitalMealRecipeBo;
+import org.dromara.web.domain.vo.HospitalMealRecipeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 院内膳食食谱明细Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+public interface IHospitalMealRecipeService {
+
+    /**
+     * 查询院内膳食食谱明细
+     *
+     * @param id 主键
+     * @return 院内膳食食谱明细
+     */
+    HospitalMealRecipeVo queryById(Long id);
+
+    /**
+     * 分页查询院内膳食食谱明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 院内膳食食谱明细分页列表
+     */
+    TableDataInfo<HospitalMealRecipeVo> queryPageList(HospitalMealRecipeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的院内膳食食谱明细列表
+     *
+     * @param bo 查询条件
+     * @return 院内膳食食谱明细列表
+     */
+    List<HospitalMealRecipeVo> queryList(HospitalMealRecipeBo bo);
+
+    /**
+     * 新增院内膳食食谱明细
+     *
+     * @param bo 院内膳食食谱明细
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HospitalMealRecipeBo bo);
+
+    /**
+     * 修改院内膳食食谱明细
+     *
+     * @param bo 院内膳食食谱明细
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HospitalMealRecipeBo bo);
+
+    /**
+     * 校验并批量删除院内膳食食谱明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,174 @@
+package org.dromara.web.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.web.domain.DailyMealPlan;
+import org.dromara.web.domain.DailyMealRecipe;
+import org.dromara.web.domain.bo.DailyMealPlanBo;
+import org.dromara.web.domain.vo.DailyMealPlanVo;
+import org.dromara.web.mapper.DailyMealPlanMapper;
+import org.dromara.web.mapper.DailyMealRecipeMapper;
+import org.dromara.web.service.IDailyMealPlanService;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 日常膳食主Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-25
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class DailyMealPlanServiceImpl implements IDailyMealPlanService {
+
+    private final DailyMealPlanMapper baseMapper;
+
+    private final SysUserMapper userMapper;
+
+    private final DailyMealRecipeMapper mealRecipeMapper;
+
+    /**
+     * 查询日常膳食主
+     *
+     * @param id 主键
+     * @return 院内膳食主
+     */
+    @Override
+    public DailyMealPlanVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询日常膳食主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 日常膳食主分页列表
+     */
+    @Override
+    public TableDataInfo<DailyMealPlanVo> queryPageList(DailyMealPlanBo bo, PageQuery pageQuery) {
+        List<SysUser> userList = userMapper.selectList(Wrappers.lambdaQuery(SysUser.class).select(SysUser::getUserId, SysUser::getUserName));
+        Map<Long, String> userMap = userList.stream().collect(Collectors.toMap(k1 -> k1.getUserId(), k2 -> String.valueOf(k2.getUserName()), (k1, k2) -> k1));
+        LambdaQueryWrapper<DailyMealPlan> lqw = buildQueryWrapper(bo);
+        Page<DailyMealPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<DailyMealPlanVo> records = result.getRecords();
+        if (CollUtil.isNotEmpty(records))
+            for (DailyMealPlanVo record : records) {
+                record.setCreateByUser(userMap.get(record.getCreateBy()));
+            }
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的日常膳食主列表
+     *
+     * @param bo 查询条件
+     * @return 日常膳食主列表
+     */
+    @Override
+    public List<DailyMealPlanVo> queryList(DailyMealPlanBo bo) {
+        LambdaQueryWrapper<DailyMealPlan> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DailyMealPlan> buildQueryWrapper(DailyMealPlanBo bo) {
+        List<Date> dateRange = bo.getDateRange();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        List<SysUser> userList = userMapper.selectList(Wrappers.lambdaQuery(SysUser.class).select(SysUser::getUserId, SysUser::getUserName));
+        Map<String, Long> userMap = userList.stream().collect(Collectors.toMap(k1 -> String.valueOf(k1.getUserName()), k2 -> k2.getUserId(), (k1, k2) -> k1));
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DailyMealPlan> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(DailyMealPlan::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), DailyMealPlan::getType, bo.getType());
+        lqw.eq(bo.getPatientId() != null, DailyMealPlan::getPatientId, bo.getPatientId());
+        if (StringUtils.isNotBlank(bo.getSearchValue())) {
+            lqw.and(wrapper -> wrapper.like(DailyMealPlan::getCreateBy, userMap.get(bo.getSearchValue())).or().like(DailyMealPlan::getOutpatientNo, bo.getSearchValue()));
+        }
+        if (dateRange != null && dateRange.size() == 2) {
+            String startTime = sdf.format(dateRange.get(0)) + " 00:00:00";  // 开始时间
+            String endTime = sdf.format(dateRange.get(1)) + " 23:59:59";    // 结束时间
+            if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+                lqw.between(DailyMealPlan::getCreateTime, startTime, endTime);
+
+            }
+        }
+        return lqw;
+    }
+
+    /**
+     * 新增日常膳食主
+     *
+     * @param bo 日常膳食主
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DailyMealPlanBo bo) {
+        DailyMealPlan add = MapstructUtils.convert(bo, DailyMealPlan.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            List<DailyMealRecipe> hList = bo.getMealRecipeList().stream().map(mealRecipe -> {
+                DailyMealRecipe dailyMealRecipe = MapstructUtils.convert(mealRecipe, DailyMealRecipe.class);
+                dailyMealRecipe.setPlanId(add.getId());
+                return dailyMealRecipe;
+            }).collect(Collectors.toList());
+            mealRecipeMapper.insertBatch(hList);
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改日常膳食主
+     *
+     * @param bo 日常膳食主
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DailyMealPlanBo bo) {
+        DailyMealPlan update = MapstructUtils.convert(bo, DailyMealPlan.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DailyMealPlan entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除日常膳食主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,140 @@
+package org.dromara.web.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.web.domain.DailyMealRecipe;
+import org.dromara.web.domain.bo.DailyMealRecipeBo;
+import org.dromara.web.domain.vo.DailyMealRecipeVo;
+import org.dromara.web.mapper.DailyMealRecipeMapper;
+import org.dromara.web.service.IDailyMealRecipeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 日常膳食食谱明细Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class DailyMealRecipeServiceImpl implements IDailyMealRecipeService {
+
+    private final DailyMealRecipeMapper baseMapper;
+
+    /**
+     * 查询日常膳食食谱明细
+     *
+     * @param id 主键
+     * @return 日常膳食食谱明细
+     */
+    @Override
+    public DailyMealRecipeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询日常膳食食谱明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 日常膳食食谱明细分页列表
+     */
+    @Override
+    public TableDataInfo<DailyMealRecipeVo> queryPageList(DailyMealRecipeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DailyMealRecipe> lqw = buildQueryWrapper(bo);
+        Page<DailyMealRecipeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的日常膳食食谱明细列表
+     *
+     * @param bo 查询条件
+     * @return 日常膳食食谱明细列表
+     */
+    @Override
+    public List<DailyMealRecipeVo> queryList(DailyMealRecipeBo bo) {
+        LambdaQueryWrapper<DailyMealRecipe> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DailyMealRecipe> buildQueryWrapper(DailyMealRecipeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DailyMealRecipe> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(DailyMealRecipe::getId);
+        lqw.eq(bo.getPlanId() != null, DailyMealRecipe::getPlanId, bo.getPlanId());
+        lqw.eq(bo.getRecipeNo() != null, DailyMealRecipe::getRecipeNo, bo.getRecipeNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getMealTime()), DailyMealRecipe::getMealTime, bo.getMealTime());
+        lqw.eq(bo.getEatTime() != null, DailyMealRecipe::getEatTime, bo.getEatTime());
+        lqw.like(StringUtils.isNotBlank(bo.getFoodCategoryName()), DailyMealRecipe::getFoodCategoryName, bo.getFoodCategoryName());
+        lqw.eq(bo.getFoodWeight() != null, DailyMealRecipe::getFoodWeight, bo.getFoodWeight());
+        lqw.eq(bo.getCalorie() != null, DailyMealRecipe::getCalorie, bo.getCalorie());
+        lqw.eq(bo.getAmount() != null, DailyMealRecipe::getAmount, bo.getAmount());
+        lqw.eq(bo.getPrice() != null, DailyMealRecipe::getPrice, bo.getPrice());
+        return lqw;
+    }
+
+    /**
+     * 新增日常膳食食谱明细
+     *
+     * @param bo 日常膳食食谱明细
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DailyMealRecipeBo bo) {
+        DailyMealRecipe add = MapstructUtils.convert(bo, DailyMealRecipe.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改日常膳食食谱明细
+     *
+     * @param bo 日常膳食食谱明细
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DailyMealRecipeBo bo) {
+        DailyMealRecipe update = MapstructUtils.convert(bo, DailyMealRecipe.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DailyMealRecipe entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除日常膳食食谱明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,182 @@
+package org.dromara.web.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.domain.SysRecipeFoodIngredient;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.web.domain.HospitalMealPlan;
+import org.dromara.web.domain.HospitalMealRecipe;
+import org.dromara.web.domain.NutritionSetting;
+import org.dromara.web.domain.bo.HospitalMealPlanBo;
+import org.dromara.web.domain.bo.HospitalMealRecipeBo;
+import org.dromara.web.domain.vo.HospitalMealPlanVo;
+import org.dromara.web.domain.vo.NutritionSettingVo;
+import org.dromara.web.mapper.HospitalMealPlanMapper;
+import org.dromara.web.mapper.HospitalMealRecipeMapper;
+import org.dromara.web.service.IHospitalMealPlanService;
+import org.springframework.stereotype.Service;
+
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 院内膳食主Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HospitalMealPlanServiceImpl implements IHospitalMealPlanService {
+
+    private final HospitalMealPlanMapper baseMapper;
+
+    private final SysUserMapper userMapper;
+
+    private final HospitalMealRecipeMapper mealRecipeMapper;
+
+    /**
+     * 查询院内膳食主
+     *
+     * @param id 主键
+     * @return 院内膳食主
+     */
+    @Override
+    public HospitalMealPlanVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询院内膳食主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 院内膳食主分页列表
+     */
+    @Override
+    public TableDataInfo<HospitalMealPlanVo> queryPageList(HospitalMealPlanBo bo, PageQuery pageQuery) {
+        List<SysUser> userList = userMapper.selectList(Wrappers.lambdaQuery(SysUser.class).select(SysUser::getUserId, SysUser::getUserName));
+        Map<Long, String> userMap = userList.stream().collect(Collectors.toMap(k1 -> k1.getUserId(), k2 -> String.valueOf(k2.getUserName()), (k1, k2) -> k1));
+        LambdaQueryWrapper<HospitalMealPlan> lqw = buildQueryWrapper(bo);
+        Page<HospitalMealPlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<HospitalMealPlanVo> records = result.getRecords();
+        if (CollUtil.isNotEmpty(records))
+            for (HospitalMealPlanVo record : records) {
+                record.setCreateByUser(userMap.get(record.getCreateBy()));
+            }
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的院内膳食主列表
+     *
+     * @param bo 查询条件
+     * @return 院内膳食主列表
+     */
+    @Override
+    public List<HospitalMealPlanVo> queryList(HospitalMealPlanBo bo) {
+        LambdaQueryWrapper<HospitalMealPlan> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HospitalMealPlan> buildQueryWrapper(HospitalMealPlanBo bo) {
+        List<Date> dateRange = bo.getDateRange();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        List<SysUser> userList = userMapper.selectList(Wrappers.lambdaQuery(SysUser.class).select(SysUser::getUserId, SysUser::getUserName));
+        Map<String, Long> userMap = userList.stream().collect(Collectors.toMap(k1 -> String.valueOf(k1.getUserName()), k2 -> k2.getUserId(), (k1, k2) -> k1));
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HospitalMealPlan> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HospitalMealPlan::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), HospitalMealPlan::getType, bo.getType());
+        lqw.eq(bo.getPatientId() != null, HospitalMealPlan::getPatientId, bo.getPatientId());
+        if (StringUtils.isNotBlank(bo.getSearchValue())) {
+            lqw.and(wrapper -> wrapper.like(HospitalMealPlan::getCreateBy, userMap.get(bo.getSearchValue())).or().like(HospitalMealPlan::getOutpatientNo, bo.getSearchValue()));
+        }
+        if (dateRange != null && dateRange.size() == 2) {
+            String startTime = sdf.format(dateRange.get(0)) + " 00:00:00";  // 开始时间
+            String endTime = sdf.format(dateRange.get(1)) + " 23:59:59";    // 结束时间
+            if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+                lqw.between(HospitalMealPlan::getCreateTime, startTime, endTime);
+
+            }
+        }
+        return lqw;
+    }
+
+    /**
+     * 新增院内膳食主
+     *
+     * @param bo 院内膳食主
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HospitalMealPlanBo bo) {
+        HospitalMealPlan add = MapstructUtils.convert(bo, HospitalMealPlan.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            List<HospitalMealRecipe> hList = bo.getMealRecipeList().stream().map(mealRecipe -> {
+                HospitalMealRecipe hospitalMealRecipe = MapstructUtils.convert(mealRecipe, HospitalMealRecipe.class);
+
+                hospitalMealRecipe.setPlanId(add.getId());
+                return hospitalMealRecipe;
+            }).collect(Collectors.toList());
+            mealRecipeMapper.insertBatch(hList);
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改院内膳食主
+     *
+     * @param bo 院内膳食主
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HospitalMealPlanBo bo) {
+        HospitalMealPlan update = MapstructUtils.convert(bo, HospitalMealPlan.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HospitalMealPlan entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除院内膳食主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,141 @@
+package org.dromara.web.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.web.domain.HospitalMealRecipe;
+import org.dromara.web.domain.bo.HospitalMealRecipeBo;
+import org.dromara.web.domain.vo.HospitalMealRecipeVo;
+import org.dromara.web.mapper.HospitalMealRecipeMapper;
+import org.dromara.web.service.IHospitalMealRecipeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 院内膳食食谱明细Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HospitalMealRecipeServiceImpl implements IHospitalMealRecipeService {
+
+    private final HospitalMealRecipeMapper baseMapper;
+
+    /**
+     * 查询院内膳食食谱明细
+     *
+     * @param id 主键
+     * @return 院内膳食食谱明细
+     */
+    @Override
+    public HospitalMealRecipeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询院内膳食食谱明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 院内膳食食谱明细分页列表
+     */
+    @Override
+    public TableDataInfo<HospitalMealRecipeVo> queryPageList(HospitalMealRecipeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HospitalMealRecipe> lqw = buildQueryWrapper(bo);
+        Page<HospitalMealRecipeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的院内膳食食谱明细列表
+     *
+     * @param bo 查询条件
+     * @return 院内膳食食谱明细列表
+     */
+    @Override
+    public List<HospitalMealRecipeVo> queryList(HospitalMealRecipeBo bo) {
+        LambdaQueryWrapper<HospitalMealRecipe> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HospitalMealRecipe> buildQueryWrapper(HospitalMealRecipeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HospitalMealRecipe> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HospitalMealRecipe::getId);
+        lqw.eq(bo.getPlanId() != null, HospitalMealRecipe::getPlanId, bo.getPlanId());
+        lqw.eq(bo.getRecipeNo() != null, HospitalMealRecipe::getRecipeNo, bo.getRecipeNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getMealTime()), HospitalMealRecipe::getMealTime, bo.getMealTime());
+        lqw.eq(bo.getEatTime() != null, HospitalMealRecipe::getEatTime, bo.getEatTime());
+        lqw.like(StringUtils.isNotBlank(bo.getFoodCategoryName()), HospitalMealRecipe::getFoodCategoryName, bo.getFoodCategoryName());
+        lqw.eq(bo.getFoodWeight() != null, HospitalMealRecipe::getFoodWeight, bo.getFoodWeight());
+        lqw.eq(bo.getCalorie() != null, HospitalMealRecipe::getCalorie, bo.getCalorie());
+        lqw.eq(bo.getAmount() != null, HospitalMealRecipe::getAmount, bo.getAmount());
+        lqw.eq(bo.getPrice() != null, HospitalMealRecipe::getPrice, bo.getPrice());
+        return lqw;
+    }
+
+    /**
+     * 新增院内膳食食谱明细
+     *
+     * @param bo 院内膳食食谱明细
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HospitalMealRecipeBo bo) {
+        HospitalMealRecipe add = MapstructUtils.convert(bo, HospitalMealRecipe.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改院内膳食食谱明细
+     *
+     * @param bo 院内膳食食谱明细
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HospitalMealRecipeBo bo) {
+        HospitalMealRecipe update = MapstructUtils.convert(bo, HospitalMealRecipe.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HospitalMealRecipe entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除院内膳食食谱明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -103,7 +103,6 @@ public class NutritionSettingServiceImpl implements INutritionSettingService {
         lqw.eq(bo.getPatientId() != null, NutritionSetting::getPatientId, bo.getPatientId());
         lqw.eq(StringUtils.isNotBlank(bo.getSettingType()), NutritionSetting::getSettingType, bo.getSettingType());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), NutritionSetting::getType, bo.getType());
-        lqw.eq(StringUtils.isNotBlank(bo.getOutpatientNo()), NutritionSetting::getOutpatientNo, bo.getOutpatientNo());
         if (StringUtils.isNotBlank(bo.getSearchValue())) {
             lqw.and(wrapper -> wrapper.like(NutritionSetting::getCreateBy, userMap.get(bo.getSearchValue())).or().like(NutritionSetting::getOutpatientNo, bo.getSearchValue()));
         }

ruoyi-admin/src/main/resources/mapper/patients/DailyMealPlanMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.web.mapper.DailyMealPlanMapper">
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/patients/DailyMealRecipeMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.web.mapper.DailyMealRecipeMapper">
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/patients/HospitalMealPlanMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.web.mapper.HospitalMealPlanMapper">
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/patients/HospitalMealRecipeMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.web.mapper.HospitalMealRecipeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRecipeCategoryController.java

@@ -45,6 +45,12 @@ public class SysRecipeCategoryController extends BaseController {
         return sysRecipeCategoryService.queryPageList(bo, pageQuery);
     }
 
+    @SaCheckPermission("system:recipeCategory:list")
+    @GetMapping("/queryList")
+    public List<SysRecipeCategoryVo> list(SysRecipeCategoryBo bo) {
+        return sysRecipeCategoryService.queryList(bo);
+    }
+
     /**
      * 导出食谱分类管理列表
      */