Merge branch 'hrx'

ruoyi-admin/src/main/java/org/dromara/web/controller/PatientAccountController.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.PatientAccountBo;
+import org.dromara.web.domain.vo.PatientAccountVo;
+import org.dromara.web.service.IPatientAccountService;
+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-08-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/settlement/accountSettleAccounts")
+public class PatientAccountController extends BaseController {
+
+    private final IPatientAccountService patientAccountService;
+
+    /**
+     * 查询患者账户信息列表
+     */
+    @SaCheckPermission("settlement:accountSettleAccounts:list")
+    @GetMapping("/list")
+    public TableDataInfo<PatientAccountVo> list(PatientAccountBo bo, PageQuery pageQuery) {
+        return patientAccountService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出患者账户信息列表
+     */
+    @SaCheckPermission("settlement:accountSettleAccounts:export")
+    @Log(title = "患者账户信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PatientAccountBo bo, HttpServletResponse response) {
+        List<PatientAccountVo> list = patientAccountService.queryList(bo);
+        ExcelUtil.exportExcel(list, "患者账户信息", PatientAccountVo.class, response);
+    }
+
+    /**
+     * 获取患者账户信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("settlement:accountSettleAccounts:query")
+    @GetMapping("/{id}")
+    public R<PatientAccountVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(patientAccountService.queryById(id));
+    }
+
+    /**
+     * 新增患者账户信息
+     */
+    @SaCheckPermission("settlement:accountSettleAccounts:add")
+    @Log(title = "患者账户信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PatientAccountBo bo) {
+        return toAjax(patientAccountService.insertByBo(bo));
+    }
+
+    /**
+     * 修改患者账户信息
+     */
+    @SaCheckPermission("settlement:accountSettleAccounts:edit")
+    @Log(title = "患者账户信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PatientAccountBo bo) {
+        return toAjax(patientAccountService.updateByBo(bo));
+    }
+
+    /**
+     * 删除患者账户信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("settlement:accountSettleAccounts:remove")
+    @Log(title = "患者账户信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(patientAccountService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -96,6 +96,14 @@ public class SettlementController extends BaseController {
         return toAjax(settlementService.insertByBo(bo));
     }
 
+    @SaCheckPermission("system:settlement:add")
+    @Log(title = "结算管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/addChargeRecord")
+    public R<Void> addChargeRecord(@Validated(AddGroup.class) @RequestBody SettlementBo bo) {
+        return toAjax(settlementService.insertByBo(bo));
+    }
+
     /**
      * 修改结算管理
      */

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

@@ -0,0 +1,72 @@
+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;
+
+/**
+ * 收费操作记录对象 charge_record_log
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("charge_record_log")
+public class ChargeRecordLog extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 收费记录id
+     */
+    private Long chargeRecordId;
+
+    /**
+     * 交易处方id
+     */
+    private Long settlementId;
+
+    /**
+     * 身份证号
+     */
+    private String productName;
+
+    /**
+     * 操作
+     */
+    private String paymentMethod;
+
+    /**
+     * 交易金额
+     */
+    private Long receivableAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,156 @@
+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;
+
+/**
+ * 患者账户信息对象 patient_account
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("patient_account")
+public class PatientAccount extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者病例ID
+     */
+    private Long patientCaseId;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 性别：1-男，2-女
+     */
+    private Long sex;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 账户
+     */
+    private String serialNo;
+
+    /**
+     * 账户余额
+     */
+    private Long totalAmount;
+
+    /**
+     * 账户充值
+     */
+    private Long totalIncome;
+
+    /**
+     * 账户消费
+     */
+    private Long totalExpand;
+
+    /**
+     * 待缴金额
+     */
+    private Long unpaidAmount;
+
+    /**
+     * 可用金额
+     */
+    private Long availableAmount;
+
+    /**
+     * 授信金额
+     */
+    private Long creditAmount;
+
+    /**
+     * 可用授信额度
+     */
+    private Long creditLimit;
+
+    /**
+     * 状态：0-正常，1-禁用
+     */
+    private Long status;
+
+    /**
+     * 激活状态：0-未激活，1-已激活
+     */
+    private Long activated;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+
+    /**
+     * 待处理事项
+     */
+    private String waitingTask;
+
+    /**
+     * 患者科室
+     */
+    private Long doorId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String patientNo;
+
+    /**
+     * 病区
+     */
+    private Long wardId;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    private String deptName;
+
+    /**
+     * 诊疗卡号
+     */
+    private String treatNum;
+
+    private String visitType;
+
+
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.web.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.web.domain.ChargeRecordLog;
+
+/**
+ * 收费操作记录业务对象 charge_record_log
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChargeRecordLog.class, reverseConvertGenerate = false)
+public class ChargeRecordLogBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 收费记录id
+     */
+    private Long chargeRecordId;
+
+    /**
+     * 交易处方id
+     */
+    private Long settlementId;
+
+    /**
+     * 身份证号
+     */
+    private String productName;
+
+    /**
+     * 操作
+     */
+    private String paymentMethod;
+
+    /**
+     * 交易金额
+     */
+    private Long receivableAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+
+}

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

@@ -0,0 +1,148 @@
+package org.dromara.web.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.web.domain.PatientAccount;
+
+/**
+ * 患者账户信息业务对象 patient_account
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PatientAccount.class, reverseConvertGenerate = false)
+public class PatientAccountBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者病例ID
+     */
+    private Long patientCaseId;
+
+    /**
+     * 患者科室
+     */
+    private Long doorId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String patientNo;
+
+    /**
+     * 病区
+     */
+    private Long wardId;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    private String deptName;
+
+    /**
+     * 诊疗卡号
+     */
+    private String treatNum;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 性别：1-男，2-女
+     */
+    private Long sex;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 账户
+     */
+    private String serialNo;
+
+    /**
+     * 账户余额
+     */
+    private Long totalAmount;
+
+    /**
+     * 账户充值
+     */
+    private Long totalIncome;
+
+    /**
+     * 账户消费
+     */
+    private Long totalExpand;
+
+    /**
+     * 待缴金额
+     */
+    private Long unpaidAmount;
+
+    /**
+     * 可用金额
+     */
+    private Long availableAmount;
+
+    /**
+     * 授信金额
+     */
+    private Long creditAmount;
+
+    /**
+     * 可用授信额度
+     */
+    private Long creditLimit;
+
+    /**
+     * 状态：0-正常，1-禁用
+     */
+    private Long status;
+
+    /**
+     * 激活状态：0-未激活，1-已激活
+     */
+    private Long activated;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 待处理事项
+     */
+    private String waitingTask;
+
+    private String visitType;
+
+
+}

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

