chengyao 4 лет назад
Родитель
Сommit
507ee4f0f3

+ 1 - 1
src/main/java/com/diagbot/dto/QualityControlDTO.java

@@ -64,7 +64,7 @@ public class QualityControlDTO {
     /**
      * 出院时间
      */
-    @Excel(name = "出院日期", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出院时间", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
 

+ 1 - 1
src/main/java/com/diagbot/dto/QualityControlDeptDTO.java

@@ -63,7 +63,7 @@ public class QualityControlDeptDTO {
     /**
      * 出院时间
      */
-    @Excel(name = "出院日期", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出院时间", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
 

+ 2 - 2
src/main/java/com/diagbot/facade/ConsoleByDeptExportFacade.java

@@ -397,9 +397,9 @@ public class ConsoleByDeptExportFacade {
         if (endDate.getTime() - startDate.getTime() > interval) {
             throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于30天");
         }
-        String  fileName = "病历质控报表科室详情.xls";
+        String  fileName = "病历质控报表.xls";
         IPage<QualityControlDeptDTO> records = consoleByDeptFacade.qualityControlByDept(behospitalPageVO);
-        ExcelUtils.exportExcel(records.getRecords(), null, "sheet1", QualityControlDeptDTO.class, fileName, response, 26.8f);
+        ExcelUtils.exportExcel(records.getRecords(), "病历质控报表", "sheet1", QualityControlDeptDTO.class, fileName, response, 26.8f);
     }
 
     static void orderMethod(BehospitalPageVO behospitalPageVO){

+ 1 - 1
src/main/java/com/diagbot/facade/ConsoleExportFacade.java

@@ -627,7 +627,7 @@ public class ConsoleExportFacade {
         List<QualityControlDTO> records = page.getRecords();
 
         String fileName = "病历质控报表详情页.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", QualityControlDTO.class, fileName, response, 26.8f);
+        ExcelUtils.exportExcel(records, "病历质控报表", "sheet1", QualityControlDTO.class, fileName, response, 26.8f);
     }
 
    static void orderMethod(BehospitalPageVO behospitalPageVO){

+ 4 - 0
src/main/java/com/diagbot/util/ExcelUtils.java

@@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.export.styler.ExcelExportStylerDefaultImpl;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ExcelExportStylerUserImpl;
@@ -114,6 +115,9 @@ public class ExcelUtils {
 
     private static void userExport2(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response,
                                     ExportParams exportParams, float height, Boolean havTitle) {
+        if(exportParams.getTitle().equals("病历质控报表")){
+            exportParams.setTitleHeight(Short.valueOf("20"));
+        };
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
         if (workbook != null) {
             Sheet sheet = workbook.getSheetAt(0);