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 处方详情列表 */