Merge remote-tracking branch 'gitlab/main'

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

@@ -1,9 +1,13 @@
 package org.dromara.web.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.web.domain.bo.HospitalRecordBo;
+import org.dromara.web.domain.vo.HospitalRecordVo;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class IndexController {
 
+
     /**
      * 访问首页，提示语
      */
@@ -25,4 +30,12 @@ public class IndexController {
         return StringUtils.format("欢迎使用{}后台管理框架，请通过前端地址访问。", SpringUtils.getApplicationName());
     }
 
+    /**
+     * 查询首页数据
+     */
+    @GetMapping("/queryData")
+    public R queryData() {
+        return R.ok();
+    }
+
 }

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

@@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.web.domain.bo.TreatmentUserBo;
-import org.dromara.web.domain.vo.TreatmentUserVo;
-import org.dromara.web.service.ITreatmentUserService;
+import org.dromara.web.domain.bo.PatientMedicalRecordBo;
+import org.dromara.web.domain.vo.PatientMedicalRecordVo;
+import org.dromara.web.service.IPatientMedicalRecordService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -32,23 +32,23 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/workbench/treatmentUser")
-public class TreatmentUserController extends BaseController {
+public class PatientMedicalRecordController extends BaseController {
 
-    private final ITreatmentUserService treatmentUserService;
+    private final IPatientMedicalRecordService patientMedicalRecordService;
 
     /**
      * 查询【就诊记录】列表
      */
     @SaCheckPermission("workbench:treatmentUser:list")
     @GetMapping("/list")
-    public TableDataInfo<TreatmentUserVo> list(TreatmentUserBo bo, PageQuery pageQuery) {
-        return treatmentUserService.queryPageList(bo, pageQuery);
+    public TableDataInfo<PatientMedicalRecordVo> list(PatientMedicalRecordBo bo, PageQuery pageQuery) {
+        return patientMedicalRecordService.queryPageList(bo, pageQuery);
     }
 
     @SaCheckPermission("workbench:treatmentUser:list")
     @GetMapping("/queryListByTreatNum")
-    public R<List<TreatmentUserVo>> list(@RequestParam String treatNum) {
-        return R.ok(treatmentUserService.queryListByTreatNum(treatNum));
+    public R<List<PatientMedicalRecordVo>> list(@RequestParam String treatNum) {
+        return R.ok(patientMedicalRecordService.queryListByTreatNum(treatNum));
     }
 
     /**
@@ -57,9 +57,9 @@ public class TreatmentUserController extends BaseController {
     @SaCheckPermission("workbench:treatmentUser: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);
+    public void export(PatientMedicalRecordBo bo, HttpServletResponse response) {
+        List<PatientMedicalRecordVo> list = patientMedicalRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "【就诊记录】", PatientMedicalRecordVo.class, response);
     }
 
     /**
@@ -69,9 +69,9 @@ public class TreatmentUserController extends BaseController {
      */
     @SaCheckPermission("workbench:treatmentUser:query")
     @GetMapping("/{id}")
-    public R<TreatmentUserVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<PatientMedicalRecordVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(treatmentUserService.queryById(id));
+        return R.ok(patientMedicalRecordService.queryById(id));
     }
 
     /**
@@ -81,8 +81,8 @@ public class TreatmentUserController extends BaseController {
     @Log(title = "【就诊记录】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody TreatmentUserBo bo) {
-        return toAjax(treatmentUserService.insertByBo(bo));
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PatientMedicalRecordBo bo) {
+        return toAjax(patientMedicalRecordService.insertByBo(bo));
     }
 
     /**
@@ -92,8 +92,8 @@ public class TreatmentUserController extends BaseController {
     @Log(title = "【就诊记录】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TreatmentUserBo bo) {
-        return toAjax(treatmentUserService.updateByBo(bo));
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PatientMedicalRecordBo bo) {
+        return toAjax(patientMedicalRecordService.updateByBo(bo));
     }
 
     /**
@@ -106,6 +106,6 @@ public class TreatmentUserController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(treatmentUserService.deleteWithValidByIds(List.of(ids), true));
+        return toAjax(patientMedicalRecordService.deleteWithValidByIds(List.of(ids), true));
     }
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/TreatmentUser.java → ruoyi-admin/src/main/java/org/dromara/web/domain/PatientMedicalRecord.java

@@ -1,6 +1,5 @@
 package org.dromara.web.domain;
 
-import cn.idev.excel.annotation.ExcelProperty;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -19,7 +18,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("patient_medical_record")
-public class TreatmentUser extends BaseEntity {
+public class PatientMedicalRecord extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

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

@@ -1,13 +1,12 @@
 package org.dromara.web.domain.bo;
 
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import org.dromara.web.domain.TreatmentUser;
+import org.dromara.web.domain.PatientMedicalRecord;
 
 import java.util.Date;
 
@@ -19,8 +18,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = TreatmentUser.class, reverseConvertGenerate = false)
-public class TreatmentUserBo extends BaseEntity {
+@AutoMapper(target = PatientMedicalRecord.class, reverseConvertGenerate = false)
+public class PatientMedicalRecordBo extends BaseEntity {
 
     /**
      *

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

@@ -12,7 +12,7 @@ import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.web.domain.EnteralNutrition;
-import org.dromara.web.domain.TreatmentUser;
+import org.dromara.web.domain.PatientMedicalRecord;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -215,6 +215,6 @@ public class EnteralNutritionVo implements Serializable {
 
     private String idStr;
 
-    private TreatmentUser patient;
+    private PatientMedicalRecord patient;
 
 }

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

@@ -3,20 +3,15 @@ package org.dromara.web.domain.vo;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.web.domain.HospitalMealRecipe;
-import org.dromara.web.domain.TreatmentUser;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**

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

@@ -3,11 +3,9 @@ package org.dromara.web.domain.vo;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.web.domain.TreatmentUser;
+import org.dromara.web.domain.PatientMedicalRecord;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -22,8 +20,8 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = TreatmentUser.class)
-public class TreatmentUserVo implements Serializable {
+@AutoMapper(target = PatientMedicalRecord.class)
+public class PatientMedicalRecordVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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

@@ -0,0 +1,20 @@
+package org.dromara.web.domain.vo.indexData;
+
+import lombok.Data;
+
+/*重点关注患者*/
+@Data
+public class FocusPatientVo {
+
+    /*姓名*/
+    private String name;
+
+    /*年龄*/
+    private Integer age;
+
+    /*疾病*/
+    private String disease;
+
+    /*关注原因*/
+    private String reason;
+}

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

@@ -0,0 +1,23 @@
+package org.dromara.web.domain.vo.indexData;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/*收入分析*/
+@Data
+public class IncomeDetailsVo {
+
+    /*总收入*/
+    private BigDecimal totalCollected;
+
+    /*营养产品收入*/
+    private BigDecimal nutritionProducts;
+
+    /*膳食收入*/
+    private BigDecimal dietaryIncome;
+
+    /*营养筛查*/
+    private BigDecimal screeningAssessment;
+
+}

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

@@ -0,0 +1,21 @@
+package org.dromara.web.domain.vo.indexData;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class IndexDataVo {
+
+    private PatientOverviewVo patientOverviewVo;
+
+    private NutritionControlVo nutritionControlVo;
+
+    private PrescriptionOverviewVo prescriptionOverviewVo;
+
+    private StorageOverviewVo storageOverviewVo;
+
+    List<FocusPatientVo> focusPatientVoList;
+
+    List<IncomeDetailsVo>incomeDetailsVoList;
+}

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

@@ -0,0 +1,20 @@
+package org.dromara.web.domain.vo.indexData;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/*营养质控*/
+@Data
+public class NutritionControlVo {
+
+    /*住院患者营养评估率*/
+    private BigDecimal hospitalNutritionAssessmentRate;
+
+    /*营养风险患者评估率*/
+    private BigDecimal nutritionRiskAssessmentRate;
+
+    /*糖尿病患者评估率*/
+    private BigDecimal diabetesAssessmentRate;
+
+}

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

@@ -0,0 +1,19 @@
+package org.dromara.web.domain.vo.indexData;
+
+import lombok.Data;
+
+
+/*患者总数*/
+@Data
+public class PatientOverviewVo {
+
+    /*患者总数*/
+    private Integer total;
+
+    /*门诊数*/
+    private Integer outpatient;
+
+    /*住院数*/
+    private Integer inpatient;
+
+}

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

@@ -0,0 +1,19 @@
+package org.dromara.web.domain.vo.indexData;
+
+import lombok.Data;
+
+/*处方配置数*/
+@Data
+public class PrescriptionOverviewVo {
+
+    /*配置总数*/
+    private Integer total;
+
+    /*已完成*/
+    private Integer completed;
+
+    /*待完成*/
+    private Integer pending;
+
+
+}

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

@@ -0,0 +1,19 @@
+package org.dromara.web.domain.vo.indexData;
+
+
+import lombok.Data;
+
+/*仓储情况总数*/
+@Data
+public class StorageOverviewVo {
+
+    /*许可证临期*/
+    private Integer expiringLicenses;
+
+    /*有效期临期*/
+    private Integer expiringValidity;
+
+    /*库存预警*/
+    private Integer inventoryAlerts;
+
+}

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

@@ -0,0 +1,36 @@
+package org.dromara.web.mapper;
+
+
+import org.apache.ibatis.annotations.Select;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.web.domain.PatientMedicalRecord;
+import org.dromara.web.domain.vo.PatientMedicalRecordVo;
+import org.dromara.web.domain.vo.indexData.PatientOverviewVo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-06-24
+ */
+@Repository
+public interface PatientMedicalRecordMapper extends BaseMapperPlus<PatientMedicalRecord, PatientMedicalRecordVo> {
+    @Select("SELECT COUNT(DISTINCT sp.id) AS total, " +
+        " COUNT(DISTINCT CASE WHEN latest_rec.type = '1' AND latest_rec.medical_type != '2' THEN sp.id END) AS outpatient,  " +
+        " COUNT(DISTINCT CASE WHEN latest_rec.type = '0' AND latest_rec.medical_type != '2' AND latest_rec.discharge_date IS NULL THEN sp.id END) AS inpatient  " +
+        "FROM sys_patient sp  " +
+        "LEFT JOIN (  " +
+        " SELECT pmr1.*   " +
+        " FROM patient_medical_record pmr1  " +
+        " INNER JOIN (  " +
+        "  SELECT treat_num, MAX(create_time) as max_create_time  " +
+        "    FROM patient_medical_record  " +
+        "     WHERE del_flag = '0'  " +
+        "       GROUP BY treat_num  " +
+        "    ) pmr2 ON pmr1.treat_num = pmr2.treat_num AND pmr1.create_time = pmr2.max_create_time  " +
+        "    WHERE pmr1.del_flag = '0'  " +
+        ") latest_rec ON sp.treat_num = latest_rec.treat_num  " +
+        "WHERE sp.del_flag = '0'")
+    PatientOverviewVo selectCount();
+}

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

@@ -1,18 +0,0 @@
-package org.dromara.web.mapper;
-
-
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.web.domain.TreatmentUser;
-import org.dromara.web.domain.vo.TreatmentUserVo;
-import org.springframework.stereotype.Repository;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author Lion Li
- * @date 2025-06-24
- */
-@Repository
-public interface TreatmentUserMapper extends BaseMapperPlus<TreatmentUser, TreatmentUserVo> {
-
-}

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

@@ -0,0 +1,7 @@
+package org.dromara.web.service;
+
+import org.dromara.web.domain.vo.indexData.IndexDataVo;
+
+public interface IIndexService {
+    IndexDataVo queryData();
+}

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

@@ -2,8 +2,8 @@ package org.dromara.web.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.web.domain.bo.TreatmentUserBo;
-import org.dromara.web.domain.vo.TreatmentUserVo;
+import org.dromara.web.domain.bo.PatientMedicalRecordBo;
+import org.dromara.web.domain.vo.PatientMedicalRecordVo;
 
 
 import java.util.Collection;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author Lion Li
  * @date 2025-06-24
  */
-public interface ITreatmentUserService {
+public interface IPatientMedicalRecordService {
 
     /**
      * 查询【请填写功能名称】
@@ -23,7 +23,7 @@ public interface ITreatmentUserService {
      * @param id 主键
      * @return 【请填写功能名称】
      */
-    TreatmentUserVo queryById(Long id);
+    PatientMedicalRecordVo queryById(Long id);
 
     /**
      * 分页查询【请填写功能名称】列表
@@ -32,7 +32,7 @@ public interface ITreatmentUserService {
      * @param pageQuery 分页参数
      * @return 【请填写功能名称】分页列表
      */
-    TableDataInfo<TreatmentUserVo> queryPageList(TreatmentUserBo bo, PageQuery pageQuery);
+    TableDataInfo<PatientMedicalRecordVo> queryPageList(PatientMedicalRecordBo bo, PageQuery pageQuery);
 
     /**
      * 查询符合条件的【请填写功能名称】列表
@@ -40,7 +40,7 @@ public interface ITreatmentUserService {
      * @param bo 查询条件
      * @return 【请填写功能名称】列表
      */
-    List<TreatmentUserVo> queryList(TreatmentUserBo bo);
+    List<PatientMedicalRecordVo> queryList(PatientMedicalRecordBo bo);
 
     /**
      * 新增【请填写功能名称】
@@ -48,7 +48,7 @@ public interface ITreatmentUserService {
      * @param bo 【请填写功能名称】
      * @return 是否新增成功
      */
-    Boolean insertByBo(TreatmentUserBo bo);
+    Boolean insertByBo(PatientMedicalRecordBo bo);
 
     /**
      * 修改【请填写功能名称】
@@ -56,7 +56,7 @@ public interface ITreatmentUserService {
      * @param bo 【请填写功能名称】
      * @return 是否修改成功
      */
-    Boolean updateByBo(TreatmentUserBo bo);
+    Boolean updateByBo(PatientMedicalRecordBo bo);
 
     /**
      * 校验并批量删除【请填写功能名称】信息
@@ -68,5 +68,5 @@ public interface ITreatmentUserService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     /*根据患者的诊疗卡号查询患者的就诊记录*/
-    List<TreatmentUserVo> queryListByTreatNum(String treatNum);
+    List<PatientMedicalRecordVo> queryListByTreatNum(String treatNum);
 }

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

@@ -13,8 +13,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.web.domain.bo.ConsultPatientEditBo;
 import org.dromara.web.domain.bo.ConsultPatientInitiateBo;
-import org.dromara.web.domain.vo.TreatmentUserVo;
-import org.dromara.web.mapper.TreatmentUserMapper;
+import org.dromara.web.domain.vo.PatientMedicalRecordVo;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.web.domain.bo.ConsultPatientBo;
 import org.dromara.web.domain.vo.ConsultPatientVo;
@@ -39,7 +39,7 @@ import java.util.Collection;
 public class ConsultPatientServiceImpl implements IConsultPatientService {
 
     private final ConsultPatientMapper baseMapper;
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
 
     /**
      * 查询会诊患者
@@ -164,7 +164,7 @@ public class ConsultPatientServiceImpl implements IConsultPatientService {
     @Transactional(rollbackFor = Exception.class)
     public R initiateConsultation(ConsultPatientInitiateBo bo) {
 
-        TreatmentUserVo vo = treatmentUserMapper.selectVoById(bo.getId());
+        PatientMedicalRecordVo vo = patientMedicalRecordMapper.selectVoById(bo.getId());
         ConsultPatient patient = new ConsultPatient();
         patient.setVisitType(vo.getType());
         patient.setConsultNum(vo.getTreatNum());

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

@@ -57,7 +57,7 @@ public class EnteralNutritionServiceImpl implements IEnteralNutritionService {
     private final EnteralNutritionMapper baseMapper;
     private final SettlementMapper settlementMapper;
     private final EnteralNutritionConsumableMapper consumableMapper;
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
     private final ProductNutritionMapper productNutritionMapper;
     private final SuppliesManageMapper suppliesManageMapper;
     private final SysUserMapper userMapper;
@@ -370,23 +370,23 @@ public class EnteralNutritionServiceImpl implements IEnteralNutritionService {
             throw new ServiceException("请至少选择一个营养产品");
         }
 
-        TreatmentUser treatmentUser = treatmentUserMapper.selectById(bo.getPatientId());
+        PatientMedicalRecord patientMedicalRecord = patientMedicalRecordMapper.selectById(bo.getPatientId());
         Settlement settlement = new Settlement();
         settlement.setOrderTime(new Date());
         settlement.setPatientId(bo.getPatientId());
         settlement.setVisitType(bo.getVisitType());
         settlement.setChargeType(bo.getChargeType());
         settlement.setPatientNo(bo.getPatientNo());
-        settlement.setPatientName(treatmentUser.getTreatName());
-        settlement.setDoorId(treatmentUser.getDoorId());
-        settlement.setPhone(treatmentUser.getPhoneNum());
-        settlement.setIdCard(treatmentUser.getIdCard());
-        settlement.setBedNo(treatmentUser.getBedNo());
-        settlement.setWardId(treatmentUser.getWardId());
-        settlement.setWardName(treatmentUser.getWardName());
+        settlement.setPatientName(patientMedicalRecord.getTreatName());
+        settlement.setDoorId(patientMedicalRecord.getDoorId());
+        settlement.setPhone(patientMedicalRecord.getPhoneNum());
+        settlement.setIdCard(patientMedicalRecord.getIdCard());
+        settlement.setBedNo(patientMedicalRecord.getBedNo());
+        settlement.setWardId(patientMedicalRecord.getWardId());
+        settlement.setWardName(patientMedicalRecord.getWardName());
         settlement.setPaymentStatus(PaymentStatus.UNPAID.getCode());
         settlement.setStatus(bo.getStatus());
-        settlement.setTreatNum(treatmentUser.getTreatNum());
+        settlement.setTreatNum(patientMedicalRecord.getTreatNum());
 
         saveOrUpdateData(bo, settlement);
         return Boolean.TRUE;

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

@@ -23,7 +23,7 @@ import org.dromara.web.domain.vo.*;
 import org.dromara.web.mapper.HospitalMealPlanMapper;
 import org.dromara.web.mapper.HospitalMealRecipeMapper;
 import org.dromara.web.mapper.SettlementMapper;
-import org.dromara.web.mapper.TreatmentUserMapper;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
 import org.dromara.web.service.IHospitalMealPlanService;
 import org.springframework.stereotype.Service;
 
@@ -51,7 +51,7 @@ public class HospitalMealPlanServiceImpl implements IHospitalMealPlanService {
 
     private final SettlementMapper settlementMapper;
 
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
 
     private final HospitalMealRecipeMapper mealRecipeMapper;
 
@@ -146,25 +146,25 @@ public class HospitalMealPlanServiceImpl implements IHospitalMealPlanService {
     public Boolean insertByBo(HospitalMealPlanBo bo) {
         log.info(bo.toString());
         /*新增院内膳食时新增一条结算管理的待收费订单*/
-        TreatmentUser treatmentUser = treatmentUserMapper.selectById(bo.getPatientId());
+        PatientMedicalRecord patientMedicalRecord = patientMedicalRecordMapper.selectById(bo.getPatientId());
         Settlement settlement = new Settlement();
         settlement.setOrderTime(new Date());
         settlement.setPatientId(bo.getPatientId());
         settlement.setVisitType(bo.getType());
         settlement.setChargeType(FeeType.IN_HOSPITAL_MEALS.getCode());
         settlement.setPatientNo(bo.getOutpatientNo());
-        settlement.setPatientName(treatmentUser.getTreatName());
-        settlement.setDoorId(treatmentUser.getDoorId());
-        settlement.setPhone(treatmentUser.getPhoneNum());
-        settlement.setIdCard(treatmentUser.getIdCard());
-        settlement.setBedNo(treatmentUser.getBedNo());
-        settlement.setWardId(treatmentUser.getWardId());
-        settlement.setWardName(treatmentUser.getWardName());
+        settlement.setPatientName(patientMedicalRecord.getTreatName());
+        settlement.setDoorId(patientMedicalRecord.getDoorId());
+        settlement.setPhone(patientMedicalRecord.getPhoneNum());
+        settlement.setIdCard(patientMedicalRecord.getIdCard());
+        settlement.setBedNo(patientMedicalRecord.getBedNo());
+        settlement.setWardId(patientMedicalRecord.getWardId());
+        settlement.setWardName(patientMedicalRecord.getWardName());
         settlement.setReceivableAmount(bo.getTotalPrice());
         settlement.setPaymentStatus(PaymentStatus.UNPAID.getCode());
         settlement.setCheckStatus(CheckStatus.STATUS_TWO.getCode());
         settlement.setStatus(bo.getStatus());
-        settlement.setTreatNum(treatmentUser.getTreatNum());
+        settlement.setTreatNum(patientMedicalRecord.getTreatNum());
         boolean flag = settlementMapper.insert(settlement) > 0;
         if (flag) {
             bo.setSettlementId(settlement.getId());

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

@@ -39,7 +39,7 @@ public class HospitalRecordServiceImpl implements IHospitalRecordService {
 
     private final SysDeptMapper sysDeptMapper;
 
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
 
     private final ISysDictDataService dictDataService;
 
@@ -80,13 +80,13 @@ public class HospitalRecordServiceImpl implements IHospitalRecordService {
         Map<String, List<SysDictDataVo>> dictMap = dictDataService.selectGroupByType(List.of(BizConst.PAYMENT_STATUS, BizConst.FEE_TYPE)).getData();
         Map<String, String> feeTypeMap = dictMap.get(BizConst.FEE_TYPE).stream().collect(Collectors.toMap(k1 -> k1.getDictValue(), k2 -> k2.getDictLabel(), (k1, k2) -> k1));
         if (null != bo.getPatientId()) {
-            TreatmentUser treatmentUser = treatmentUserMapper.selectById(bo.getPatientId());
-            if (null != treatmentUser) {
-                recordVo.setDeptId(treatmentUser.getDoorId());
-                recordVo.setDeptName(deptMap.get(treatmentUser.getDoorId()));
-                recordVo.setCreateTime(treatmentUser.getCreateTime());
-                recordVo.setCreateBy(treatmentUser.getCreateBy());
-                recordVo.setCreateByUser(userMap.get(treatmentUser.getCreateBy()));
+            PatientMedicalRecord patientMedicalRecord = patientMedicalRecordMapper.selectById(bo.getPatientId());
+            if (null != patientMedicalRecord) {
+                recordVo.setDeptId(patientMedicalRecord.getDoorId());
+                recordVo.setDeptName(deptMap.get(patientMedicalRecord.getDoorId()));
+                recordVo.setCreateTime(patientMedicalRecord.getCreateTime());
+                recordVo.setCreateBy(patientMedicalRecord.getCreateBy());
+                recordVo.setCreateByUser(userMap.get(patientMedicalRecord.getCreateBy()));
             }
         }
 

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

@@ -0,0 +1,30 @@
+package org.dromara.web.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.web.domain.vo.indexData.IndexDataVo;
+import org.dromara.web.domain.vo.indexData.PatientOverviewVo;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
+import org.dromara.web.service.IIndexService;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class IndexServiceImpl implements IIndexService {
+
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
+    @Override
+    public IndexDataVo queryData() {
+        IndexDataVo indexDataVo = new IndexDataVo();
+
+        //查询患者总数
+        PatientOverviewVo patientOverviewVo = patientMedicalRecordMapper.selectCount();
+        indexDataVo.setPatientOverviewVo(patientOverviewVo);
+
+
+
+        /**/
+        return indexDataVo;
+    }
+}

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

@@ -16,14 +16,14 @@ import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.web.domain.EnteralNutrition;
 import org.dromara.web.domain.Settlement;
-import org.dromara.web.domain.TreatmentUser;
+import org.dromara.web.domain.PatientMedicalRecord;
 import org.dromara.web.domain.bo.LongTermManagementExecuteBo;
 import org.dromara.web.domain.bo.LongTermManagementListPageBo;
 import org.dromara.web.domain.bo.LongTermManagementStopBo;
 import org.dromara.web.domain.vo.LongTermManagementListPageVo;
 import org.dromara.web.mapper.EnteralNutritionMapper;
 import org.dromara.web.mapper.SettlementMapper;
-import org.dromara.web.mapper.TreatmentUserMapper;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
 import org.dromara.web.service.LongTermManagementService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +42,7 @@ public class LongTermManagementServiceImpl implements LongTermManagementService
 
     private final EnteralNutritionMapper enteralNutritionMapper;
     private final SettlementMapper settlementMapper;
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
     private final SysDeptMapper sysDeptMapper;
     private final SysUserMapper sysUserMapper;
 
@@ -51,11 +51,11 @@ public class LongTermManagementServiceImpl implements LongTermManagementService
 
         List<Long> patientIds = new ArrayList<>();
         Map<Long, String> patientNames = new HashMap<>();
-        List<TreatmentUser> patientList = treatmentUserMapper.selectList(
-            Wrappers.lambdaQuery(TreatmentUser.class)
-                .like(bo.getPatientName() != null, TreatmentUser::getTreatName, bo.getPatientName())
-                .eq(bo.getConsultationType() != null, TreatmentUser::getType, bo.getConsultationType())
-                .eq(bo.getWardId() != null, TreatmentUser::getWardId, bo.getWardId())
+        List<PatientMedicalRecord> patientList = patientMedicalRecordMapper.selectList(
+            Wrappers.lambdaQuery(PatientMedicalRecord.class)
+                .like(bo.getPatientName() != null, PatientMedicalRecord::getTreatName, bo.getPatientName())
+                .eq(bo.getConsultationType() != null, PatientMedicalRecord::getType, bo.getConsultationType())
+                .eq(bo.getWardId() != null, PatientMedicalRecord::getWardId, bo.getWardId())
         );
         patientList.forEach(e -> {
             patientIds.add(e.getId());

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

@@ -10,14 +10,9 @@ 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.SysDept;
-import org.dromara.system.domain.SysDiseaseLabel;
-import org.dromara.system.domain.SysMenu;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysDiseaseLabelVo;
-import org.dromara.system.domain.vo.SysMenuVo;
 import org.dromara.system.mapper.SysDiseaseLabelMapper;
-import org.dromara.system.mapper.SysMenuMapper;
 import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysDiseaseLabelService;
 import org.dromara.web.domain.ConsultantResultTemplate;
@@ -26,12 +21,12 @@ import org.dromara.web.domain.NutritionDiagnosis;
 import org.dromara.web.domain.bo.NutritionDiagnosisBo;
 import org.dromara.web.domain.vo.ConsultantResultTemplateVo;
 import org.dromara.web.domain.vo.NutritionDiagnosisVo;
-import org.dromara.web.domain.vo.TreatmentUserVo;
+import org.dromara.web.domain.vo.PatientMedicalRecordVo;
 import org.dromara.web.mapper.ConsultantResultTemplateMapper;
 import org.dromara.web.mapper.ConsultantResultTemplateTypeMapper;
 import org.dromara.web.mapper.NutritionDiagnosisMapper;
 import org.dromara.web.service.INutritionDiagnosisService;
-import org.dromara.web.service.ITreatmentUserService;
+import org.dromara.web.service.IPatientMedicalRecordService;
 import org.springframework.stereotype.Service;
 
 
@@ -58,7 +53,7 @@ public class NutritionDiagnosisServiceImpl implements INutritionDiagnosisService
 
     private final SysDiseaseLabelMapper labelMapper;
 
-    private final ITreatmentUserService treatmentUserService;
+    private final IPatientMedicalRecordService treatmentUserService;
 
     private final ConsultantResultTemplateMapper templateMapper;
 
@@ -163,10 +158,10 @@ public class NutritionDiagnosisServiceImpl implements INutritionDiagnosisService
         bo.setDiagnosisLableId(String.join(",", bo.getLabelList()));
         Long treatmentUserId = bo.getTreatmentUserId();
         if (null != treatmentUserId) {
-            TreatmentUserVo treatmentUserVo = treatmentUserService.queryById(treatmentUserId);
-            if (null != treatmentUserVo) {
-                bo.setType(treatmentUserVo.getType());
-                bo.setOutpatientNo(treatmentUserVo.getOutpatientNo());
+            PatientMedicalRecordVo patientMedicalRecordVo = treatmentUserService.queryById(treatmentUserId);
+            if (null != patientMedicalRecordVo) {
+                bo.setType(patientMedicalRecordVo.getType());
+                bo.setOutpatientNo(patientMedicalRecordVo.getOutpatientNo());
             }
         }
         bo.setConsultantResult(URLDecoder.decode(new String(Base64.getDecoder().decode(bo.getConsultantResultStr()), StandardCharsets.UTF_8)));

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

@@ -12,12 +12,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysDiseaseLabel;
 import org.dromara.system.domain.SysUser;
-import org.dromara.system.domain.bo.SysDiseaseLabelBo;
 import org.dromara.system.mapper.SysDeptMapper;
 import org.dromara.system.mapper.SysDiseaseLabelMapper;
 import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.web.domain.NutritionEducationTemplate;
-import org.dromara.web.domain.TreatmentUser;
 import org.dromara.web.domain.bo.NutritionEducationTemplateBo;
 import org.dromara.web.domain.vo.NutritionEducationTemplateVo;
 import org.dromara.web.mapper.NutritionEducationTemplateMapper;

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

@@ -1,9 +1,6 @@
 package org.dromara.web.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -31,23 +28,19 @@ import org.dromara.system.mapper.SysScreeningAssessmentConfigMapper;
 import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysDictDataService;
 import org.dromara.web.domain.*;
-import org.dromara.web.domain.bo.EnteralNutritionBo;
-import org.dromara.web.domain.bo.EnteralNutritionConsumableBo;
-import org.dromara.web.domain.bo.EnteralNutritionSaveBo;
 import org.dromara.web.domain.bo.NutritionEvaluationBo;
 import org.dromara.web.domain.vo.ChargeItemVo;
 import org.dromara.web.domain.vo.NutritionEvaluationVo;
 import org.dromara.web.mapper.ChargeSetMapper;
 import org.dromara.web.mapper.NutritionEvaluationMapper;
 import org.dromara.web.mapper.SettlementMapper;
-import org.dromara.web.mapper.TreatmentUserMapper;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
 import org.dromara.web.service.INutritionEvaluationService;
 import org.springframework.stereotype.Service;
 
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -67,7 +60,7 @@ public class NutritionEvaluationServiceImpl implements INutritionEvaluationServi
     private final ISysDictDataService dataService;
     private final SysUserMapper userMapper;
     private final SettlementMapper settlementMapper;
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
     private final ChargeSetMapper chargeSetMapper;
 
     /**
@@ -182,24 +175,24 @@ public class NutritionEvaluationServiceImpl implements INutritionEvaluationServi
         }
 
         ChargeSet chargeSet = null;
-        TreatmentUser treatmentUser = treatmentUserMapper.selectById(bo.getPatientId());
+        PatientMedicalRecord patientMedicalRecord = patientMedicalRecordMapper.selectById(bo.getPatientId());
         Settlement settlement = new Settlement();
         settlement.setOrderTime(new Date());
         settlement.setPatientId(bo.getPatientId());
         settlement.setVisitType(bo.getVisitType());
         settlement.setChargeType(FeeType.NUTRITION_EVALUATION.getCode());
         settlement.setPatientNo(bo.getPatientNo());
-        settlement.setPatientName(treatmentUser.getTreatName());
-        settlement.setDoorId(treatmentUser.getDoorId());
-        settlement.setPhone(treatmentUser.getPhoneNum());
-        settlement.setIdCard(treatmentUser.getIdCard());
-        settlement.setBedNo(treatmentUser.getBedNo());
-        settlement.setWardId(treatmentUser.getWardId());
-        settlement.setWardName(treatmentUser.getWardName());
+        settlement.setPatientName(patientMedicalRecord.getTreatName());
+        settlement.setDoorId(patientMedicalRecord.getDoorId());
+        settlement.setPhone(patientMedicalRecord.getPhoneNum());
+        settlement.setIdCard(patientMedicalRecord.getIdCard());
+        settlement.setBedNo(patientMedicalRecord.getBedNo());
+        settlement.setWardId(patientMedicalRecord.getWardId());
+        settlement.setWardName(patientMedicalRecord.getWardName());
         settlement.setPaymentStatus(PaymentStatus.UNPAID.getCode());
         settlement.setStatus(bo.getStatus());
         settlement.setCheckStatus(CheckStatus.STATUS_TWO.getCode());
-        settlement.setTreatNum(treatmentUser.getTreatNum());
+        settlement.setTreatNum(patientMedicalRecord.getTreatNum());
         List<ChargeSet> chargeSetList = chargeSetMapper.selectList();
         if (CollUtil.isNotEmpty(chargeSetList)) {
             chargeSet = chargeSetList.get(0);

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

@@ -32,15 +32,15 @@ import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysDictDataService;
 import org.dromara.web.domain.ChargeSet;
 import org.dromara.web.domain.NutritionScreening;
+import org.dromara.web.domain.PatientMedicalRecord;
 import org.dromara.web.domain.Settlement;
-import org.dromara.web.domain.TreatmentUser;
 import org.dromara.web.domain.bo.NutritionScreeningBo;
 import org.dromara.web.domain.vo.ChargeItemVo;
 import org.dromara.web.domain.vo.NutritionScreeningVo;
 import org.dromara.web.mapper.ChargeSetMapper;
 import org.dromara.web.mapper.NutritionScreeningMapper;
 import org.dromara.web.mapper.SettlementMapper;
-import org.dromara.web.mapper.TreatmentUserMapper;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
 import org.dromara.web.service.INutritionScreeningService;
 import org.springframework.stereotype.Service;
 
@@ -66,7 +66,7 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
     private final ISysDictDataService dataService;
     private final SysUserMapper userMapper;
     private final SettlementMapper settlementMapper;
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
     private final ChargeSetMapper chargeSetMapper;
 
     /**
@@ -215,24 +215,24 @@ public class NutritionScreeningServiceImpl implements INutritionScreeningService
             }
         }
         ChargeSet chargeSet = null;
-        TreatmentUser treatmentUser = treatmentUserMapper.selectById(bo.getPatientId());
+        PatientMedicalRecord patientMedicalRecord = patientMedicalRecordMapper.selectById(bo.getPatientId());
         Settlement settlement = new Settlement();
         settlement.setOrderTime(new Date());
         settlement.setPatientId(bo.getPatientId());
         settlement.setVisitType(bo.getVisitType());
         settlement.setChargeType(FeeType.NUTRITION_SCREENING.getCode());
         settlement.setPatientNo(bo.getPatientNo());
-        settlement.setPatientName(treatmentUser.getTreatName());
-        settlement.setDoorId(treatmentUser.getDoorId());
-        settlement.setPhone(treatmentUser.getPhoneNum());
-        settlement.setIdCard(treatmentUser.getIdCard());
-        settlement.setBedNo(treatmentUser.getBedNo());
-        settlement.setWardId(treatmentUser.getWardId());
-        settlement.setWardName(treatmentUser.getWardName());
+        settlement.setPatientName(patientMedicalRecord.getTreatName());
+        settlement.setDoorId(patientMedicalRecord.getDoorId());
+        settlement.setPhone(patientMedicalRecord.getPhoneNum());
+        settlement.setIdCard(patientMedicalRecord.getIdCard());
+        settlement.setBedNo(patientMedicalRecord.getBedNo());
+        settlement.setWardId(patientMedicalRecord.getWardId());
+        settlement.setWardName(patientMedicalRecord.getWardName());
         settlement.setPaymentStatus(PaymentStatus.UNPAID.getCode());
         settlement.setStatus(bo.getStatus());
         settlement.setCheckStatus(CheckStatus.STATUS_TWO.getCode());
-        settlement.setTreatNum(treatmentUser.getTreatNum());
+        settlement.setTreatNum(patientMedicalRecord.getTreatNum());
 
         List<ChargeSet> chargeSetList = chargeSetMapper.selectList();
         if (CollUtil.isNotEmpty(chargeSetList)) {

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

@@ -3,10 +3,8 @@ 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;
@@ -14,7 +12,6 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
-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;
@@ -26,20 +23,18 @@ 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.PatientMedicalRecord;
 import org.dromara.web.domain.SysPatient;
-import org.dromara.web.domain.TreatmentUser;
-import org.dromara.web.domain.bo.TreatmentUserBo;
+import org.dromara.web.domain.bo.PatientMedicalRecordBo;
 import org.dromara.web.domain.vo.NutritionDiagnosisVo;
-import org.dromara.web.domain.vo.TreatmentUserVo;
+import org.dromara.web.domain.vo.PatientMedicalRecordVo;
 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.dromara.web.mapper.PatientMedicalRecordMapper;
+import org.dromara.web.service.IPatientMedicalRecordService;
 import org.springframework.stereotype.Service;
 
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -52,9 +47,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class TreatmentUserServiceImpl implements ITreatmentUserService {
+public class PatientMedicalRecordServiceImpl implements IPatientMedicalRecordService {
 
-    private final TreatmentUserMapper baseMapper;
+    private final PatientMedicalRecordMapper baseMapper;
 
     private final ISysDeptService deptService;
 
@@ -77,16 +72,16 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
      * @return 【请填写功能名称】
      */
     @Override
-    public TreatmentUserVo queryById(Long id) {
-        TreatmentUserVo treatmentUserVo = baseMapper.selectVoById(id);
+    public PatientMedicalRecordVo queryById(Long id) {
+        PatientMedicalRecordVo patientMedicalRecordVo = baseMapper.selectVoById(id);
         SysDeptVo deptVo = null;
-        if (null != treatmentUserVo) {
-            deptVo = deptService.selectDeptById(treatmentUserVo.getDoorId());
+        if (null != patientMedicalRecordVo) {
+            deptVo = deptService.selectDeptById(patientMedicalRecordVo.getDoorId());
             if (null != deptVo) {
-                treatmentUserVo.setDeptName(deptVo.getDeptName());
+                patientMedicalRecordVo.setDeptName(deptVo.getDeptName());
             }
         }
-        return treatmentUserVo;
+        return patientMedicalRecordVo;
     }
 
     /**
@@ -97,13 +92,13 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
      * @return 【请填写功能名称】分页列表
      */
     @Override
-    public TableDataInfo<TreatmentUserVo> queryPageList(TreatmentUserBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<TreatmentUser> lqw = buildQueryWrapper(bo);
+    public TableDataInfo<PatientMedicalRecordVo> queryPageList(PatientMedicalRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PatientMedicalRecord> lqw = buildQueryWrapper(bo);
         List<SysDept> deptlList = deptMapper.selectList(Wrappers.lambdaQuery(SysDept.class).select(SysDept::getDeptId, SysDept::getDeptName));
         Map<Long, String> deptMap = deptlList.stream().collect(Collectors.toMap(k1 -> k1.getDeptId(), k2 -> String.valueOf(k2.getDeptName()), (k1, k2) -> k1));
-        List<TreatmentUserVo> result = baseMapper.selectVoList(lqw);
+        List<PatientMedicalRecordVo> result = baseMapper.selectVoList(lqw);
         if (null != result) {
-            for (TreatmentUserVo vo : result) {
+            for (PatientMedicalRecordVo vo : result) {
                 vo.setDeptName(deptMap.get(vo.getDoorId()));
             }
         }
@@ -117,31 +112,31 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
      * @return 【请填写功能名称】列表
      */
     @Override
-    public List<TreatmentUserVo> queryList(TreatmentUserBo bo) {
-        LambdaQueryWrapper<TreatmentUser> lqw = buildQueryWrapper(bo);
+    public List<PatientMedicalRecordVo> queryList(PatientMedicalRecordBo bo) {
+        LambdaQueryWrapper<PatientMedicalRecord> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
 
-    private LambdaQueryWrapper<TreatmentUser> buildQueryWrapper(TreatmentUserBo bo) {
+    private LambdaQueryWrapper<PatientMedicalRecord> buildQueryWrapper(PatientMedicalRecordBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<TreatmentUser> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TreatmentUser::getId);
-        lqw.eq(StringUtils.isNotBlank(bo.getType()), TreatmentUser::getType, bo.getType());
-        lqw.eq(bo.getDoorId() != null, TreatmentUser::getDoorId, bo.getDoorId());
-        lqw.eq(bo.getEvaluationStatus() != null, TreatmentUser::getEvaluationStatus, bo.getEvaluationStatus());
-        lqw.eq(bo.getTreatmentUserStatus() != null, TreatmentUser::getTreatmentUserStatus, bo.getTreatmentUserStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getTreatNum()), TreatmentUser::getTreatNum, bo.getTreatNum());
-        lqw.eq(StringUtils.isNotBlank(bo.getOutpatientNo()), TreatmentUser::getOutpatientNo, bo.getOutpatientNo());
+        LambdaQueryWrapper<PatientMedicalRecord> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(PatientMedicalRecord::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), PatientMedicalRecord::getType, bo.getType());
+        lqw.eq(bo.getDoorId() != null, PatientMedicalRecord::getDoorId, bo.getDoorId());
+        lqw.eq(bo.getEvaluationStatus() != null, PatientMedicalRecord::getEvaluationStatus, bo.getEvaluationStatus());
+        lqw.eq(bo.getTreatmentUserStatus() != null, PatientMedicalRecord::getTreatmentUserStatus, bo.getTreatmentUserStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getTreatNum()), PatientMedicalRecord::getTreatNum, bo.getTreatNum());
+        lqw.eq(StringUtils.isNotBlank(bo.getOutpatientNo()), PatientMedicalRecord::getOutpatientNo, bo.getOutpatientNo());
         // 添加searchFlag的多字段模糊查询
         if (StringUtils.isNotBlank(bo.getSearchFlag())) {
             lqw.and(wrapper ->
-                wrapper.like(TreatmentUser::getTreatName, bo.getSearchFlag())
+                wrapper.like(PatientMedicalRecord::getTreatName, bo.getSearchFlag())
                     .or()
-                    .like(TreatmentUser::getOutpatientNo, bo.getSearchFlag())
+                    .like(PatientMedicalRecord::getOutpatientNo, bo.getSearchFlag())
                     .or()
-                    .like(TreatmentUser::getIdCard, bo.getSearchFlag())
+                    .like(PatientMedicalRecord::getIdCard, bo.getSearchFlag())
                     .or()
-                    .like(TreatmentUser::getOutpatientNo, bo.getSearchFlag()));
+                    .like(PatientMedicalRecord::getOutpatientNo, bo.getSearchFlag()));
         }
         return lqw;
     }
@@ -153,7 +148,7 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(TreatmentUserBo bo) {
+    public Boolean insertByBo(PatientMedicalRecordBo bo) {
         // 1. 创建患者基本信息
         SysPatient patient = createSysPatient(bo);
         boolean patientInserted = patientMapper.insert(patient) > 0;
@@ -164,16 +159,16 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
 
         try {
             // 2. 创建治疗用户信息
-            TreatmentUser treatmentUser = createTreatmentUser(bo, patient.getTreatNum());
-            boolean userInserted = baseMapper.insert(treatmentUser) > 0;
+            PatientMedicalRecord patientMedicalRecord = createTreatmentUser(bo, patient.getTreatNum());
+            boolean userInserted = baseMapper.insert(patientMedicalRecord) > 0;
 
             if (!userInserted) {
                 return false;
             }
 
             // 3. 创建患者账户信息
-            createPatientAccount(treatmentUser);
-            bo.setId(treatmentUser.getId());
+            createPatientAccount(patientMedicalRecord);
+            bo.setId(patientMedicalRecord.getId());
 
             return true;
         } catch (Exception e) {
@@ -184,7 +179,7 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
 
     }
 
-    private SysPatient createSysPatient(TreatmentUserBo bo) {
+    private SysPatient createSysPatient(PatientMedicalRecordBo bo) {
         SysPatient patient = new SysPatient();
         patient.setTreatNum(RedisUtil.generatePatientNumber("M"));
         patient.setPatientName(bo.getTreatName());
@@ -201,59 +196,59 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
         return patient;
     }
 
-    private TreatmentUser createTreatmentUser(TreatmentUserBo bo, String treatNum) {
-        TreatmentUser treatmentUser = MapstructUtils.convert(bo, TreatmentUser.class);
-        treatmentUser.setTreatNum(treatNum);
+    private PatientMedicalRecord createTreatmentUser(PatientMedicalRecordBo bo, String treatNum) {
+        PatientMedicalRecord patientMedicalRecord = MapstructUtils.convert(bo, PatientMedicalRecord.class);
+        patientMedicalRecord.setTreatNum(treatNum);
 
         // 设置门诊号
-        if (StringUtils.isNotBlank(treatmentUser.getType())) {
-            String prefix = PatientType.OUTPATIENT.getCode().equals(treatmentUser.getType()) ? "2" : "1";
-            treatmentUser.setOutpatientNo(RedisUtil.generatePatientNumber(prefix));
+        if (StringUtils.isNotBlank(patientMedicalRecord.getType())) {
+            String prefix = PatientType.OUTPATIENT.getCode().equals(patientMedicalRecord.getType()) ? "2" : "1";
+            patientMedicalRecord.setOutpatientNo(RedisUtil.generatePatientNumber(prefix));
         }
 
         // 设置病房信息
         if (bo.getWardId() != null) {
             SysWardVo wardVo = wardMapper.selectVoById(bo.getWardId());
             if (wardVo != null) {
-                treatmentUser.setWardName(wardVo.getWardName());
+                patientMedicalRecord.setWardName(wardVo.getWardName());
             }
         }
 
-        treatmentUser.setBirthday(bo.getBirthday());
-        treatmentUser.setPhoneNum(bo.getPhoneNum());
-        validEntityBeforeSave(treatmentUser);
+        patientMedicalRecord.setBirthday(bo.getBirthday());
+        patientMedicalRecord.setPhoneNum(bo.getPhoneNum());
+        validEntityBeforeSave(patientMedicalRecord);
 
-        return treatmentUser;
+        return patientMedicalRecord;
     }
 
-    private void createPatientAccount(TreatmentUser treatmentUser) {
+    private void createPatientAccount(PatientMedicalRecord patientMedicalRecord) {
         PatientAccount account = new PatientAccount();
         account.setSerialNo(RedisUtil.generatePatientNumber("A"));
-        account.setPatientId(treatmentUser.getId());
-        account.setPatientName(treatmentUser.getTreatName());
-        account.setIdCard(treatmentUser.getIdCard());
+        account.setPatientId(patientMedicalRecord.getId());
+        account.setPatientName(patientMedicalRecord.getTreatName());
+        account.setIdCard(patientMedicalRecord.getIdCard());
 
         // 修复类型转换问题
-        if (StringUtils.isNotBlank(treatmentUser.getSex())) {
-            account.setSex(Long.valueOf(treatmentUser.getSex()));
+        if (StringUtils.isNotBlank(patientMedicalRecord.getSex())) {
+            account.setSex(Long.valueOf(patientMedicalRecord.getSex()));
         }
 
-        account.setPhone(treatmentUser.getPhoneNum());
-        account.setDoorId(treatmentUser.getDoorId());
+        account.setPhone(patientMedicalRecord.getPhoneNum());
+        account.setDoorId(patientMedicalRecord.getDoorId());
 
         // 设置部门信息
-        if (treatmentUser.getDoorId() != null) {
-            SysDeptVo deptVo = deptMapper.selectVoById(treatmentUser.getDoorId());
+        if (patientMedicalRecord.getDoorId() != null) {
+            SysDeptVo deptVo = deptMapper.selectVoById(patientMedicalRecord.getDoorId());
             if (deptVo != null) {
                 account.setDeptName(deptVo.getDeptName());
             }
         }
 
-        account.setVisitType(treatmentUser.getType());
-        account.setWardId(treatmentUser.getWardId());
-        account.setWardName(treatmentUser.getWardName());
-        account.setTreatNum(treatmentUser.getTreatNum());
-        account.setPatientNo(treatmentUser.getOutpatientNo());
+        account.setVisitType(patientMedicalRecord.getType());
+        account.setWardId(patientMedicalRecord.getWardId());
+        account.setWardName(patientMedicalRecord.getWardName());
+        account.setTreatNum(patientMedicalRecord.getTreatNum());
+        account.setPatientNo(patientMedicalRecord.getOutpatientNo());
 
         accountMapper.insert(account);
     }
@@ -324,12 +319,12 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(TreatmentUserBo bo) {
+    public Boolean updateByBo(PatientMedicalRecordBo bo) {
         SysWardVo wardVo = wardMapper.selectVoById(bo.getWardId());
         if (null != wardVo) {
             bo.setWardName(wardVo.getWardName());
         }
-        TreatmentUser update = MapstructUtils.convert(bo, TreatmentUser.class);
+        PatientMedicalRecord update = MapstructUtils.convert(bo, PatientMedicalRecord.class);
         update.setBirthday(bo.getBirthday());
         update.setPhoneNum(bo.getPhoneNum());
         validEntityBeforeSave(update);
@@ -339,18 +334,18 @@ public class TreatmentUserServiceImpl implements ITreatmentUserService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(TreatmentUser entity) {
+    private void validEntityBeforeSave(PatientMedicalRecord entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
-    public List<TreatmentUserVo> queryListByTreatNum(String treatNum) {
-        List<TreatmentUserVo> userVoList = baseMapper.selectVoList(new LambdaQueryWrapper<TreatmentUser>().eq(TreatmentUser::getTreatNum, treatNum));
+    public List<PatientMedicalRecordVo> queryListByTreatNum(String treatNum) {
+        List<PatientMedicalRecordVo> userVoList = baseMapper.selectVoList(new LambdaQueryWrapper<PatientMedicalRecord>().eq(PatientMedicalRecord::getTreatNum, treatNum));
         NutritionDiagnosisVo diagnosis =null;
         String labelIdsStr = null;
         List<String> labelNames = null;
         if (CollUtil.isNotEmpty(userVoList)) {
-            for (TreatmentUserVo vo : userVoList) {
+            for (PatientMedicalRecordVo 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();

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

@@ -44,7 +44,7 @@ public class ReportServiceImpl implements ReportService {
     private final SysRecipeMapper sysRecipeMapper;
     private final SysRecipeFoodIngredientMapper sysRecipeFoodIngredientMapper;
     private final SysFoodIngredientMapper sysFoodIngredientMapper;
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
     private final SysDeptMapper sysDeptMapper;
     private final SysUserMapper sysUserMapper;
     private final SettlementMapper settlementMapper;
@@ -120,11 +120,11 @@ public class ReportServiceImpl implements ReportService {
         List<Long> ids = new ArrayList<>();
         Map<String, String> payStatusMap = new HashMap<>();
 
-        treatmentUserMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
+        patientMedicalRecordMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
         sysDeptMapper.selectList().forEach(e -> deptMap.put(e.getDeptId(), e.getDeptName()));
         sysUserMapper.selectList().forEach(e -> userMap.put(e.getUserId(), e.getName()));
-        treatmentUserMapper.selectList(
-            Wrappers.lambdaQuery(TreatmentUser.class).like(TreatmentUser::getTreatName, bo.getName())
+        patientMedicalRecordMapper.selectList(
+            Wrappers.lambdaQuery(PatientMedicalRecord.class).like(PatientMedicalRecord::getTreatName, bo.getName())
         ).forEach(e -> ids.add(e.getId()));
         sysDictDataMapper.selectDictDataByType("payment_status").forEach(e -> payStatusMap.put(e.getDictValue(), e.getDictLabel()));
 
@@ -335,7 +335,7 @@ public class ReportServiceImpl implements ReportService {
 
         sysDeptMapper.selectList().forEach(e -> departmentMap.put(e.getDeptId(), e.getDeptName()));
         sysUserMapper.selectList().forEach(e -> doctorMap.put(e.getUserId(), e.getName()));
-        treatmentUserMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
+        patientMedicalRecordMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
         sysDictDataMapper.selectDictDataByType("payment_status").forEach(e -> payStatusMap.put(e.getDictValue(), e.getDictLabel()));
         sysDictDataMapper.selectDictDataByType("charge_way").forEach(e -> payMethodMap.put(e.getDictValue(), e.getDictLabel()));
         sysDictDataMapper.selectDictDataByType("fee_type").forEach(e -> feeTypeMap.put(e.getDictValue(), e.getDictLabel()));
@@ -487,8 +487,8 @@ public class ReportServiceImpl implements ReportService {
     public TableDataInfo listPageProgressNote(ProgressNoteBo bo, PageQuery pageQuery) {
 
         List<Long> ids = new ArrayList<>();
-        treatmentUserMapper.selectList(
-            Wrappers.lambdaQuery(TreatmentUser.class).like(TreatmentUser::getTreatName, bo.getPatient())
+        patientMedicalRecordMapper.selectList(
+            Wrappers.lambdaQuery(PatientMedicalRecord.class).like(PatientMedicalRecord::getTreatName, bo.getPatient())
         ).forEach(e -> ids.add(e.getId()));
 
         Map<Long, String> departmentMap = new HashMap<>();
@@ -500,20 +500,20 @@ public class ReportServiceImpl implements ReportService {
 
         sysDeptMapper.selectList().forEach(e -> departmentMap.put(e.getDeptId(), e.getDeptName()));
         sysUserMapper.selectList().forEach(e -> doctorMap.put(e.getUserId(), e.getName()));
-        treatmentUserMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
+        patientMedicalRecordMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
         sysDictDataMapper.selectDictDataByType("payment_status").forEach(e -> payStatusMap.put(e.getDictValue(), e.getDictLabel()));
         sysDictDataMapper.selectDictDataByType("charge_way").forEach(e -> payMethodMap.put(e.getDictValue(), e.getDictLabel()));
         sysDictDataMapper.selectDictDataByType("fee_type").forEach(e -> feeTypeMap.put(e.getDictValue(), e.getDictLabel()));
 
         List<ChargeRecord> records = chargeRecordMapper.selectList(Wrappers.lambdaQuery(ChargeRecord.class).in(!ids.isEmpty(), ChargeRecord::getPatientId, ids));
 
-        Page<TreatmentUser> page = treatmentUserMapper.selectPage(
+        Page<PatientMedicalRecord> page = patientMedicalRecordMapper.selectPage(
             pageQuery.build(),
-            Wrappers.lambdaQuery(TreatmentUser.class)
-                .ge(bo.getCreateTimeEarliest() != null, TreatmentUser::getCreateTime, bo.getCreateTimeEarliest())
-                .le(bo.getCreateTimeLatest() != null, TreatmentUser::getCreateTime, bo.getCreateTimeLatest())
-                .eq(bo.getPatientDepartmentId() != null, TreatmentUser::getDoorId, bo.getPatientDepartmentId())
-                .eq(!ids.isEmpty(), TreatmentUser::getId, ids)
+            Wrappers.lambdaQuery(PatientMedicalRecord.class)
+                .ge(bo.getCreateTimeEarliest() != null, PatientMedicalRecord::getCreateTime, bo.getCreateTimeEarliest())
+                .le(bo.getCreateTimeLatest() != null, PatientMedicalRecord::getCreateTime, bo.getCreateTimeLatest())
+                .eq(bo.getPatientDepartmentId() != null, PatientMedicalRecord::getDoorId, bo.getPatientDepartmentId())
+                .eq(!ids.isEmpty(), PatientMedicalRecord::getId, ids)
         );
 
         return TableDataInfo.build(page.convert(e -> {
@@ -568,10 +568,10 @@ public class ReportServiceImpl implements ReportService {
         Map<String, String> payStatusMap = new HashMap<>();
         Map<String, String> consultationMap = new HashMap<>();
 
-        treatmentUserMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
+        patientMedicalRecordMapper.selectList().forEach(e -> patientMap.put(e.getId(), e.getTreatName()));
         sysDeptMapper.selectList().forEach(e -> deptMap.put(e.getDeptId(), e.getDeptName()));
         sysUserMapper.selectList().forEach(e -> userMap.put(e.getUserId(), e.getName()));
-        treatmentUserMapper.selectList().forEach(e -> ids.add(e.getId()));
+        patientMedicalRecordMapper.selectList().forEach(e -> ids.add(e.getId()));
         sysDictDataMapper.selectDictDataByType("payment_status").forEach(e -> payStatusMap.put(e.getDictValue(), e.getDictLabel()));
         sysDictDataMapper.selectDictDataByType("fee_type").forEach(e -> consultationMap.put(e.getDictValue(), e.getDictLabel()));
         List<ProductNutrition> productNutritionList = productNutritionMapper.selectList();
@@ -809,16 +809,16 @@ public class ReportServiceImpl implements ReportService {
 
         List<Long> ids = new ArrayList<>();
 
-        treatmentUserMapper.selectList(
-            Wrappers.lambdaQuery(TreatmentUser.class)
-                .like(bo.getPatientName() != null, TreatmentUser::getTreatName, bo.getPatientName())
+        patientMedicalRecordMapper.selectList(
+            Wrappers.lambdaQuery(PatientMedicalRecord.class)
+                .like(bo.getPatientName() != null, PatientMedicalRecord::getTreatName, bo.getPatientName())
         ).forEach(e -> ids.add(e.getId()));
 
 
         Map<Long, String> deptMap = new HashMap<>();
         Map<Long, String> doctorMap = new HashMap<>();
 
-        List<TreatmentUser> patientList = treatmentUserMapper.selectList();
+        List<PatientMedicalRecord> patientList = patientMedicalRecordMapper.selectList();
         sysDeptMapper.selectList().forEach(e -> deptMap.put(e.getDeptId(), e.getDeptName()));
         sysUserMapper.selectList().forEach(e -> doctorMap.put(e.getUserId(), e.getName()));
 
@@ -996,7 +996,7 @@ public class ReportServiceImpl implements ReportService {
                     vo.setDoctor(doctorMap.get(e.getCreateBy()));
                     vo.setDoctorDepartment(deptMap.get(e.getCreateDept()));
 
-                    for (TreatmentUser patient : patientList) {
+                    for (PatientMedicalRecord patient : patientList) {
                         if (e.getPatientId().equals(patient.getId())) {
                             vo.setConsultationType(Objects.equals(e.getType(), "0") ? "门诊" : "住院");
                             vo.setPatientName(patient.getTreatName());

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

@@ -1,17 +1,15 @@
 package org.dromara.web.service.impl;
-import java.sql.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.web.domain.TreatmentUser;
+import org.dromara.web.domain.PatientMedicalRecord;
 import org.dromara.web.domain.bo.TotalPatientBo;
 import org.dromara.web.domain.vo.TotalPatientVo;
-import org.dromara.web.mapper.TreatmentUserMapper;
+import org.dromara.web.mapper.PatientMedicalRecordMapper;
 import org.dromara.web.service.TotalPatientService;
 import org.springframework.stereotype.Service;
 
@@ -27,17 +25,17 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class TotalPatientServiceImpl implements TotalPatientService {
 
-    private final TreatmentUserMapper treatmentUserMapper;
+    private final PatientMedicalRecordMapper patientMedicalRecordMapper;
 
     @Override
     public TableDataInfo<TotalPatientVo> listPage(TotalPatientBo bo, PageQuery pageQuery) {
 
-        LambdaQueryWrapper<TreatmentUser> wrapper = buildQueryWrapper(bo);
-        IPage<TreatmentUser> page = treatmentUserMapper.selectPage(pageQuery.build(), wrapper);
+        LambdaQueryWrapper<PatientMedicalRecord> wrapper = buildQueryWrapper(bo);
+        IPage<PatientMedicalRecord> page = patientMedicalRecordMapper.selectPage(pageQuery.build(), wrapper);
         return TableDataInfo.build(page.convert(this::convertToVo));
     }
 
-    private TotalPatientVo convertToVo(TreatmentUser user) {
+    private TotalPatientVo convertToVo(PatientMedicalRecord user) {
         TotalPatientVo vo = new TotalPatientVo();
         vo.setId(user.getId());
         vo.setUpdateTime(user.getUpdateTime());
@@ -56,14 +54,14 @@ public class TotalPatientServiceImpl implements TotalPatientService {
         return vo;
     }
 
-    private LambdaQueryWrapper<TreatmentUser> buildQueryWrapper(TotalPatientBo bo) {
-        LambdaQueryWrapper<TreatmentUser> wrapper = new LambdaQueryWrapper<>();
+    private LambdaQueryWrapper<PatientMedicalRecord> buildQueryWrapper(TotalPatientBo bo) {
+        LambdaQueryWrapper<PatientMedicalRecord> wrapper = new LambdaQueryWrapper<>();
 
-        wrapper.eq(bo.getType() != null, TreatmentUser::getType, bo.getType())
-            .eq(bo.getSex() != null, TreatmentUser::getSex, bo.getSex())
-            .like(bo.getMedicalId() != null, TreatmentUser::getTreatNum, bo.getMedicalId())
-            .ge(bo.getUpdateTimeEarliest() != null, TreatmentUser::getUpdateTime, bo.getUpdateTimeEarliest())
-            .le(bo.getUpdateTimeLatest() != null, TreatmentUser::getUpdateTime, bo.getUpdateTimeLatest());
+        wrapper.eq(bo.getType() != null, PatientMedicalRecord::getType, bo.getType())
+            .eq(bo.getSex() != null, PatientMedicalRecord::getSex, bo.getSex())
+            .like(bo.getMedicalId() != null, PatientMedicalRecord::getTreatNum, bo.getMedicalId())
+            .ge(bo.getUpdateTimeEarliest() != null, PatientMedicalRecord::getUpdateTime, bo.getUpdateTimeEarliest())
+            .le(bo.getUpdateTimeLatest() != null, PatientMedicalRecord::getUpdateTime, bo.getUpdateTimeLatest());
         return wrapper;
     }
 }

ruoyi-admin/src/main/resources/mapper/workbench/TreatmentUserMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.web.mapper.TreatmentUserMapper">
+<mapper namespace="org.dromara.web.mapper.PatientMedicalRecordMapper">
 
 </mapper>