营养评估

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/BizConst.java

@@ -5,6 +5,9 @@ package org.dromara.common.core.constant;
  * @date 2025-06-24 16:12:13
  **/
 public interface BizConst {
+    String PAYMENT_STATUS = "payment_status";
+    String TREATMENT_USER_TYPE = "treatment_user_type";
+
     String HOSPITAL_ROLE_TYPE = "hospital_role_type";
 
     String FOOD_UNIT = "food_unit";

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/PaymentStatus.java

@@ -0,0 +1,22 @@
+package org.dromara.common.core.enums;
+
+import lombok.Getter;
+
+/**
+ * @author chenYing
+ * @date 2025-07-17 17:24:05
+ **/
+@Getter
+public enum PaymentStatus {
+    UNPAID("0", "未支付"),
+    PAID("1", "已支付"),
+    REFUNDED("2", "已退款");
+
+    private String code;
+    private String remark;
+
+    private PaymentStatus(String code, String remark) {
+        this.code = code;
+        this.remark = remark;
+    }
+}

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

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.system;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.system.domain.vo.NutritionEvaluationVo;
+import org.dromara.system.domain.bo.NutritionEvaluationBo;
+import org.dromara.system.service.INutritionEvaluationService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 营养评估
+ *
+ * @author Lion Li
+ * @date 2025-07-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/evaluation")
+public class NutritionEvaluationController extends BaseController {
+
+    private final INutritionEvaluationService nutritionEvaluationService;
+
+    /**
+     * 查询营养评估列表
+     */
+    @SaCheckPermission("system:evaluation:list")
+    @GetMapping("/list")
+    public TableDataInfo<NutritionEvaluationVo> list(NutritionEvaluationBo bo, PageQuery pageQuery) {
+        return nutritionEvaluationService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出营养评估列表
+     */
+    @SaCheckPermission("system:evaluation:export")
+    @Log(title = "营养评估", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(NutritionEvaluationBo bo, HttpServletResponse response) {
+        List<NutritionEvaluationVo> list = nutritionEvaluationService.queryList(bo);
+        ExcelUtil.exportExcel(list, "营养评估", NutritionEvaluationVo.class, response);
+    }
+
+    /**
+     * 获取营养评估详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:evaluation:query")
+    @GetMapping("/{id}")
+    public R<NutritionEvaluationVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(nutritionEvaluationService.queryById(id));
+    }
+
+    /**
+     * 新增营养评估
+     */
+    @SaCheckPermission("system:evaluation:add")
+    @Log(title = "营养评估", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody NutritionEvaluationBo bo) {
+        return toAjax(nutritionEvaluationService.insertByBo(bo));
+    }
+
+    /**
+     * 修改营养评估
+     */
+    @SaCheckPermission("system:evaluation:edit")
+    @Log(title = "营养评估", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody NutritionEvaluationBo bo) {
+        return toAjax(nutritionEvaluationService.updateByBo(bo));
+    }
+
+    /**
+     * 删除营养评估
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:evaluation:remove")
+    @Log(title = "营养评估", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(nutritionEvaluationService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/NutritionEvaluation.java

@@ -0,0 +1,79 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+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;
+
+/**
+ * 营养评估对象 nutrition_evaluation
+ *
+ * @author Lion Li
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("nutrition_evaluation")
+public class NutritionEvaluation extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 营养评估类型
+     */
+    private Long configId;
+
+    /**
+     * 筛查时间
+     */
+    private Date screeningTime;
+
+    /**
+     * 看诊类型（0门诊 1住院）
+     */
+    private String visitType;
+
+    /**
+     * 门诊/住院号
+     */
+    private String patientNo;
+
+    /**
+     * 支付状态(未支付/已支付/已退款)
+     */
+    private String paymentStatus;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/NutritionScreening.java

@@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -57,7 +59,7 @@ public class NutritionScreening extends TenantEntity {
     /**
      * 营养筛查分数
      */
-    private Long screeningScore;
+    private BigDecimal screeningScore;
 
     /**
      * 营养筛查结论
@@ -80,5 +82,5 @@ public class NutritionScreening extends TenantEntity {
     @TableLogic
     private String delFlag;
 
-
+    private String content;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/NutritionEvaluationBo.java

@@ -0,0 +1,76 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.NutritionEvaluation;
+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;
+
+/**
+ * 营养评估业务对象 nutrition_evaluation
+ *
+ * @author Lion Li
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = NutritionEvaluation.class, reverseConvertGenerate = false)
+public class NutritionEvaluationBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 患者ID
+     */
+    @NotNull(message = "患者不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long patientId;
+
+    /**
+     * 营养评估类型
+     */
+    @NotNull(message = "营养评估类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long configId;
+
+    /**
+     * 筛查时间
+     */
+    private Date screeningTime;
+
+    /**
+     * 看诊类型（0门诊 1住院）
+     */
+    @NotBlank(message = "看诊类型（0门诊 1住院）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitType;
+
+    /**
+     * 门诊/住院号
+     */
+    @NotBlank(message = "门诊/住院号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String patientNo;
+
+    /**
+     * 支付状态(未支付/已支付/已退款)
+     */
+    private String paymentStatus;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/NutritionScreeningBo.java

@@ -8,7 +8,10 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.math.BigDecimal;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
@@ -25,42 +28,42 @@ public class NutritionScreeningBo extends BaseEntity {
     /**
      * 主键ID
      */
-    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 患者ID
      */
+    @NotNull(message = "患者不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long patientId;
 
     /**
      * 营养筛查类型
      */
-    @NotNull(message = "营养筛查类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "营养筛查类型不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long configId;
 
     /**
      * 筛查时间
      */
-    @NotNull(message = "筛查时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date screeningTime;
 
     /**
      * 看诊类型（1门诊 2住院）
      */
-    @NotBlank(message = "看诊类型（1门诊 2住院）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "看诊类型（1门诊 2住院）不能为空", groups = {AddGroup.class, EditGroup.class})
     private String visitType;
 
     /**
      * 门诊/住院号
      */
-    @NotBlank(message = "门诊/住院号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "门诊/住院号不能为空", groups = {AddGroup.class, EditGroup.class})
     private String patientNo;
 
     /**
      * 营养筛查分数
      */
-    private Long screeningScore;
+    private BigDecimal screeningScore;
 
     /**
      * 营养筛查结论
@@ -77,5 +80,5 @@ public class NutritionScreeningBo extends BaseEntity {
      */
     private String status;
 
-
+    private String content;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysScreeningAssessmentQuestionBo.java

@@ -35,6 +35,8 @@ public class SysScreeningAssessmentQuestionBo extends BaseEntity {
      */
     private Long configId;
 
+    private Object value;
+
     /**
      * 标题
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/NutritionEvaluationVo.java

@@ -0,0 +1,94 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.NutritionEvaluation;
+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 java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 营养评估视图对象 nutrition_evaluation
+ *
+ * @author Lion Li
+ * @date 2025-07-17
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = NutritionEvaluation.class)
+public class NutritionEvaluationVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 患者ID
+     */
+    @ExcelProperty(value = "患者ID")
+    private Long patientId;
+
+    /**
+     * 营养评估类型
+     */
+    @ExcelProperty(value = "营养评估类型")
+    private Long configId;
+
+    private String configName;
+
+    /**
+     * 筛查时间
+     */
+    @ExcelProperty(value = "筛查时间")
+    private Date screeningTime;
+
+    /**
+     * 看诊类型（0门诊 1住院）
+     */
+    @ExcelProperty(value = "看诊类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=门诊,1=住院")
+    private String visitType;
+
+    /**
+     * 门诊/住院号
+     */
+    @ExcelProperty(value = "门诊/住院号")
+    private String patientNo;
+
+    /**
+     * 支付状态(未支付/已支付/已退款)
+     */
+    @ExcelProperty(value = "支付状态(未支付/已支付/已退款)")
+    private String paymentStatus;
+
+    /**
+     * 内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    private Long createBy;
+
+    private String createByName;
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/NutritionScreeningVo.java

@@ -1,6 +1,8 @@
 package org.dromara.system.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.system.domain.NutritionScreening;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -15,7 +17,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 营养筛查视图对象 nutrition_screening
  *
@@ -48,6 +49,8 @@ public class NutritionScreeningVo implements Serializable {
     @ExcelProperty(value = "营养筛查类型")
     private Long configId;
 
+    private String configName;
+
     /**
      * 筛查时间
      */
@@ -71,7 +74,7 @@ public class NutritionScreeningVo implements Serializable {
      * 营养筛查分数
      */
     @ExcelProperty(value = "营养筛查分数")
-    private Long screeningScore;
+    private BigDecimal screeningScore;
 
     /**
      * 营养筛查结论
@@ -92,5 +95,9 @@ public class NutritionScreeningVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
     private String status;
 
+    private String content;
+
+    private Long createBy;
 
+    private String createByName;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/NutritionEvaluationMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.NutritionEvaluation;
+import org.dromara.system.domain.vo.NutritionEvaluationVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 营养评估Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-17
+ */
+public interface NutritionEvaluationMapper extends BaseMapperPlus<NutritionEvaluation, NutritionEvaluationVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/INutritionEvaluationService.java

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

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/NutritionEvaluationServiceImpl.java

@@ -0,0 +1,201 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import org.dromara.common.core.constant.BizConst;
+import org.dromara.common.core.enums.PaymentStatus;
+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.SysScreeningAssessmentConfig;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysScreeningAssessmentConfigBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.mapper.SysScreeningAssessmentConfigMapper;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.ISysDictDataService;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.NutritionEvaluationBo;
+import org.dromara.system.domain.vo.NutritionEvaluationVo;
+import org.dromara.system.domain.NutritionEvaluation;
+import org.dromara.system.mapper.NutritionEvaluationMapper;
+import org.dromara.system.service.INutritionEvaluationService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 营养评估Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-17
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class NutritionEvaluationServiceImpl implements INutritionEvaluationService {
+
+    private final NutritionEvaluationMapper baseMapper;
+    private final SysScreeningAssessmentConfigMapper configMapper;
+    private final ISysDictDataService dataService;
+    private final SysUserMapper userMapper;
+
+    /**
+     * 查询营养评估
+     *
+     * @param id 主键
+     * @return 营养评估
+     */
+    @Override
+    public NutritionEvaluationVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询营养评估列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 营养评估分页列表
+     */
+    @Override
+    public TableDataInfo<NutritionEvaluationVo> queryPageList(NutritionEvaluationBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<NutritionEvaluation> lqw = buildQueryWrapper(bo);
+        Page<NutritionEvaluationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        if (CollUtil.isNotEmpty(result.getRecords())) {
+            Set<Long> userList = CollUtil.newHashSet();
+            Set<Long> configList = CollUtil.newHashSet();
+            result.getRecords().forEach(v -> {
+                userList.add(v.getCreateBy());
+                configList.add(v.getConfigId());
+            });
+
+            Map<Long, String> userMap = userMapper.selectList(Wrappers.lambdaQuery(SysUser.class)
+                .select(SysUser::getUserId, SysUser::getNickName)
+                .in(SysUser::getUserId, userList)).stream().collect(Collectors.toMap(k1 -> k1.getUserId(), k2 -> k2.getNickName(), (k1, k2) -> k1));
+
+            Map<Long, String> configMap = configMapper.selectList(Wrappers.lambdaQuery(SysScreeningAssessmentConfig.class)
+                    .select(SysScreeningAssessmentConfig::getConfigId, SysScreeningAssessmentConfig::getName)
+                    .in(SysScreeningAssessmentConfig::getConfigId, configList))
+                .stream().collect(Collectors.toMap(k1 -> k1.getConfigId(), k2 -> k2.getName(), (k1, k2) -> k1));
+            Map<String, List<SysDictDataVo>> dictMap = dataService.selectGroupByType(List.of(BizConst.PAYMENT_STATUS, BizConst.TREATMENT_USER_TYPE)).getData();
+
+            Map<String, String> paymentMap = dictMap.get(BizConst.PAYMENT_STATUS).stream().collect(Collectors.toMap(k1 -> k1.getDictValue(), k2 -> k2.getDictLabel(), (k1, k2) -> k1));
+            Map<String, String> checkMap = dictMap.get(BizConst.TREATMENT_USER_TYPE).stream().collect(Collectors.toMap(k1 -> k1.getDictValue(), k2 -> k2.getDictLabel(), (k1, k2) -> k1));
+            result.getRecords().forEach(v -> {
+                v.setVisitType(checkMap.get(v.getVisitType()));
+                v.setPaymentStatus(paymentMap.get(v.getPaymentStatus()));
+                v.setConfigName(configMap.get(v.getConfigId()));
+                v.setCreateByName(userMap.get(v.getCreateBy()));
+            });
+        }
+
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的营养评估列表
+     *
+     * @param bo 查询条件
+     * @return 营养评估列表
+     */
+    @Override
+    public List<NutritionEvaluationVo> queryList(NutritionEvaluationBo bo) {
+        LambdaQueryWrapper<NutritionEvaluation> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<NutritionEvaluation> buildQueryWrapper(NutritionEvaluationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<NutritionEvaluation> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(NutritionEvaluation::getId);
+        lqw.eq(bo.getPatientId() != null, NutritionEvaluation::getPatientId, bo.getPatientId());
+        lqw.eq(bo.getConfigId() != null, NutritionEvaluation::getConfigId, bo.getConfigId());
+        lqw.eq(bo.getScreeningTime() != null, NutritionEvaluation::getScreeningTime, bo.getScreeningTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitType()), NutritionEvaluation::getVisitType, bo.getVisitType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPatientNo()), NutritionEvaluation::getPatientNo, bo.getPatientNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getPaymentStatus()), NutritionEvaluation::getPaymentStatus, bo.getPaymentStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), NutritionEvaluation::getContent, bo.getContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), NutritionEvaluation::getStatus, bo.getStatus());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+            NutritionEvaluation::getScreeningTime, params.get("beginTime"), params.get("endTime"));
+        return lqw;
+    }
+
+    /**
+     * 新增营养评估
+     *
+     * @param bo 营养评估
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(NutritionEvaluationBo bo) {
+        if (StrUtil.isBlank(bo.getContent())) {
+            throw new ServiceException("提交的“营养评估”不能为空！");
+        }
+        SysScreeningAssessmentConfigBo configBo = JSON.parseObject(bo.getContent(), new TypeReference<SysScreeningAssessmentConfigBo>() {
+        });
+        if (CollUtil.isEmpty(configBo.getOtherInfo())) {
+            throw new ServiceException("没有任何“营养评估”！");
+        }
+
+        NutritionEvaluation add = MapstructUtils.convert(bo, NutritionEvaluation.class);
+        add.setScreeningTime(new Date());
+        add.setPaymentStatus(PaymentStatus.PAID.getCode());
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改营养评估
+     *
+     * @param bo 营养评估
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(NutritionEvaluationBo bo) {
+        NutritionEvaluation update = MapstructUtils.convert(bo, NutritionEvaluation.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(NutritionEvaluation 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-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/NutritionScreeningServiceImpl.java

@@ -1,5 +1,14 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import org.dromara.common.core.constant.BizConst;
+import org.dromara.common.core.enums.PaymentStatus;
+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;
@@ -9,6 +18,14 @@ 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.SysScreeningAssessmentConfig;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysScreeningAssessmentConfigBo;
+import org.dromara.system.domain.bo.SysScreeningAssessmentQuestionBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.mapper.SysScreeningAssessmentConfigMapper;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.ISysDictDataService;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.NutritionScreeningBo;
 import org.dromara.system.domain.vo.NutritionScreeningVo;
@@ -16,9 +33,13 @@ import org.dromara.system.domain.NutritionScreening;
 import org.dromara.system.mapper.NutritionScreeningMapper;
 import org.dromara.system.service.INutritionScreeningService;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 营养筛查Service业务层处理
@@ -32,6 +53,9 @@ import java.util.Collection;
 public class NutritionScreeningServiceImpl implements INutritionScreeningService {
 
     private final NutritionScreeningMapper baseMapper;
+    private final SysScreeningAssessmentConfigMapper configMapper;
+    private final ISysDictDataService dataService;
+    private final SysUserMapper userMapper;
 
     /**
      * 查询营养筛查
@@ -40,7 +64,7 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
      * @return 营养筛查
      */
     @Override
-    public NutritionScreeningVo queryById(Long id){
+    public NutritionScreeningVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -55,6 +79,35 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
     public TableDataInfo<NutritionScreeningVo> queryPageList(NutritionScreeningBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<NutritionScreening> lqw = buildQueryWrapper(bo);
         Page<NutritionScreeningVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        if (CollUtil.isNotEmpty(result.getRecords())) {
+            Set<Long> userList = CollUtil.newHashSet();
+            Set<Long> configList = CollUtil.newHashSet();
+            result.getRecords().forEach(v -> {
+                userList.add(v.getCreateBy());
+                configList.add(v.getConfigId());
+            });
+
+            Map<Long, String> userMap = userMapper.selectList(Wrappers.lambdaQuery(SysUser.class)
+                .select(SysUser::getUserId, SysUser::getNickName)
+                .in(SysUser::getUserId, userList)).stream().collect(Collectors.toMap(k1 -> k1.getUserId(), k2 -> k2.getNickName(), (k1, k2) -> k1));
+
+            Map<Long, String> configMap = configMapper.selectList(Wrappers.lambdaQuery(SysScreeningAssessmentConfig.class)
+                    .select(SysScreeningAssessmentConfig::getConfigId, SysScreeningAssessmentConfig::getName)
+                    .in(SysScreeningAssessmentConfig::getConfigId, configList))
+                .stream().collect(Collectors.toMap(k1 -> k1.getConfigId(), k2 -> k2.getName(), (k1, k2) -> k1));
+            Map<String, List<SysDictDataVo>> dictMap = dataService.selectGroupByType(List.of(BizConst.PAYMENT_STATUS, BizConst.TREATMENT_USER_TYPE)).getData();
+
+            Map<String, String> paymentMap = dictMap.get(BizConst.PAYMENT_STATUS).stream().collect(Collectors.toMap(k1 -> k1.getDictValue(), k2 -> k2.getDictLabel(), (k1, k2) -> k1));
+            Map<String, String> checkMap = dictMap.get(BizConst.TREATMENT_USER_TYPE).stream().collect(Collectors.toMap(k1 -> k1.getDictValue(), k2 -> k2.getDictLabel(), (k1, k2) -> k1));
+            result.getRecords().forEach(v -> {
+                v.setVisitType(checkMap.get(v.getVisitType()));
+                v.setPaymentStatus(paymentMap.get(v.getPaymentStatus()));
+                v.setConfigName(configMap.get(v.getConfigId()));
+                v.setCreateByName(userMap.get(v.getCreateBy()));
+            });
+        }
+
         return TableDataInfo.build(result);
     }
 
@@ -73,6 +126,9 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
     private LambdaQueryWrapper<NutritionScreening> buildQueryWrapper(NutritionScreeningBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<NutritionScreening> lqw = Wrappers.lambdaQuery();
+        lqw.select(NutritionScreening::getId, NutritionScreening::getConfigId, NutritionScreening::getScreeningTime,
+            NutritionScreening::getVisitType, NutritionScreening::getPatientNo, NutritionScreening::getScreeningScore,
+            NutritionScreening::getScreeningConclusion, NutritionScreening::getPaymentStatus, NutritionScreening::getCreateBy);
         lqw.orderByDesc(NutritionScreening::getId);
         lqw.eq(bo.getPatientId() != null, NutritionScreening::getPatientId, bo.getPatientId());
         lqw.eq(bo.getConfigId() != null, NutritionScreening::getConfigId, bo.getConfigId());
@@ -96,7 +152,42 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
      */
     @Override
     public Boolean insertByBo(NutritionScreeningBo bo) {
+        if (StrUtil.isBlank(bo.getContent())) {
+            throw new ServiceException("提交的“营养筛查”不能为空！");
+        }
+        SysScreeningAssessmentConfigBo configBo = JSON.parseObject(bo.getContent(), new TypeReference<SysScreeningAssessmentConfigBo>() {
+        });
+        if (CollUtil.isEmpty(configBo.getOtherInfo())) {
+            throw new ServiceException("没有任何“营养筛查”！");
+        }
+
+        BigDecimal total = BigDecimal.ZERO;
+        for (SysScreeningAssessmentQuestionBo questionBo : configBo.getOtherInfo()) {
+            if (ObjUtil.isNull(questionBo.getValue())) {
+                continue;
+            }
+
+            List<Integer> valueList = CollUtil.newArrayList();
+            String obj = String.valueOf(questionBo.getValue());
+            if (NumberUtil.isNumber(obj)) {
+                valueList.add(Integer.valueOf(obj));
+            } else {
+                List objList = (List) questionBo.getValue();
+                objList.forEach(v -> valueList.add(Integer.valueOf(String.valueOf(v))));
+            }
+
+            for (Integer index : valueList) {
+                SysScreeningAssessmentQuestionBo.QuestionAttrBo attrBo = questionBo.getContentList().get(index);
+                if (StrUtil.isNotBlank(attrBo.getScore()) && NumberUtil.isNumber(attrBo.getScore())) {
+                    total = total.add(new BigDecimal(attrBo.getScore()));
+                }
+            }
+        }
+
         NutritionScreening add = MapstructUtils.convert(bo, NutritionScreening.class);
+        add.setScreeningScore(NumberUtil.round(total.toString(), 2));
+        add.setScreeningTime(new Date());
+        add.setPaymentStatus(PaymentStatus.PAID.getCode());
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -121,7 +212,7 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(NutritionScreening entity){
+    private void validEntityBeforeSave(NutritionScreening entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -134,7 +225,7 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/NutritionEvaluationMapper.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.system.mapper.NutritionEvaluationMapper">
+
+</mapper>

script/docker/nginx/conf/nginx.conf

@@ -115,6 +115,15 @@ http {
             proxy_pass http://snailjob-server/snail-job/;
         }
 
+;         location /dev-api/
+;         {
+;             proxy_pass     http://127.0.0.1:8080/;
+;             proxy_redirect off;
+;             proxy_set_header Host $host;
+;             proxy_set_header X-Real-IP $remote_addr;
+;             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+;         }
+
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
             root   html;

script/sql/biz/create.sql

@@ -243,6 +243,7 @@ CREATE TABLE `nutrition_screening` (
     `screening_score` decimal(5,2) DEFAULT NULL COMMENT '营养筛查分数',
     `screening_conclusion` varchar(500) DEFAULT NULL COMMENT '营养筛查结论',
     `payment_status` varchar(20) DEFAULT '未支付' COMMENT '支付状态(未支付/已支付/已退款)',
+    `content` longtext comment '内容',
 
     -- 系统字段
     status CHAR(1) DEFAULT '0' COMMENT '状态（0正常 1停用）',
@@ -254,3 +255,25 @@ CREATE TABLE `nutrition_screening` (
     update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='营养筛查表';
 
+
+-- 营养评估表
+CREATE TABLE `nutrition_evaluation` (
+    `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+    `tenant_id`  varchar(20) default '000000' null comment '租户编号',
+    `patient_id` bigint(20) DEFAULT NULL COMMENT '患者ID',
+    `config_id` bigint NOT NULL COMMENT '营养评估类型',
+    `screening_time` datetime NOT NULL COMMENT '筛查时间',
+    `visit_type` char(1) NOT NULL COMMENT '看诊类型（0门诊 1住院）',
+    `patient_no` varchar(50) NOT NULL COMMENT '门诊/住院号',
+    `payment_status` varchar(20) DEFAULT '未支付' COMMENT '支付状态(未支付/已支付/已退款)',
+    `content` longtext  null comment '内容',
+
+    -- 系统字段
+    status CHAR(1) DEFAULT '0' COMMENT '状态（0正常 1停用）',
+    del_flag char default '0' null comment '删除标志（0代表存在 1代表删除）',
+    create_dept  bigint null comment '创建部门',
+    create_by VARCHAR(64) DEFAULT '' COMMENT '创建者',
+    create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    update_by VARCHAR(64) DEFAULT '' COMMENT '更新者',
+    update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='营养评估表';