工作台显示 ---绑定就诊记录显示

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

@@ -0,0 +1,105 @@
+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.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.web.domain.vo.SysPatientVo;
+import org.dromara.web.domain.bo.SysPatientBo;
+import org.dromara.web.service.ISysPatientService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 患者信息
+ *
+ * @author Lion Li
+ * @date 2025-08-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/patients/patient")
+public class SysPatientController extends BaseController {
+
+    private final ISysPatientService sysPatientService;
+
+    /**
+     * 查询患者信息列表
+     */
+    @SaCheckPermission("patients:patient:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysPatientVo> list(SysPatientBo bo, PageQuery pageQuery) {
+        return sysPatientService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出患者信息列表
+     */
+    @SaCheckPermission("patients:patient:export")
+    @Log(title = "患者信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysPatientBo bo, HttpServletResponse response) {
+        List<SysPatientVo> list = sysPatientService.queryList(bo);
+        ExcelUtil.exportExcel(list, "患者信息", SysPatientVo.class, response);
+    }
+
+    /**
+     * 获取患者信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("patients:patient:query")
+    @GetMapping("/{id}")
+    public R<SysPatientVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysPatientService.queryById(id));
+    }
+
+    /**
+     * 新增患者信息
+     */
+    @SaCheckPermission("patients:patient:add")
+    @Log(title = "患者信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysPatientBo bo) {
+        return toAjax(sysPatientService.insertByBo(bo));
+    }
+
+    /**
+     * 修改患者信息
+     */
+    @SaCheckPermission("patients:patient:edit")
+    @Log(title = "患者信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPatientBo bo) {
+        return toAjax(sysPatientService.updateByBo(bo));
+    }
+
+    /**
+     * 删除患者信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("patients:patient:remove")
+    @Log(title = "患者信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysPatientService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -23,7 +23,7 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 【工作台 待诊患者】
+ * 【工作台 就诊记录】
  *
  * @author Lion Li
  * @date 2025-06-24
@@ -37,7 +37,7 @@ public class TreatmentUserController extends BaseController {
     private final ITreatmentUserService treatmentUserService;
 
     /**
-     * 查询【待诊患者】列表
+     * 查询【就诊记录】列表
      */
     @SaCheckPermission("workbench:treatmentUser:list")
     @GetMapping("/list")
@@ -45,19 +45,25 @@ public class TreatmentUserController extends BaseController {
         return treatmentUserService.queryPageList(bo, pageQuery);
     }
 
+    @SaCheckPermission("workbench:treatmentUser:list")
+    @GetMapping("/queryListByTreatNum")
+    public R<List<TreatmentUserVo>> list(@RequestParam String treatNum) {
+        return R.ok(treatmentUserService.queryListByTreatNum(treatNum));
+    }
+
     /**
-     * 导出【待诊患者】列表
+     * 导出【就诊记录】列表
      */
     @SaCheckPermission("workbench:treatmentUser:export")
-    @Log(title = "【待诊患者】", businessType = BusinessType.EXPORT)
+    @Log(title = "【就诊记录】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(TreatmentUserBo bo, HttpServletResponse response) {
         List<TreatmentUserVo> list = treatmentUserService.queryList(bo);
-        ExcelUtil.exportExcel(list, "【待诊患者】", TreatmentUserVo.class, response);
+        ExcelUtil.exportExcel(list, "【就诊记录】", TreatmentUserVo.class, response);
     }
 
     /**
-     * 获取【待诊患者】详细信息
+     * 获取【就诊记录】详细信息
      *
      * @param id 主键
      */
@@ -69,10 +75,10 @@ public class TreatmentUserController extends BaseController {
     }
 
     /**
-     * 新增【待诊患者】
+     * 新增【就诊记录】
      */
     @SaCheckPermission("workbench:treatmentUser:add")
-    @Log(title = "【待诊患者】", businessType = BusinessType.INSERT)
+    @Log(title = "【就诊记录】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody TreatmentUserBo bo) {
@@ -80,10 +86,10 @@ public class TreatmentUserController extends BaseController {
     }
 
     /**
-     * 修改【待诊患者】
+     * 修改【就诊记录】
      */
     @SaCheckPermission("workbench:treatmentUser:edit")
-    @Log(title = "【待诊患者】", businessType = BusinessType.UPDATE)
+    @Log(title = "【就诊记录】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody TreatmentUserBo bo) {
@@ -91,12 +97,12 @@ public class TreatmentUserController extends BaseController {
     }
 
     /**
-     * 删除【待诊患者】
+     * 删除【就诊记录】
      *
      * @param ids 主键串
      */
     @SaCheckPermission("workbench:treatmentUser:remove")
-    @Log(title = "【待诊患者】", businessType = BusinessType.DELETE)
+    @Log(title = "【就诊记录】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

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

@@ -0,0 +1,122 @@
+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.io.Serial;
+
+/**
+ * 患者信息对象 sys_patient
+ *
+ * @author Lion Li
+ * @date 2025-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_patient")
+public class SysPatient extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 诊疗卡号
+     */
+    private String treatNum;
+
+    /**
+     * 科室
+     */
+    private Long doorId;
+
+    /**
+     * 姓名
+     */
+    private String patientName;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 联系电话
+     */
+    private String phoneNum;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 过敏食物
+     */
+    private String allergyFoot;
+
+    /**
+     * 过敏药物
+     */
+    private String allergyDrug;
+
+    /**
+     * 体力活动
+     */
+    private String activity;
+
+    /**
+     * 删除标记
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 诊断状态 0未诊 1 诊中
+     */
+    private String medicalType;
+
+    /**
+     * 患者状态
+     */
+    private String treatmentUserStatus;
+
+    /**
+     * 评估状态
+     */
+    private String evaluationStatus;
+
+    /**
+     * bmi
+     */
+    private Long bmi;
+
+
+}

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

@@ -0,0 +1,115 @@
+package org.dromara.web.domain.bo;
+
+import org.dromara.web.domain.SysPatient;
+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.*;
+
+/**
+ * 患者信息业务对象 sys_patient
+ *
+ * @author Lion Li
+ * @date 2025-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysPatient.class, reverseConvertGenerate = false)
+public class SysPatientBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 诊疗卡号
+     */
+    private String treatNum;
+
+    /**
+     * 科室
+     */
+    private Long doorId;
+
+    /**
+     * 姓名
+     */
+    private String patientName;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 联系电话
+     */
+    private String phoneNum;
+
+    /**
+     * 性别 
+     */
+    private String sex;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 过敏食物
+     */
+    private String allergyFoot;
+
+    /**
+     * 过敏药物
+     */
+    private String allergyDrug;
+
+    /**
+     * 体力活动
+     */
+    private String activity;
+
+    /**
+     * 诊断状态 0未诊 1 诊中
+     */
+    private String medicalType;
+
+    /**
+     * 患者状态
+     */
+    private String treatmentUserStatus;
+
+    /**
+     * 评估状态
+     */
+    private String evaluationStatus;
+
+    /**
+     * bmi
+     */
+    private Long bmi;
+
+
+}

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

@@ -120,6 +120,8 @@ public class TreatmentUserBo extends BaseEntity {
      */
     private Date admissionDate;
 
+    private Date dischargeDate;
+
     /*查询字段*/
 
     private String searchFlag;

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

@@ -0,0 +1,141 @@
+package org.dromara.web.domain.vo;
+
+import org.dromara.web.domain.SysPatient;
+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;
+
+
+
+/**
+ * 患者信息视图对象 sys_patient
+ *
+ * @author Lion Li
+ * @date 2025-08-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysPatient.class)
+public class SysPatientVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 诊疗卡号
+     */
+    @ExcelProperty(value = "诊疗卡号")
+    private String treatNum;
+
+    /**
+     * 科室
+     */
+    @ExcelProperty(value = "科室")
+    private Long doorId;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = "姓名")
+    private String patientName;
+
+    /**
+     * 出生日期
+     */
+    @ExcelProperty(value = "出生日期")
+    private String birthday;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String phoneNum;
+
+    /**
+     * 性别 
+     */
+    @ExcelProperty(value = "性别 ")
+    private String sex;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 年龄
+     */
+    @ExcelProperty(value = "年龄")
+    private String age;
+
+    /**
+     * 身高
+     */
+    @ExcelProperty(value = "身高")
+    private String height;
+
+    /**
+     * 体重
+     */
+    @ExcelProperty(value = "体重")
+    private String weight;
+
+    /**
+     * 过敏食物
+     */
+    @ExcelProperty(value = "过敏食物")
+    private String allergyFoot;
+
+    /**
+     * 过敏药物
+     */
+    @ExcelProperty(value = "过敏药物")
+    private String allergyDrug;
+
+    /**
+     * 体力活动
+     */
+    @ExcelProperty(value = "体力活动", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "physical_activity")
+    private String activity;
+
+    /**
+     * 诊断状态 0未诊 1 诊中
+     */
+    @ExcelProperty(value = "诊断状态 0未诊 1 诊中")
+    private String medicalType;
+
+    /**
+     * 患者状态
+     */
+    @ExcelProperty(value = "患者状态")
+    private String treatmentUserStatus;
+
+    /**
+     * 评估状态
+     */
+    @ExcelProperty(value = "评估状态")
+    private String evaluationStatus;
+
+    /**
+     * bmi
+     */
+    @ExcelProperty(value = "bmi")
+    private Long bmi;
+
+
+}

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

@@ -14,7 +14,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 【请填写功能名称】视图对象 treatment_user
  *
@@ -148,6 +147,12 @@ public class TreatmentUserVo implements Serializable {
     @ExcelProperty(value = "入院时间")
     private Date admissionDate;
 
+    /**
+     * 出院时间
+     */
+    @ExcelProperty(value = "出院时间")
+    private Date dischargeDate;
+
     /**
      * 诊断状态
      */
@@ -163,4 +168,10 @@ public class TreatmentUserVo implements Serializable {
      */
     private String evaluationStatus;
 
+    private Date createTime;
+
+    /*查询本次就诊记录最新一次诊断结果*/
+    private NutritionDiagnosisVo diagnosisVo;
+
+
 }

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

@@ -0,0 +1,17 @@
+package org.dromara.web.mapper;
+
+import org.dromara.web.domain.SysPatient;
+import org.dromara.web.domain.vo.SysPatientVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 患者信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-26
+ */
+@Repository
+public interface SysPatientMapper extends BaseMapperPlus<SysPatient, SysPatientVo> {
+
+}

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

@@ -0,0 +1,68 @@
+package org.dromara.web.service;
+
+import org.dromara.web.domain.vo.SysPatientVo;
+import org.dromara.web.domain.bo.SysPatientBo;
+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-08-26
+ */
+public interface ISysPatientService {
+
+    /**
+     * 查询患者信息
+     *
+     * @param id 主键
+     * @return 患者信息
+     */
+    SysPatientVo queryById(Long id);
+
+    /**
+     * 分页查询患者信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 患者信息分页列表
+     */
+    TableDataInfo<SysPatientVo> queryPageList(SysPatientBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的患者信息列表
+     *
+     * @param bo 查询条件
+     * @return 患者信息列表
+     */
+    List<SysPatientVo> queryList(SysPatientBo bo);
+
+    /**
+     * 新增患者信息
+     *
+     * @param bo 患者信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysPatientBo bo);
+
+    /**
+     * 修改患者信息
+     *
+     * @param bo 患者信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysPatientBo bo);
+
+    /**
+     * 校验并批量删除患者信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -66,4 +66,7 @@ public interface ITreatmentUserService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /*根据患者的诊疗卡号查询患者的就诊记录*/
+    List<TreatmentUserVo> queryListByTreatNum(String treatNum);
 }

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

@@ -259,9 +259,9 @@ public class NutritionSettingServiceImpl implements INutritionSettingService {
         results.put("caloriesKjPerDay", map.get("kJ/d"));
         results.put("caloriesKcalPerKgDay", map.get("kcal/kg*d"));
 
-        results.put("proteinCaloriePercentage", String.format("%.2f", proteinCaloriePercentage));//蛋白质热量占比
-        results.put("proteinGPerKgDay", map.get("kcal/d"));
-        results.put("proteinGPerDay", map.get("kJ/d"));
+        results.put("proteinCaloriePercentage", String.format("%.2f", 0.00));//蛋白质热量占比
+        results.put("proteinGPerKgDay", "0.00");
+        results.put("proteinGPerDay", "0.00");
 
         results.put("fatCaloriePercentage", String.format("%.2f", fatCaloriePercentage));//脂肪热量占比
         results.put("fatGPerKgDay", map.get("kJ/d"));

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

@@ -0,0 +1,148 @@
+package org.dromara.web.service.impl;
+
+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.springframework.stereotype.Service;
+import org.dromara.web.domain.bo.SysPatientBo;
+import org.dromara.web.domain.vo.SysPatientVo;
+import org.dromara.web.domain.SysPatient;
+import org.dromara.web.mapper.SysPatientMapper;
+import org.dromara.web.service.ISysPatientService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 患者信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysPatientServiceImpl implements ISysPatientService {
+
+    private final SysPatientMapper baseMapper;
+
+    /**
+     * 查询患者信息
+     *
+     * @param id 主键
+     * @return 患者信息
+     */
+    @Override
+    public SysPatientVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询患者信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 患者信息分页列表
+     */
+    @Override
+    public TableDataInfo<SysPatientVo> queryPageList(SysPatientBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysPatient> lqw = buildQueryWrapper(bo);
+        Page<SysPatientVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的患者信息列表
+     *
+     * @param bo 查询条件
+     * @return 患者信息列表
+     */
+    @Override
+    public List<SysPatientVo> queryList(SysPatientBo bo) {
+        LambdaQueryWrapper<SysPatient> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysPatient> buildQueryWrapper(SysPatientBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysPatient> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(SysPatient::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getTreatNum()), SysPatient::getTreatNum, bo.getTreatNum());
+        lqw.eq(bo.getDoorId() != null, SysPatient::getDoorId, bo.getDoorId());
+        lqw.like(StringUtils.isNotBlank(bo.getPatientName()), SysPatient::getPatientName, bo.getPatientName());
+        lqw.eq(StringUtils.isNotBlank(bo.getBirthday()), SysPatient::getBirthday, bo.getBirthday());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhoneNum()), SysPatient::getPhoneNum, bo.getPhoneNum());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), SysPatient::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), SysPatient::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), SysPatient::getAge, bo.getAge());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), SysPatient::getHeight, bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), SysPatient::getWeight, bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getAllergyFoot()), SysPatient::getAllergyFoot, bo.getAllergyFoot());
+        lqw.eq(StringUtils.isNotBlank(bo.getAllergyDrug()), SysPatient::getAllergyDrug, bo.getAllergyDrug());
+        lqw.eq(StringUtils.isNotBlank(bo.getActivity()), SysPatient::getActivity, bo.getActivity());
+        lqw.eq(StringUtils.isNotBlank(bo.getMedicalType()), SysPatient::getMedicalType, bo.getMedicalType());
+        lqw.eq(StringUtils.isNotBlank(bo.getTreatmentUserStatus()), SysPatient::getTreatmentUserStatus, bo.getTreatmentUserStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getEvaluationStatus()), SysPatient::getEvaluationStatus, bo.getEvaluationStatus());
+        lqw.eq(bo.getBmi() != null, SysPatient::getBmi, bo.getBmi());
+        return lqw;
+    }
+
+    /**
+     * 新增患者信息
+     *
+     * @param bo 患者信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysPatientBo bo) {
+        SysPatient add = MapstructUtils.convert(bo, SysPatient.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改患者信息
+     *
+     * @param bo 患者信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysPatientBo bo) {
+        SysPatient update = MapstructUtils.convert(bo, SysPatient.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysPatient 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/TreatmentUserServiceImpl.java

@@ -1,12 +1,16 @@
 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.domain.R;
+import org.dromara.common.core.enums.biz.PatientType;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
@@ -14,22 +18,29 @@ import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.system.config.RedisUtil;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.domain.vo.SysDiseaseLabelVo;
 import org.dromara.system.domain.vo.SysWardVo;
 import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysWardMapper;
 import org.dromara.system.service.ISysDeptService;
+import org.dromara.system.service.ISysDiseaseLabelService;
+import org.dromara.web.domain.NutritionDiagnosis;
 import org.dromara.web.domain.PatientAccount;
+import org.dromara.web.domain.SysPatient;
 import org.dromara.web.domain.TreatmentUser;
 import org.dromara.web.domain.bo.TreatmentUserBo;
+import org.dromara.web.domain.vo.NutritionDiagnosisVo;
 import org.dromara.web.domain.vo.TreatmentUserVo;
+import org.dromara.web.mapper.NutritionDiagnosisMapper;
 import org.dromara.web.mapper.PatientAccountMapper;
+import org.dromara.web.mapper.SysPatientMapper;
 import org.dromara.web.mapper.TreatmentUserMapper;
 import org.dromara.web.service.ITreatmentUserService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -51,8 +62,14 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
 
     private final SysWardMapper wardMapper;
 
+    private final SysPatientMapper patientMapper;
+
     private final PatientAccountMapper accountMapper;
 
+    private final NutritionDiagnosisMapper diagnosisMapper;
+
+    private final ISysDiseaseLabelService diseaseLabelService;
+
     /**
      * 查询【请填写功能名称】
      *
@@ -137,47 +154,169 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
      */
     @Override
     public Boolean insertByBo(TreatmentUserBo bo) {
-        TreatmentUser add = MapstructUtils.convert(bo, TreatmentUser.class);
-        add.setTreatNum(RedisUtil.generatePatientNumber("M"));
-        if (null != add && StringUtils.isNotBlank(add.getType())) {
-            if ("0".equals(add.getType())) {
-                add.setOutpatientNo(RedisUtil.generatePatientNumber("2"));
-            } else if ("1".equals(add.getType())) {
-                add.setOutpatientNo(RedisUtil.generatePatientNumber("1"));
+        // 1. 创建患者基本信息
+        SysPatient patient = createSysPatient(bo);
+        boolean patientInserted = patientMapper.insert(patient) > 0;
+
+        if (!patientInserted) {
+            return false;
+        }
+
+        try {
+            // 2. 创建治疗用户信息
+            TreatmentUser treatmentUser = createTreatmentUser(bo, patient.getTreatNum());
+            boolean userInserted = baseMapper.insert(treatmentUser) > 0;
+
+            if (!userInserted) {
+                return false;
             }
+
+            // 3. 创建患者账户信息
+            createPatientAccount(treatmentUser);
+            bo.setId(treatmentUser.getId());
+
+            return true;
+        } catch (Exception e) {
+            // 这里应该添加事务回滚逻辑，或者使用Spring的@Transactional
+            log.error("创建患者信息失败", e);
+            return false;
         }
-        SysWardVo wardVo = wardMapper.selectVoById(bo.getWardId());
-        if (null != wardVo) {
-            add.setWardName(wardVo.getWardName());
+
+    }
+
+    private SysPatient createSysPatient(TreatmentUserBo bo) {
+        SysPatient patient = new SysPatient();
+        patient.setTreatNum(RedisUtil.generatePatientNumber("M"));
+        patient.setPatientName(bo.getTreatName());
+        patient.setIdCard(bo.getIdCard());
+        patient.setActivity(bo.getActivity());
+        patient.setBirthday(bo.getBirthday());
+        patient.setAge(bo.getAge());
+        patient.setHeight(bo.getHeight());
+        patient.setWeight(bo.getWeight());
+        patient.setSex(bo.getSex());
+        patient.setPhoneNum(bo.getPhoneNum());
+        patient.setAllergyFoot(bo.getAllergyFoot());
+        patient.setAllergyDrug(bo.getAllergyDrug());
+        return patient;
+    }
+
+    private TreatmentUser createTreatmentUser(TreatmentUserBo bo, String treatNum) {
+        TreatmentUser treatmentUser = MapstructUtils.convert(bo, TreatmentUser.class);
+        treatmentUser.setTreatNum(treatNum);
+
+        // 设置门诊号
+        if (StringUtils.isNotBlank(treatmentUser.getType())) {
+            String prefix = PatientType.OUTPATIENT.getCode().equals(treatmentUser.getType()) ? "2" : "1";
+            treatmentUser.setOutpatientNo(RedisUtil.generatePatientNumber(prefix));
         }
-        add.setBirthday(bo.getBirthday());
-        add.setPhoneNum(bo.getPhoneNum());
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-            PatientAccount account = new PatientAccount();
-            account.setSerialNo(RedisUtil.generatePatientNumber("A"));
-            account.setPatientId(add.getId());
-            account.setPatientName(add.getTreatName());
-            account.setIdCard(add.getIdCard());
-            account.setSex(Long.getLong(add.getSex()));
-            account.setPhone(add.getPhoneNum());
-            account.setDoorId(add.getDoorId());
-            SysDeptVo deptVo = deptMapper.selectVoById(add.getDoorId());
-            if (null != deptVo) {
+
+        // 设置病房信息
+        if (bo.getWardId() != null) {
+            SysWardVo wardVo = wardMapper.selectVoById(bo.getWardId());
+            if (wardVo != null) {
+                treatmentUser.setWardName(wardVo.getWardName());
+            }
+        }
+
+        treatmentUser.setBirthday(bo.getBirthday());
+        treatmentUser.setPhoneNum(bo.getPhoneNum());
+        validEntityBeforeSave(treatmentUser);
+
+        return treatmentUser;
+    }
+
+    private void createPatientAccount(TreatmentUser treatmentUser) {
+        PatientAccount account = new PatientAccount();
+        account.setSerialNo(RedisUtil.generatePatientNumber("A"));
+        account.setPatientId(treatmentUser.getId());
+        account.setPatientName(treatmentUser.getTreatName());
+        account.setIdCard(treatmentUser.getIdCard());
+
+        // 修复类型转换问题
+        if (StringUtils.isNotBlank(treatmentUser.getSex())) {
+            account.setSex(Long.valueOf(treatmentUser.getSex()));
+        }
+
+        account.setPhone(treatmentUser.getPhoneNum());
+        account.setDoorId(treatmentUser.getDoorId());
+
+        // 设置部门信息
+        if (treatmentUser.getDoorId() != null) {
+            SysDeptVo deptVo = deptMapper.selectVoById(treatmentUser.getDoorId());
+            if (deptVo != null) {
                 account.setDeptName(deptVo.getDeptName());
             }
-            account.setVisitType(add.getType());
-            account.setWardId(add.getWardId());
-            account.setWardName(add.getWardName());
-            account.setTreatNum(add.getTreatNum());
-            account.setPatientNo(add.getOutpatientNo());
-            accountMapper.insert(account);
         }
-        return flag;
+
+        account.setVisitType(treatmentUser.getType());
+        account.setWardId(treatmentUser.getWardId());
+        account.setWardName(treatmentUser.getWardName());
+        account.setTreatNum(treatmentUser.getTreatNum());
+        account.setPatientNo(treatmentUser.getOutpatientNo());
+
+        accountMapper.insert(account);
     }
 
+
+ /*       SysPatient patient = new SysPatient();
+        patient.setTreatNum(RedisUtil.generatePatientNumber("M"));
+        patient.setPatientName(bo.getTreatName());
+        patient.setIdCard(bo.getIdCard());
+        patient.setActivity(bo.getActivity());
+        patient.setBirthday(bo.getBirthday());
+        patient.setAge(bo.getAge());
+        patient.setHeight(bo.getHeight());
+        patient.setWeight(bo.getWeight());
+        patient.setSex(bo.getSex());
+        patient.setPhoneNum(bo.getPhoneNum());
+        patient.setAllergyFoot(bo.getAllergyFoot());
+        patient.setAllergyDrug(bo.getAllergyDrug());
+        boolean flag = patientMapper.insert(patient) > 0;
+        if (flag) {
+            TreatmentUser add = MapstructUtils.convert(bo, TreatmentUser.class);
+            add.setTreatNum(patient.getTreatNum());
+            if (null != add && StringUtils.isNotBlank(add.getType())) {
+                if ("0".equals(add.getType())) {
+                    add.setOutpatientNo(RedisUtil.generatePatientNumber("2"));
+                } else if ("1".equals(add.getType())) {
+                    add.setOutpatientNo(RedisUtil.generatePatientNumber("1"));
+                }
+            }
+            SysWardVo wardVo = wardMapper.selectVoById(bo.getWardId());
+            if (null != wardVo) {
+                add.setWardName(wardVo.getWardName());
+            }
+            add.setBirthday(bo.getBirthday());
+            add.setPhoneNum(bo.getPhoneNum());
+            validEntityBeforeSave(add);
+            flag = baseMapper.insert(add) > 0;
+            if (flag) {
+                bo.setId(add.getId());
+                PatientAccount account = new PatientAccount();
+                account.setSerialNo(RedisUtil.generatePatientNumber("A"));
+                account.setPatientId(add.getId());
+                account.setPatientName(add.getTreatName());
+                account.setIdCard(add.getIdCard());
+                account.setSex(Long.getLong(add.getSex()));
+                account.setPhone(add.getPhoneNum());
+                account.setDoorId(add.getDoorId());
+                SysDeptVo deptVo = deptMapper.selectVoById(add.getDoorId());
+                if (null != deptVo) {
+                    account.setDeptName(deptVo.getDeptName());
+                }
+                account.setVisitType(add.getType());
+                account.setWardId(add.getWardId());
+                account.setWardName(add.getWardName());
+                account.setTreatNum(add.getTreatNum());
+                account.setPatientNo(add.getOutpatientNo());
+                accountMapper.insert(account);
+            }
+        }
+
+        return flag;
+    }*/
+
     /**
      * 修改【请填写功能名称】
      *
@@ -204,6 +343,38 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
         //TODO 做一些数据校验,如唯一约束
     }
 
+    @Override
+    public List<TreatmentUserVo> queryListByTreatNum(String treatNum) {
+        List<TreatmentUserVo> userVoList = baseMapper.selectVoList(new LambdaQueryWrapper<TreatmentUser>().eq(TreatmentUser::getTreatNum, treatNum));
+        NutritionDiagnosisVo diagnosis =null;
+        String labelIdsStr = null;
+        List<String> labelNames = null;
+        if (CollUtil.isNotEmpty(userVoList)) {
+            for (TreatmentUserVo vo : userVoList) {
+                 diagnosis = diagnosisMapper.selectVoOne(new LambdaQueryWrapper<NutritionDiagnosis>().eq(NutritionDiagnosis::getTreatmentUserId, vo.getId()).orderByDesc(BaseEntity::getCreateTime).last("LIMIT 1"));
+                if (null != diagnosis) {
+                    labelIdsStr = diagnosis.getDiagnosisLableId();
+                    // 处理产品标签
+                    if (StringUtils.isNotBlank(labelIdsStr)) {
+                        labelNames = Arrays.stream(labelIdsStr.split(",")).map(String::trim).filter(StringUtils::isNotBlank).map(labelid -> {
+                            try {
+                                return diseaseLabelService.queryById(Long.parseLong(labelid));
+                            } catch (NumberFormatException e) {
+                                return null;
+                            }
+                        }).filter(Objects::nonNull).map(SysDiseaseLabelVo::getLabelName).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+
+                        if (!labelNames.isEmpty()) {
+                            diagnosis.setDiagnosisLabelStr(String.join(",", labelNames));
+                        }
+                    }
+                }
+                vo.setDiagnosisVo(diagnosis);
+            }
+        }
+            return userVoList;
+    }
+
     /**
      * 校验并批量删除【请填写功能名称】信息
      *

ruoyi-admin/src/main/resources/mapper/workbench/SysPatientMapper.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.SysPatientMapper">
+
+</mapper>

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

@@ -0,0 +1,18 @@
+package org.dromara.common.core.enums.biz;
+
+public enum PatientType {
+    OUTPATIENT("0", "门诊"),
+    INPATIENT("1", "住院");
+
+    private final String code;
+    private final String desc;
+
+    PatientType(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}