From b79923ad562c48a01d1dc26847b2e0500ed5f95a Mon Sep 17 00:00:00 2001 From: firefly <1633489380@qq.com> Date: Fri, 15 Aug 2025 09:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E6=8E=A5=E8=AF=8A?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E4=B8=BA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/os/controller/PatientDiagnosisController.java | 8 ++------ .../java/com/ruoyi/os/domain/PatientMedicalRecordsVO.java | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pasd-healthcare/src/main/java/com/ruoyi/os/controller/PatientDiagnosisController.java b/pasd-healthcare/src/main/java/com/ruoyi/os/controller/PatientDiagnosisController.java index 1cad226..3123afa 100644 --- a/pasd-healthcare/src/main/java/com/ruoyi/os/controller/PatientDiagnosisController.java +++ b/pasd-healthcare/src/main/java/com/ruoyi/os/controller/PatientDiagnosisController.java @@ -73,12 +73,8 @@ public class PatientDiagnosisController extends BaseController { patientMedicalRecordsVO.setDictionariesNameGender("sys_user_sex"); patientMedicalRecordsVO.setDictionariesNameIsInsured("healthcare_os_insured"); patientMedicalRecordsVO.setDictionariesNameStatus("healthcare_os_diagnosis_status"); - if(patientMedicalRecordsVO.getIsInsured() != null && patientMedicalRecordsVO.getIsInsured() != 1) { - List list = iPatientDiagnosisService.gainPrescriptionDetailsYesList(patientMedicalRecordsVO); - System.out.println(list); - ExcelUtil util = new ExcelUtil(PatientMedicalRecordsYesVO.class); - util.exportExcelWithTotal(response, list, "接诊记录数据"); - } + + // 获取所有患者处方详情列表 List list = iPatientDiagnosisService.gainPrescriptionDetailsList(patientMedicalRecordsVO); ExcelUtil util = new ExcelUtil(PatientMedicalRecordsVO.class); util.exportExcel(response, list, "接诊记录数据"); diff --git a/pasd-healthcare/src/main/java/com/ruoyi/os/domain/PatientMedicalRecordsVO.java b/pasd-healthcare/src/main/java/com/ruoyi/os/domain/PatientMedicalRecordsVO.java index 67aecf7..d6e1fd6 100644 --- a/pasd-healthcare/src/main/java/com/ruoyi/os/domain/PatientMedicalRecordsVO.java +++ b/pasd-healthcare/src/main/java/com/ruoyi/os/domain/PatientMedicalRecordsVO.java @@ -1,5 +1,6 @@ package com.ruoyi.os.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import lombok.Data; @@ -233,6 +234,9 @@ public class PatientMedicalRecordsVO { @JsonFormat(pattern = "yyyy-MM-dd") private Date endTime; + @Excel(name = "报销费用") + private BigDecimal totalAmount; + /** * @field 处方详情列表 */