@@ -0,0 +1,80 @@
+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.ChargeRecordLog;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 收费操作记录视图对象 charge_record_log
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChargeRecordLog.class)
+public class ChargeRecordLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 收费记录id
+     */
+    @ExcelProperty(value = "收费记录id")
+    private Long chargeRecordId;
+
+    /**
+     * 交易处方id
+     */
+    @ExcelProperty(value = "交易处方id")
+    private Long settlementId;
+
+
+    private String productName;
+
+    /**
+     * 操作
+     */
+    @ExcelProperty(value = "操作")
+    private String paymentMethod;
+
+    /**
+     * 交易金额
+     */
+    @ExcelProperty(value = "交易金额")
+    private Long receivableAmount;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 交易状态
+     */
+    @ExcelProperty(value = "交易状态")
+    private String status;
+
+    private Date createTime;
+
+    private Long createBy;
+
+    private String createByName;
+
+
+}

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

@@ -1,5 +1,6 @@
 package org.dromara.web.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -13,7 +14,7 @@ import org.dromara.web.domain.ChargeRecord;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -171,5 +172,19 @@ public class ChargeRecordVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String createTime;
+
+    /*营养配置费用*/
+    private BigDecimal prescriptionFee;
+
+    /*肠内营养*/
+    private List<EnteralNutritionVo> enteralNutritionList;
+    /*营养筛查数据*/
+    private List<NutritionScreeningVo> nutritionScreeningList;
+    /*营养评估数据*/
+    private List<NutritionEvaluationVo> nutritionEvaluationList;
+
+    private List<ChargeRecordLogVo> recordLogList;
+
 
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.web.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -52,6 +53,8 @@ public class EnteralNutritionVo implements Serializable {
     @ExcelProperty(value = "组号")
     private String groupNo;
 
+    private Long nutritionProductId;
+
     /**
      * 营养产品
      */
@@ -180,4 +183,6 @@ public class EnteralNutritionVo implements Serializable {
 
     private String createByName;
 
+    private BigDecimal salePrice;
+
 }

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

@@ -0,0 +1,172 @@
+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.PatientAccount;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 患者账户信息视图对象 patient_account
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PatientAccount.class)
+public class PatientAccountVo 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 String patientName;
+
+    /**
+     * 患者病例ID
+     */
+    @ExcelProperty(value = "患者病例ID")
+    private Long patientCaseId;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 性别：1-男，2-女
+     */
+    @ExcelProperty(value = "性别：1-男，2-女")
+    private Long sex;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String phone;
+
+    /**
+     * 账户
+     */
+    @ExcelProperty(value = "账户")
+    private String serialNo;
+
+    /**
+     * 账户余额
+     */
+    @ExcelProperty(value = "账户余额")
+    private Long totalAmount;
+
+    /**
+     * 账户充值
+     */
+    @ExcelProperty(value = "账户充值")
+    private Long totalIncome;
+
+    /**
+     * 账户消费
+     */
+    @ExcelProperty(value = "账户消费")
+    private Long totalExpand;
+
+    /**
+     * 待缴金额
+     */
+    @ExcelProperty(value = "待缴金额")
+    private Long unpaidAmount;
+
+    /**
+     * 可用金额
+     */
+    @ExcelProperty(value = "可用金额")
+    private Long availableAmount;
+
+    /**
+     * 授信金额
+     */
+    @ExcelProperty(value = "授信金额")
+    private Long creditAmount;
+
+    /**
+     * 可用授信额度
+     */
+    @ExcelProperty(value = "可用授信额度")
+    private Long creditLimit;
+
+    /**
+     * 状态：0-正常，1-禁用
+     */
+    @ExcelProperty(value = "状态：0-正常，1-禁用")
+    private Long status;
+
+    /**
+     * 激活状态：0-未激活，1-已激活
+     */
+    @ExcelProperty(value = "激活状态：0-未激活，1-已激活")
+    private Long activated;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 待处理事项
+     */
+    @ExcelProperty(value = "待处理事项")
+    private String waitingTask;
+
+    /**
+     * 患者科室
+     */
+    private Long doorId;
+
+    /**
+     * 门诊/住院号
+     */
+    private String patientNo;
+
+    /**
+     * 病区
+     */
+    private Long wardId;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    private String deptName;
+
+    /**
+     * 诊疗卡号
+     */
+    private String treatNum;
+
+    private String visitType;
+
+
+}

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

@@ -1,5 +1,6 @@
 package org.dromara.web.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -144,6 +145,10 @@ public class SettlementVo implements Serializable {
     private String updateByUser;
 
     private String remark;
+
+    /*营养配置费用*/
+    private BigDecimal prescriptionFee;
+
     /*肠内营养*/
     private List<EnteralNutritionVo> enteralNutritionList;
     /*营养筛查数据*/

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

@@ -0,0 +1,18 @@
+package org.dromara.web.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.ChargeRecordLog;
+import org.dromara.web.domain.vo.ChargeRecordLogVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 收费操作记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Repository
+public interface ChargeRecordLogMapper extends BaseMapperPlus<ChargeRecordLog, ChargeRecordLogVo> {
+
+}

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

@@ -0,0 +1,18 @@
+package org.dromara.web.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.PatientAccount;
+import org.dromara.web.domain.vo.PatientAccountVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 患者账户信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Repository
+public interface PatientAccountMapper extends BaseMapperPlus<PatientAccount, PatientAccountVo> {
+
+}

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

@@ -3,6 +3,7 @@ package org.dromara.web.mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.web.domain.Settlement;
 import org.dromara.web.domain.vo.SettlementVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 结算管理Mapper接口
@@ -10,6 +11,7 @@ import org.dromara.web.domain.vo.SettlementVo;
  * @author Lion Li
  * @date 2025-07-22
  */
+@Repository
 public interface SettlementMapper extends BaseMapperPlus<Settlement, SettlementVo> {
 
 }

ruoyi-admin/src/main/java/org/dromara/web/service/IPatientAccountService.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.PatientAccountBo;
+import org.dromara.web.domain.vo.PatientAccountVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 患者账户信息Service接口
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+public interface IPatientAccountService {
+
+    /**
+     * 查询患者账户信息
+     *
+     * @param id 主键
+     * @return 患者账户信息
+     */
+    PatientAccountVo queryById(Long id);
+
+    /**
+     * 分页查询患者账户信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 患者账户信息分页列表
+     */
+    TableDataInfo<PatientAccountVo> queryPageList(PatientAccountBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的患者账户信息列表
+     *
+     * @param bo 查询条件
+     * @return 患者账户信息列表
+     */
+    List<PatientAccountVo> queryList(PatientAccountBo bo);
+
+    /**
+     * 新增患者账户信息
+     *
+     * @param bo 患者账户信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PatientAccountBo bo);
+
+    /**
+     * 修改患者账户信息
+     *
+     * @param bo 患者账户信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PatientAccountBo bo);
+
+    /**
+     * 校验并批量删除患者账户信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,25 +1,37 @@
 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 cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 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.web.domain.ChargeRecord;
+import org.dromara.common.core.enums.biz.ActionStatus;
+import org.dromara.common.core.enums.biz.FeeType;
+import org.dromara.common.core.enums.biz.PaymentStatus;
+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.SysDept;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.web.domain.*;
 import org.dromara.web.domain.bo.ChargeRecordBo;
-import org.dromara.web.domain.vo.ChargeRecordVo;
-import org.dromara.web.mapper.ChargeRecordMapper;
+import org.dromara.web.domain.vo.*;
+import org.dromara.web.mapper.*;
 import org.dromara.web.service.IChargeRecordService;
 import org.springframework.stereotype.Service;
 
-
+import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 收费记录Service业务层处理
@@ -34,6 +46,22 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
 
     private final ChargeRecordMapper baseMapper;
 
+    private final SysDeptMapper deptMapper;
+
+    private final SysUserMapper userMapper;
+
+    private final SettlementMapper settlementMapper;
+
+    private final ChargeRecordLogMapper logMapper;
+
+    private final EnteralNutritionMapper enteralNutritionMapper;
+
+    private final NutritionEvaluationMapper evaluationMapper;
+
+    private final NutritionScreeningMapper screeningMapper;
+
+    private final ProductNutritionMapper productNutritionMapper;
+
     /**
      * 查询收费记录
      *
@@ -41,8 +69,58 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
      * @return 收费记录
      */
     @Override
-    public ChargeRecordVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+    public ChargeRecordVo queryById(Long id) {
+        ChargeRecordVo chargeRecordVo = baseMapper.selectVoById(id);
+        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));
+        if (null != chargeRecordVo) {
+            SettlementVo settlementVo = settlementMapper.selectVoById(chargeRecordVo.getSettlementId());
+            if (null != settlementVo) {
+                String chargeType = settlementVo.getChargeType();
+                List<EnteralNutritionVo> enteralNutritionVoList = enteralNutritionMapper.selectVoList(new LambdaQueryWrapper<EnteralNutrition>().eq(EnteralNutrition::getSettlementId, settlementVo.getId()));
+
+                if (CollUtil.isNotEmpty(enteralNutritionVoList)) {
+                    // 提获取所有需要的产品营养信息
+                    Set<Long> productIds = enteralNutritionVoList.stream().map(EnteralNutritionVo::getNutritionProductId).collect(Collectors.toSet());
+                    Map<Long, ProductNutrition> productNutritionMap = productNutritionMapper.selectBatchIds(productIds).stream().collect(Collectors.toMap(ProductNutrition::getId, Function.identity()));
+
+                    // 处理价格设置
+                    for (EnteralNutritionVo nutritionVo : enteralNutritionVoList) {
+                        nutritionVo.setCreateByName(userMap.get(nutritionVo.getCreateBy()));
+                        ProductNutrition productNutrition = productNutritionMap.get(nutritionVo.getNutritionProductId());
+
+                        if (productNutrition != null) {
+                            BigDecimal price = FeeType.PRE_PACKAGED_PRESCRIPTION.getCode().equals(chargeType) ? new BigDecimal(productNutrition.getPackagePrice()) : new BigDecimal(productNutrition.getConfigSalePrice());
+                            nutritionVo.setSalePrice(price);
+                        }
+                    }
+
+                    // 处理处方费用计算
+                    if (FeeType.CONFIGURE_PRESCRIPTION.getCode().equals(chargeType) || FeeType.LONG_TERM_PRESCRIPTION.getCode().equals(chargeType)) {
+                        int lastGroupNo = Integer.valueOf(enteralNutritionVoList.get(enteralNutritionVoList.size() - 1).getGroupNo());
+                        chargeRecordVo.setPrescriptionFee(new BigDecimal(lastGroupNo + 1));
+                    }
+                }
+
+                chargeRecordVo.setEnteralNutritionList(enteralNutritionVoList);
+                List<NutritionScreeningVo> nutritionScreeningVos = screeningMapper.selectVoList(new LambdaQueryWrapper<NutritionScreening>().eq(NutritionScreening::getSettlementId, settlementVo.getId()));
+                nutritionScreeningVos.forEach(v -> {
+                    v.setCreateByName(userMap.get(v.getCreateBy()));
+                });
+                chargeRecordVo.setNutritionScreeningList(nutritionScreeningVos);
+                List<NutritionEvaluationVo> nutritionEvaluationVos = evaluationMapper.selectVoList(new LambdaQueryWrapper<NutritionEvaluation>().eq(NutritionEvaluation::getSettlementId, settlementVo.getId()));
+                nutritionEvaluationVos.forEach(v -> {
+                    v.setCreateByName(userMap.get(v.getCreateBy()));
+                });
+                chargeRecordVo.setNutritionEvaluationList(nutritionEvaluationVos);
+            }
+            List<ChargeRecordLogVo> chargeRecordLogs = logMapper.selectVoList(new LambdaQueryWrapper<ChargeRecordLog>().eq(ChargeRecordLog::getChargeRecordId, chargeRecordVo.getId()));
+            chargeRecordLogs.forEach(v -> {
+                v.setCreateByName(userMap.get(v.getCreateBy()));
+            });
+            chargeRecordVo.setRecordLogList(chargeRecordLogs);
+        }
+        return chargeRecordVo;
     }
 
     /**
@@ -56,6 +134,17 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
     public TableDataInfo<ChargeRecordVo> queryPageList(ChargeRecordBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ChargeRecord> lqw = buildQueryWrapper(bo);
         Page<ChargeRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<ChargeRecordVo> records = result.getRecords();
+        if (CollUtil.isNotEmpty(records)) {
+            Set<Long> deptList = CollUtil.newHashSet();
+            records.forEach(v -> {
+                deptList.add(v.getDoorId());
+            });
+            Map<Long, String> deptMap = deptMapper.selectList(Wrappers.lambdaQuery(SysDept.class).select(SysDept::getDeptId, SysDept::getDeptName).in(SysDept::getDeptId, deptList)).stream().collect(Collectors.toMap(k1 -> k1.getDeptId(), k2 -> k2.getDeptName(), (k1, k2) -> k1));
+            records.forEach(v -> {
+                v.setPatientDepartment(deptMap.get(v.getDoorId()));
+            });
+        }
         return TableDataInfo.build(result);
     }
 
@@ -82,20 +171,13 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
         lqw.eq(bo.getPatientId() != null, ChargeRecord::getPatientId, bo.getPatientId());
         lqw.like(StringUtils.isNotBlank(bo.getPatientName()), ChargeRecord::getPatientName, bo.getPatientName());
         lqw.eq(bo.getDoorId() != null, ChargeRecord::getDoorId, bo.getDoorId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPatientNo()), ChargeRecord::getPatientNo, bo.getPatientNo());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), ChargeRecord::getPhone, bo.getPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), ChargeRecord::getIdCard, bo.getIdCard());
-        lqw.eq(bo.getReceivableAmount() != null, ChargeRecord::getReceivableAmount, bo.getReceivableAmount());
-        lqw.eq(bo.getFundsReceived() != null, ChargeRecord::getFundsReceived, bo.getFundsReceived());
-        lqw.eq(bo.getRefundAmount() != null, ChargeRecord::getRefundAmount, bo.getRefundAmount());
         lqw.eq(StringUtils.isNotBlank(bo.getPaymentStatus()), ChargeRecord::getPaymentStatus, bo.getPaymentStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ChargeRecord::getPaymentMethod, bo.getPaymentMethod());
-        lqw.eq(StringUtils.isNotBlank(bo.getBedNo()), ChargeRecord::getBedNo, bo.getBedNo());
         lqw.eq(bo.getRefundTime() != null, ChargeRecord::getRefundTime, bo.getRefundTime());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ChargeRecord::getStatus, bo.getStatus());
-        lqw.eq(bo.getWardId() != null, ChargeRecord::getWardId, bo.getWardId());
-        lqw.like(StringUtils.isNotBlank(bo.getWardName()), ChargeRecord::getWardName, bo.getWardName());
-        lqw.eq(StringUtils.isNotBlank(bo.getTreatNum()), ChargeRecord::getTreatNum, bo.getTreatNum());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null, ChargeRecord::getOrderTime, params.get("beginTime"), params.get("endTime"));
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null, ChargeRecord::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null, ChargeRecord::getRefundTime, params.get("beginTime"), params.get("endTime"));
         return lqw;
     }
 
@@ -107,11 +189,45 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
      */
     @Override
     public Boolean insertByBo(ChargeRecordBo bo) {
+        bo.setId(null);
+        bo.setPaymentStatus(PaymentStatus.PAID.getCode());
         ChargeRecord add = MapstructUtils.convert(bo, ChargeRecord.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+            SettlementVo settlementVo = settlementMapper.selectVoById(bo.getSettlementId());
+            settlementVo.setPaymentStatus(PaymentStatus.PAID.getCode());
+            settlementMapper.updateById(MapstructUtils.convert(settlementVo, Settlement.class));
+            String productStr = null;
+            if (FeeType.PRE_PACKAGED_PRESCRIPTION.getCode().equals(settlementVo.getChargeType())
+                || FeeType.CONFIGURE_PRESCRIPTION.getCode().equals(settlementVo.getChargeType())
+                || FeeType.LONG_TERM_PRESCRIPTION.getCode().equals(settlementVo.getChargeType())) {
+
+                // 查询肠内营养列表
+                List<EnteralNutritionVo> enteralNutritionVoList = enteralNutritionMapper.selectVoList(
+                    new LambdaQueryWrapper<EnteralNutrition>()
+                        .eq(EnteralNutrition::getSettlementId, settlementVo.getId()));
+
+                if (CollUtil.isNotEmpty(enteralNutritionVoList)) {
+                    // 获取所有产品ID并拼接成字符串
+                    productStr = enteralNutritionVoList.stream()
+                        .map(vo -> String.valueOf(vo.getNutritionProduct()))
+                        .collect(Collectors.joining(","));
+                }
+            } else if (FeeType.NUTRITION_SCREENING.getCode().equals(settlementVo.getChargeType())) {
+                productStr = FeeType.NUTRITION_SCREENING.getRemark();
+            } else if (FeeType.NUTRITION_EVALUATION.getCode().equals(settlementVo.getChargeType())) {
+                productStr = FeeType.NUTRITION_EVALUATION.getRemark();
+            }
+            ChargeRecordLog recordLog = new ChargeRecordLog();
+            recordLog.setChargeRecordId(add.getId());
+            recordLog.setSettlementId(add.getSettlementId());
+            recordLog.setReceivableAmount(add.getReceivableAmount());
+            recordLog.setStatus(ActionStatus.SUCCESS.getCode());
+            recordLog.setPaymentMethod(add.getPaymentMethod());
+            recordLog.setProductName(productStr);
+            logMapper.insert(recordLog);
         }
         return flag;
     }
@@ -132,7 +248,7 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ChargeRecord entity){
+    private void validEntityBeforeSave(ChargeRecord entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -145,7 +261,7 @@ public class ChargeRecordServiceImpl implements IChargeRecordService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;

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

@@ -0,0 +1,140 @@
+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.dromara.web.domain.PatientAccount;
+import org.dromara.web.domain.bo.PatientAccountBo;
+import org.dromara.web.domain.vo.PatientAccountVo;
+import org.dromara.web.mapper.PatientAccountMapper;
+import org.dromara.web.service.IPatientAccountService;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 患者账户信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-07
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class PatientAccountServiceImpl implements IPatientAccountService {
+
+    private final PatientAccountMapper baseMapper;
+
+    /**
+     * 查询患者账户信息
+     *
+     * @param id 主键
+     * @return 患者账户信息
+     */
+    @Override
+    public PatientAccountVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询患者账户信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 患者账户信息分页列表
+     */
+    @Override
+    public TableDataInfo<PatientAccountVo> queryPageList(PatientAccountBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PatientAccount> lqw = buildQueryWrapper(bo);
+        Page<PatientAccountVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的患者账户信息列表
+     *
+     * @param bo 查询条件
+     * @return 患者账户信息列表
+     */
+    @Override
+    public List<PatientAccountVo> queryList(PatientAccountBo bo) {
+        LambdaQueryWrapper<PatientAccount> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PatientAccount> buildQueryWrapper(PatientAccountBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PatientAccount> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(PatientAccount::getId);
+        lqw.eq(bo.getPatientId() != null, PatientAccount::getPatientId, bo.getPatientId());
+        lqw.like(StringUtils.isNotBlank(bo.getPatientName()), PatientAccount::getPatientName, bo.getPatientName());
+        lqw.eq(bo.getPatientCaseId() != null, PatientAccount::getPatientCaseId, bo.getPatientCaseId());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), PatientAccount::getIdCard, bo.getIdCard());
+        lqw.eq(bo.getSex() != null, PatientAccount::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), PatientAccount::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getSerialNo()), PatientAccount::getSerialNo, bo.getSerialNo());
+
+        return lqw;
+    }
+
+    /**
+     * 新增患者账户信息
+     *
+     * @param bo 患者账户信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PatientAccountBo bo) {
+        PatientAccount add = MapstructUtils.convert(bo, PatientAccount.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改患者账户信息
+     *
+     * @param bo 患者账户信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PatientAccountBo bo) {
+        PatientAccount update = MapstructUtils.convert(bo, PatientAccount.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PatientAccount 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/SettlementServiceImpl.java

@@ -18,23 +18,19 @@ import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysUserMapper;
-import org.dromara.web.domain.EnteralNutrition;
-import org.dromara.web.domain.NutritionEvaluation;
-import org.dromara.web.domain.NutritionScreening;
-import org.dromara.web.domain.Settlement;
+import org.dromara.web.domain.*;
 import org.dromara.web.domain.bo.SettlementBo;
 import org.dromara.web.domain.vo.EnteralNutritionVo;
 import org.dromara.web.domain.vo.NutritionEvaluationVo;
 import org.dromara.web.domain.vo.NutritionScreeningVo;
 import org.dromara.web.domain.vo.SettlementVo;
-import org.dromara.web.mapper.EnteralNutritionMapper;
-import org.dromara.web.mapper.NutritionEvaluationMapper;
-import org.dromara.web.mapper.NutritionScreeningMapper;
-import org.dromara.web.mapper.SettlementMapper;
+import org.dromara.web.mapper.*;
 import org.dromara.web.service.ISettlementService;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -60,6 +56,8 @@ public class SettlementServiceImpl implements ISettlementService {
 
     private final NutritionScreeningMapper screeningMapper;
 
+    private final ProductNutritionMapper productNutritionMapper;
+
     /**
      * 查询结算管理
      *
@@ -72,18 +70,49 @@ public class SettlementServiceImpl implements ISettlementService {
         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));
         if (null != settlementVo) {
-            List<EnteralNutritionVo> enteralNutritionVoList = enteralNutritionMapper.selectVoList(new LambdaQueryWrapper<EnteralNutrition>().eq(EnteralNutrition::getSettlementId, settlementVo.getId()));
-            enteralNutritionVoList.forEach(v->{
-                v.setCreateByName(userMap.get(v.getCreateBy()));
-            });
+            String chargeType = settlementVo.getChargeType();
+            List<EnteralNutritionVo> enteralNutritionVoList = enteralNutritionMapper.selectVoList(
+                new LambdaQueryWrapper<EnteralNutrition>()
+                    .eq(EnteralNutrition::getSettlementId, settlementVo.getId()));
+
+            if (CollUtil.isNotEmpty(enteralNutritionVoList)){
+                // 提获取所有需要的产品营养信息
+                Set<Long> productIds = enteralNutritionVoList.stream()
+                    .map(EnteralNutritionVo::getNutritionProductId)
+                    .collect(Collectors.toSet());
+                Map<Long, ProductNutrition> productNutritionMap = productNutritionMapper.selectBatchIds(productIds)
+                    .stream()
+                    .collect(Collectors.toMap(ProductNutrition::getId, Function.identity()));
+
+                // 处理价格设置
+                for (EnteralNutritionVo nutritionVo : enteralNutritionVoList) {
+                    nutritionVo.setCreateByName(userMap.get(nutritionVo.getCreateBy()));
+                    ProductNutrition productNutrition = productNutritionMap.get(nutritionVo.getNutritionProductId());
+
+                    if (productNutrition != null) {
+                        BigDecimal price = FeeType.PRE_PACKAGED_PRESCRIPTION.getCode().equals(chargeType)
+                            ? new BigDecimal(productNutrition.getPackagePrice())
+                            : new BigDecimal(productNutrition.getConfigSalePrice());
+                        nutritionVo.setSalePrice(price);
+                    }
+                }
+
+                // 处理处方费用计算
+                if (FeeType.CONFIGURE_PRESCRIPTION.getCode().equals(chargeType)
+                    || FeeType.LONG_TERM_PRESCRIPTION.getCode().equals(chargeType)) {
+                    int lastGroupNo = Integer.valueOf(enteralNutritionVoList.get(enteralNutritionVoList.size() - 1).getGroupNo());
+                    settlementVo.setPrescriptionFee(new BigDecimal(lastGroupNo + 1));
+                }
+            }
+
             settlementVo.setEnteralNutritionList(enteralNutritionVoList);
             List<NutritionScreeningVo> nutritionScreeningVos = screeningMapper.selectVoList(new LambdaQueryWrapper<NutritionScreening>().eq(NutritionScreening::getSettlementId, settlementVo.getId()));
-            nutritionScreeningVos.forEach(v->{
+            nutritionScreeningVos.forEach(v -> {
                 v.setCreateByName(userMap.get(v.getCreateBy()));
             });
             settlementVo.setNutritionScreeningList(nutritionScreeningVos);
             List<NutritionEvaluationVo> nutritionEvaluationVos = evaluationMapper.selectVoList(new LambdaQueryWrapper<NutritionEvaluation>().eq(NutritionEvaluation::getSettlementId, settlementVo.getId()));
-            nutritionEvaluationVos.forEach(v->{
+            nutritionEvaluationVos.forEach(v -> {
                 v.setCreateByName(userMap.get(v.getCreateBy()));
             });
             settlementVo.setNutritionEvaluationList(nutritionEvaluationVos);
@@ -142,10 +171,12 @@ public class SettlementServiceImpl implements ISettlementService {
         lqw.like(StringUtils.isNotBlank(bo.getPatientName()), Settlement::getPatientName, bo.getPatientName());
         lqw.eq(StringUtils.isNotBlank(bo.getPatientNo()), Settlement::getPatientNo, bo.getPatientNo());
         lqw.eq(bo.getReceivableAmount() != null, Settlement::getReceivableAmount, bo.getReceivableAmount());
-        lqw.eq(StringUtils.isNotBlank(bo.getPaymentStatus()), Settlement::getPaymentStatus, bo.getPaymentStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), Settlement::getPaymentMethod, bo.getPaymentMethod());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Settlement::getStatus, bo.getStatus());
+        lqw.eq(Settlement::getPaymentStatus, PaymentStatus.UNPAID.getCode());//待收费列表只查询未支付订单
         lqw.eq(Settlement::getCheckStatus, CheckStatus.STATUS_TWO.getCode());//结算管理查询已经审核通过的处方
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+            Settlement::getOrderTime, params.get("beginTime"), params.get("endTime"));
         return lqw;
     }
 
@@ -163,7 +194,7 @@ public class SettlementServiceImpl implements ISettlementService {
         if (flag) {
             bo.setId(add.getId());
         }
-        return flag;
+        return true;
     }
 
     /**

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

@@ -18,9 +18,11 @@ 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.web.domain.PatientAccount;
 import org.dromara.web.domain.TreatmentUser;
 import org.dromara.web.domain.bo.TreatmentUserBo;
 import org.dromara.web.domain.vo.TreatmentUserVo;
+import org.dromara.web.mapper.PatientAccountMapper;
 import org.dromara.web.mapper.TreatmentUserMapper;
 import org.dromara.web.service.ITreatmentUserService;
 import org.springframework.stereotype.Service;
@@ -49,6 +51,8 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
 
     private final SysWardMapper wardMapper;
 
+    private final PatientAccountMapper accountMapper;
+
     /**
      * 查询【请填写功能名称】
      *
@@ -144,7 +148,7 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
         }
         SysWardVo wardVo = wardMapper.selectVoById(bo.getWardId());
         if (null != wardVo) {
-        add.setWardName(wardVo.getWardName());
+            add.setWardName(wardVo.getWardName());
         }
         add.setBirthday(bo.getBirthday());
         add.setPhoneNum(bo.getPhoneNum());
@@ -152,6 +156,24 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
         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) {
+                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;
     }

ruoyi-admin/src/main/resources/mapper/PatientAccountMapper.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.web.system.mapper.PatientAccountMapper">
+
+</mapper>

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

@@ -0,0 +1,17 @@
+package org.dromara.common.core.enums.biz;
+
+import lombok.Getter;
+
+@Getter
+public enum ActionStatus {
+    SUCCESS("0", "操作成功"),
+    FAILED("1", "操作失败");
+
+    private String code;
+    private String remark;
+
+    private ActionStatus(String code, String remark) {
+        this.code = code;
+        this.remark = remark;
+    }
+}